fix

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/impl/EquipmentDistributeServiceImpl.java

@@ -136,47 +136,47 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
 
 	public void saveInviteRecord(Long sharId, Long userId, Long orderId, Integer type) {
 		EquipmentConfigDto equipmentConfigDto = checkEquipmentConfigDto();
-		Integer benefitsType = 1;
+		Integer benefitsType = 0;
 		if (equipmentConfigDto != null && type == 1) {
-			//配置车票权益
-			if (CollUtil.isNotEmpty(equipmentConfigDto.getSkuList())) {
-				addTicketBenefitsChance(sharId, userId, orderId, EquipmentUserChanceRecord.Status.hasPayment);
-			}
-
-			//已配置余额  实物发货 发送余额
-			if (equipmentConfigDto.getBalance() != null && equipmentConfigDto.getBalance().compareTo(BigDecimal.ZERO) > 0) {
-				addBalanceBenefits(sharId, orderId, equipmentConfigDto.getBalance(), EquipmentUserDistributeTransportBenefits.Status.hasPayment);
-				benefitsType = 2;
-			}
+//			//配置车票权益
+//			if (CollUtil.isNotEmpty(equipmentConfigDto.getSkuList())) {
+//				addTicketBenefitsChance(sharId, userId, orderId, EquipmentUserChanceRecord.Status.hasPayment);
+//			}
+//
+//			//已配置余额  实物发货 发送余额
+//			if (equipmentConfigDto.getBalance() != null && equipmentConfigDto.getBalance().compareTo(BigDecimal.ZERO) > 0) {
+//				addBalanceBenefits(sharId, orderId, equipmentConfigDto.getBalance(), EquipmentUserDistributeTransportBenefits.Status.hasPayment);
+//				benefitsType = 2;
+//			}
 			EquipmentUserPayRecord record = new EquipmentUserPayRecord();
 			record.setShareId(sharId);
 			record.setUserId(userId);
 			record.setStatus(EquipmentUserPayRecord.Status.hasPayment);
 			record.setOrderId(orderId);
-			//1、车票权益，2、余额
+			//0无类型  1、车票权益，2、余额
 			record.setType(benefitsType);
 			equipmentUserPayRecordMapper.insert(record);
 		}
 		if (type == 2) {
-			//是否有余额权益
-			EquipmentUserDistributeTransportBenefits transportBenefits = transportBenefitsMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserDistributeTransportBenefits.class)
-					.eq(EquipmentUserDistributeTransportBenefits::getOrderId, orderId).last("limit 1"));
-			if (transportBenefits != null && transportBenefits.getStatus() != EquipmentUserDistributeTransportBenefits.Status.complete) {
-				transportBenefits.setStatus(EquipmentUserDistributeTransportBenefits.Status.refund);
-				transportBenefitsMapper.updateById(transportBenefits);
-			}
-			//是否有车票权益
-			int update = equipmentUserChanceRecordMapper.update(null, Wrappers.lambdaUpdate(EquipmentUserChanceRecord.class)
-					.set(EquipmentUserChanceRecord::getStatus, EquipmentUserChanceRecord.Status.refund)
-					.eq(EquipmentUserChanceRecord::getOrderId, orderId)
-					.eq(EquipmentUserChanceRecord::getStatus, EquipmentUserChanceRecord.Status.hasPayment));
-			if (update > 0) {
-				update = equipmentUserChanceMapper.subUserChance(sharId);
-				if (update == 0) {
-					//扣除权益
-					deductUserBenefits(sharId, orderId);
-				}
-			}
+//			//是否有余额权益
+//			EquipmentUserDistributeTransportBenefits transportBenefits = transportBenefitsMapper.selectOne(Wrappers.lambdaQuery(EquipmentUserDistributeTransportBenefits.class)
+//					.eq(EquipmentUserDistributeTransportBenefits::getOrderId, orderId).last("limit 1"));
+//			if (transportBenefits != null && transportBenefits.getStatus() != EquipmentUserDistributeTransportBenefits.Status.complete) {
+//				transportBenefits.setStatus(EquipmentUserDistributeTransportBenefits.Status.refund);
+//				transportBenefitsMapper.updateById(transportBenefits);
+//			}
+//			//是否有车票权益
+//			int update = equipmentUserChanceRecordMapper.update(null, Wrappers.lambdaUpdate(EquipmentUserChanceRecord.class)
+//					.set(EquipmentUserChanceRecord::getStatus, EquipmentUserChanceRecord.Status.refund)
+//					.eq(EquipmentUserChanceRecord::getOrderId, orderId)
+//					.eq(EquipmentUserChanceRecord::getStatus, EquipmentUserChanceRecord.Status.hasPayment));
+//			if (update > 0) {
+//				update = equipmentUserChanceMapper.subUserChance(sharId);
+//				if (update == 0) {
+//					//扣除权益
+//					deductUserBenefits(sharId, orderId);
+//				}
+//			}
 			equipmentUserPayRecordMapper.update(null, Wrappers.lambdaUpdate(EquipmentUserPayRecord.class)
 					.set(EquipmentUserPayRecord::getStatus, EquipmentUserPayRecord.Status.refund)
 					.eq(EquipmentUserPayRecord::getOrderId, orderId)

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -740,11 +740,11 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
 
             try {
                 marketFrontService.subSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getUpdateTime());
-//                if (goodsDon.getType() == 2) {
-//                    equipmentDistributeService.subDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
-//                    //扣除用户自身实物权益
-//                    userRealOrderBenefitsService.deductUserRealGoodsBenefits(orderDon.getId());
-//                }
+                if (goodsDon.getType() == 2 && !orderDon.getIsDistribute()) {
+                    equipmentDistributeService.subDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
+                    //扣除用户自身实物权益
+                    userRealOrderBenefitsService.deductUserRealGoodsBenefits(orderDon.getId());
+                }
             } catch (Exception e) {
                 log.error("wx减少抽奖机会错误,orderId:{},error:{}", orderDon.getId(), e);
             }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2337,9 +2337,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				}
 				//配置了特定奖池,增加抽奖机会
 				marketFrontService.addSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getSkuId());
-//				if (goodsDon.getType() == 2) {
-//					equipmentDistributeService.addDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
-//				}
+				//非分销订单
+				if (goodsDon.getType() == 2 && !orderDon.getIsDistribute()) {
+					equipmentDistributeService.addDistributeBenefitsChance(orderDon.getUserId(), orderDon.getId());
+				}
 				//若该订单使用了规定推广者的兑换码 增加上下级关系
 				if (StrUtil.isNotBlank(orderDon.getCouponExCode())) {
 					addDistributeCouponCode(orderDon.getUserId(), orderDon.getCouponExCode());