1

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

@@ -17,5 +17,5 @@ import com.fdkankan.agent.response.AgentNewVo;
  */
 public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
 
-    void addOrder(User user, IncrementParam param, AgentNewVo agentNewVo);
+    IncrementOrderMg addOrder(User user, IncrementParam param, AgentNewVo agentNewVo);
 }

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

@@ -23,13 +23,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
     @Override
-    public void addOrder(User user, IncrementParam param, AgentNewVo agentNewVo) {
+    public IncrementOrderMg addOrder(User user, IncrementParam param, AgentNewVo agentNewVo) {
         IncrementOrderMg orderMg = new IncrementOrderMg();
         orderMg.setOrderSn(Dateutils.getOrderSn());
         orderMg.setPayStatus(1);
         orderMg.setUserId(user.getId());
         orderMg.setIncrementId(param.getId());
-        orderMg.setCount(param.getCount());
+        orderMg.setCount(param.getCount() == null ? 1 : param.getCount());
         orderMg.setIncrementType(param.getIncrementTypeId());
         orderMg.setMemberLevels(param.getMemberLevels());
         orderMg.setMonthQy(1);
@@ -40,5 +40,6 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
         orderMg.setAgentName(agentNewVo.getName());
         orderMg.setAgentId(agentNewVo.getId());
         this.save(orderMg);
+        return orderMg;
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.ResultCode;
 import com.fdkankan.agent.common.util.IncrementUtil;
+import com.fdkankan.agent.entity.IncrementOrderMg;
 import com.fdkankan.agent.entity.IncrementType;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.entity.UserIncrement;
@@ -101,7 +102,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType.getValidTimeType() == 1){
             param.setMemberLevels("SE");
         }
-        incrementOrderMgService.addOrder(user,param,agentNewVo);
+        IncrementOrderMg orderMg = incrementOrderMgService.addOrder(user, param, agentNewVo);
 
         List<UserIncrement> userIncrementList = new ArrayList<>();
         for (int i = 0 ; i<param.getCount() ;i++) {
@@ -109,6 +110,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
             userIncrement.setUserId(user.getId());
             userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
+            userIncrement.setOrderSn(orderMg.getOrderSn());
             userIncrement.setIsExpired(0);
             userIncrement.setCreateTime(date);
             userIncrement.setUpdateTime(date);