维修产品协议

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SporadicChargeInfoImpl.java

@@ -72,19 +72,19 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         SysUser sysUser = sysUserFeignService.queryUserById(userId);
         SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
 
-        try {
-            if(Objects.isNull(info.getUserId())){
-                contractService.transferProduceContract(userId, null);
-            }
-        } catch (Exception e) {
-            logger.error("产品协议生成失败", e);
-        }
-
         Map<Integer, String> map = new HashMap();
         map.put(userId, sysUser.getPhone());
         Map<Integer, String> yimei = new HashMap();
         map.put(userId, userId.toString());
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
+            try {
+                if(Objects.isNull(info.getUserId())){
+                    contractService.transferProduceContract(userId, null);
+                }
+            } catch (Exception e) {
+                logger.error("产品协议生成失败", e);
+            }
+
             //福袋活动，增加课程余额
             if (info.getChargeType().getCode() == 6) {
                 sysUserCashAccountService.appendCourseBalance(userId, studentPaymentOrder.getActualAmount(), PlatformCashAccountDetailTypeEnum.SPORADIC, "活动");

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -68,6 +68,10 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     private SellOrderService sellOrderService;
     @Autowired
     private SellOrderDao sellOrderDao;
+    @Autowired
+    private ContractService contractService;
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Override
     public BaseDAO<Integer, StudentRepair> getDAO() {
@@ -588,6 +592,14 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         map.put(userId, userId.toString());
 
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
+            if(repairInfo.getType()==1){
+                try {
+                    contractService.transferProduceContract(userId, null);
+                } catch (Exception e) {
+                    logger.error("产品协议生成失败", e);
+                }
+            }
+
             repairInfo.setPayStatus(2);
             repairInfo.setUpdateTime(nowDate);
             if (this.update(repairInfo) <= 0) {