1

src/main/java/com/fdkankan/manage/service/IDownloadOrderMgService.java

@@ -14,5 +14,5 @@ import com.fdkankan.manage.vo.request.UserIncrementParam;
  */
 public interface IDownloadOrderMgService extends IService<DownloadOrderMg> {
 
-    void addOrder(UserIncrementParam param);
+    DownloadOrderMg addOrder(UserIncrementParam param);
 }

src/main/java/com/fdkankan/manage/service/IIncrementOrderMgService.java

@@ -15,7 +15,7 @@ import com.fdkankan.manage.vo.request.UserIncrementParam;
  */
 public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
 
-    void addOrder(UserIncrementParam param, IncrementType incrementType);
+    IncrementOrderMg addOrder(UserIncrementParam param, IncrementType incrementType);
 
     IncrementOrderMg getByOrderSn(String orderSn);
 }

src/main/java/com/fdkankan/manage/service/impl/DownloadOrderMgServiceImpl.java

@@ -24,11 +24,12 @@ import org.springframework.stereotype.Service;
 public class DownloadOrderMgServiceImpl extends ServiceImpl<IDownloadOrderMgMapper, DownloadOrderMg> implements IDownloadOrderMgService {
 
     @Override
-    public void addOrder(UserIncrementParam param) {
+    public DownloadOrderMg addOrder(UserIncrementParam param) {
         DownloadOrderMg downloadOrder = new DownloadOrderMg();
         BeanUtil.copyProperties(param,downloadOrder);
         downloadOrder.setOrderSn(Dateutils.getOrderSn());
         downloadOrder.setPayStatus(1);
         this.save(downloadOrder);
+        return downloadOrder;
     }
 }

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
 public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
 
     @Override
-    public void addOrder(UserIncrementParam param, IncrementType incrementType) {
+    public IncrementOrderMg addOrder(UserIncrementParam param, IncrementType incrementType) {
         IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
         BeanUtil.copyProperties(param,incrementOrderMg);
         incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
@@ -38,6 +38,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
             incrementOrderMg.setMemberLevels("SE");
         }
         this.save(incrementOrderMg);
+        return incrementOrderMg;
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -155,7 +155,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         param.setCount(incrementType.getDownloadNum());
         userService.addDownNum(param);
 
-        iIncrementOrderMgService.addOrder(param,incrementType);
+        iIncrementOrderMgService.addOrder(param, incrementType);
 
         agentNewLogService.addByUserIncrement(userIncrement);
         if(userIncrement.getCameraId() != null){
@@ -171,7 +171,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType == null){
             throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
         }
-        iIncrementOrderMgService.addOrder(param,incrementType);
+        IncrementOrderMg incrementOrderMg = iIncrementOrderMgService.addOrder(param, incrementType);
 
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
@@ -184,6 +184,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             userIncrement.setIncrementStartTime(date);
             userIncrement.setIncrementEndTime(param.getIncrementEndTime());
             userIncrement.setIncrementTypeId(param.getIncrementTypeId());
+            userIncrement.setOrderSn(incrementOrderMg.getOrderSn());
             if(incrementType.getValidTimeType() == 0){
                 userIncrement.setMemberLevels("PR");
             }