1

src/main/java/com/fdkankan/agent/entity/DownloadOrderMg.java

@@ -161,6 +161,20 @@ public class DownloadOrderMg implements Serializable {
      */
     @TableField("remark")
     private String remark;
-
+    /**
+     * 备注
+     */
+    @TableField("down_type")
+    private Integer downType;
+    /**
+     * 备注
+     */
+    @TableField("agent_name")
+    private String agentName;
+    /**
+     * 备注
+     */
+    @TableField("agent_id")
+    private Integer agentId;
 
 }

src/main/java/com/fdkankan/agent/entity/IncrementOrderMg.java

@@ -167,6 +167,14 @@ public class IncrementOrderMg implements Serializable {
      */
     @TableField("remark")
     private String remark;
+    /**
+     * 备注
+     */
+    @TableField("agent_name")
+    private String agentName;
+
+    @TableField("agent_id")
+    private Integer agentId;
 
 
 }

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

@@ -1,8 +1,10 @@
 package com.fdkankan.agent.service;
 
+import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.DownloadOrderMg;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.agent.entity.User;
+import com.fdkankan.agent.response.AgentNewVo;
 
 /**
  * <p>
@@ -14,5 +16,5 @@ import com.fdkankan.agent.entity.User;
  */
 public interface IDownloadOrderMgService extends IService<DownloadOrderMg> {
 
-    void addOrder(User user, Integer count);
+    void addOrder(User user, Integer count, AgentNewVo agent);
 }

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

@@ -1,9 +1,11 @@
 package com.fdkankan.agent.service;
 
+import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.IncrementOrderMg;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.request.IncrementParam;
+import com.fdkankan.agent.response.AgentNewVo;
 
 /**
  * <p>
@@ -15,5 +17,5 @@ import com.fdkankan.agent.request.IncrementParam;
  */
 public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
 
-    void addOrder(User user, IncrementParam param);
+    void addOrder(User user, IncrementParam param, AgentNewVo agentNewVo);
 }

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

@@ -75,7 +75,7 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
         wrapper.eq(User::getId,user.getId());
         wrapper.setSql("download_num_total = download_num_total + " + param.getCount());
 
-        downloadOrderMgService.addOrder(user,param.getCount());
+        downloadOrderMgService.addOrder(user,param.getCount(),agent);
         userService.update(wrapper);
         agentNewService.subNum(agent,user.getId(),null,param.getCount(),param.getTotalTime(),0);
     }

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

@@ -2,9 +2,11 @@ package com.fdkankan.agent.service.impl;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.DownloadOrderMg;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.mapper.IDownloadOrderMgMapper;
+import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.service.IDownloadOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.agent.util.Dateutils;
@@ -22,7 +24,7 @@ import org.springframework.stereotype.Service;
 public class DownloadOrderMgServiceImpl extends ServiceImpl<IDownloadOrderMgMapper, DownloadOrderMg> implements IDownloadOrderMgService {
 
     @Override
-    public void addOrder(User user, Integer count) {
+    public void addOrder(User user, Integer count, AgentNewVo agent) {
         DownloadOrderMg orderMg = new DownloadOrderMg();
         orderMg.setOrderSn(Dateutils.getOrderSn());
         orderMg.setPayStatus(1);
@@ -32,6 +34,8 @@ public class DownloadOrderMgServiceImpl extends ServiceImpl<IDownloadOrderMgMapp
         orderMg.setCustomerType(1);
         orderMg.setUseType(4);
         orderMg.setRemark("经销商平台售出");
+        orderMg.setAgentName(agent.getName());
+        orderMg.setAgentId(agent.getId());
         this.save(orderMg);
     }
 }

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

@@ -6,6 +6,7 @@ import com.fdkankan.agent.entity.IncrementOrderMg;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.mapper.IIncrementOrderMgMapper;
 import com.fdkankan.agent.request.IncrementParam;
+import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.service.IIncrementOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.agent.util.Dateutils;
@@ -22,7 +23,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
     @Override
-    public void addOrder(User user, IncrementParam param) {
+    public void addOrder(User user, IncrementParam param, AgentNewVo agentNewVo) {
         IncrementOrderMg orderMg = new IncrementOrderMg();
         orderMg.setOrderSn(Dateutils.getOrderSn());
         orderMg.setPayStatus(1);
@@ -36,6 +37,8 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
         orderMg.setCustomerType(1);
         orderMg.setUseType(4);
         orderMg.setRemark("经销商售出");
+        orderMg.setAgentName(agentNewVo.getName());
+        orderMg.setAgentId(agentNewVo.getId());
         this.save(orderMg);
     }
 }

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

@@ -101,7 +101,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType.getValidTimeType() == 1){
             param.setMemberLevels("SE");
         }
-        incrementOrderMgService.addOrder(user,param);
+        incrementOrderMgService.addOrder(user,param,agentNewVo);
 
         List<UserIncrement> userIncrementList = new ArrayList<>();
         for (int i = 0 ; i<param.getCount() ;i++) {
@@ -167,7 +167,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType.getValidTimeType() == 1){
             param.setMemberLevels("SE");
         }
-        incrementOrderMgService.addOrder(user,param);
+        incrementOrderMgService.addOrder(user,param,agentNewVo);
 
         userIncrement.setIsExpired(0);
         userIncrement.setIncrementEndTime(param.getIncrementEndTime());