订单地址

src/main/java/com/fdkankan/manage/constant/CameraOutTypeEnum.java

@@ -6,7 +6,8 @@ public enum CameraOutTypeEnum {
     NORMAL_SALES(0,"正常销售"),
     STAFF_USE(1,"员工自用"),
     GIFT_GIVING(2,"礼品赠送"),
-    OTHER(3,"其他");
+    OTHER(3,"其他"),
+    AGENT(4,"经销商");
 
 
     int code;

src/main/java/com/fdkankan/manage/controller/AgentNewController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
@@ -12,6 +13,7 @@ import com.fdkankan.manage.service.IAgentIncrementService;
 import com.fdkankan.manage.service.IAgentNewService;
 import com.fdkankan.manage.service.IUserService;
 import com.fdkankan.manage.vo.request.AgentParam;
+import com.fdkankan.manage.vo.response.AgentVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +44,11 @@ public class AgentNewController {
 
         return ResultData.ok(agentNewService.pageList(agentParam));
     }
+    @GetMapping("/allList")
+    public ResultData listAll(){
+        return ResultData.ok(agentNewService.list());
+    }
+
 
     @GetMapping("/checkUserName")
     public ResultData checkUserName(@RequestParam(required = false) String userName){
@@ -80,6 +87,12 @@ public class AgentNewController {
         return ResultData.ok();
     }
 
+    @PostMapping("/addIncrementNum")
+    public ResultData addIncrementNum(@RequestBody AgentVo param){
+        agentNewService.addIncrementNum(param);
+        return ResultData.ok();
+    }
+
 
 }
 

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

@@ -3,6 +3,9 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.AgentIncrement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.entity.AgentNew;
+import com.fdkankan.manage.vo.response.AgentIncrementVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,8 @@ import com.fdkankan.manage.entity.AgentNew;
 public interface IAgentIncrementService extends IService<AgentIncrement> {
 
     void saveByAgent(AgentNew param);
+
+    List<AgentIncrement> getByAgentId(Integer id);
+
+    void addNum(List<AgentIncrementVo> agentIncrements);
 }

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

@@ -3,6 +3,7 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.AgentNew;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.AgentParam;
+import com.fdkankan.manage.vo.response.AgentVo;
 
 /**
  * <p>
@@ -15,4 +16,6 @@ import com.fdkankan.manage.vo.request.AgentParam;
 public interface IAgentNewService extends IService<AgentNew> {
 
     Object pageList(AgentParam agentParam);
+
+    void addIncrementNum(AgentVo param);
 }

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

@@ -3,6 +3,8 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.IncrementType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+
 /**
  * <p>
  * 会员权益类型 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IIncrementTypeService extends IService<IncrementType> {
 
+    HashMap<Integer, IncrementType> getIdMap();
 }

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

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.entity.AgentIncrement;
 import com.fdkankan.manage.entity.AgentNew;
 import com.fdkankan.manage.entity.IncrementType;
@@ -7,6 +9,8 @@ import com.fdkankan.manage.mapper.IAgentIncrementMapper;
 import com.fdkankan.manage.service.IAgentIncrementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IIncrementTypeService;
+import com.fdkankan.manage.vo.response.AgentIncrementVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,4 +40,24 @@ public class AgentIncrementServiceImpl extends ServiceImpl<IAgentIncrementMapper
             this.save(increment);
         }
     }
+
+    @Override
+    public List<AgentIncrement> getByAgentId(Integer id) {
+        LambdaQueryWrapper<AgentIncrement> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AgentIncrement::getAgentId,id);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public void addNum(List<AgentIncrementVo> agentIncrements) {
+        for (AgentIncrementVo agentIncrement : agentIncrements) {
+            if(agentIncrement == null || agentIncrement.getId() == null || agentIncrement.getTotalNum() == null){
+                continue;
+            }
+            LambdaUpdateWrapper<AgentIncrement> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(AgentIncrement::getId,agentIncrement.getId());
+            wrapper.set(AgentIncrement::getTotalNum,agentIncrement.getTotalNum());
+            this.update(wrapper);
+        }
+    }
 }

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

@@ -1,15 +1,21 @@
 package com.fdkankan.manage.service.impl;
 
+import com.amazonaws.services.lexmodelbuilding.model.Intent;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.manage.entity.AgentNew;
-import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.*;
+import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAgentNewMapper;
+import com.fdkankan.manage.service.IAgentIncrementService;
 import com.fdkankan.manage.service.IAgentNewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.IIncrementTypeService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AgentParam;
+import com.fdkankan.manage.vo.response.AgentIncrementVo;
 import com.fdkankan.manage.vo.response.AgentVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -17,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -32,6 +39,10 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
 
     @Autowired
     ISysUserService sysUserService;
+    @Autowired
+    IAgentIncrementService agentIncrementService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
 
     @Override
     public Object pageList(AgentParam agentParam) {
@@ -42,6 +53,7 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         wrapper.orderByDesc(AgentNew::getCreateTime);
         Page<AgentNew> page = this.page(new Page<>(agentParam.getPageNum(), agentParam.getPageSize()), wrapper);
         List<AgentVo> voList = new ArrayList<>();
+        HashMap<Integer,IncrementType> map = incrementTypeService.getIdMap();
         for (AgentNew record : page.getRecords()) {
             AgentVo vo = new AgentVo();
             BeanUtils.copyProperties(record,vo);
@@ -49,6 +61,18 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
             if(sysUser != null){
                 vo.setSysUserName(sysUser.getNickName());
             }
+            List<AgentIncrement> agentIncrements = agentIncrementService.getByAgentId(record.getId());
+            List<AgentIncrementVo> agentIncrementVos = new ArrayList<>();
+            for (AgentIncrement agentIncrement : agentIncrements) {
+                if(map.get(agentIncrement.getIncrementTypeId()) == null){
+                    continue;
+                }
+                AgentIncrementVo agentVo = new AgentIncrementVo();
+                BeanUtils.copyProperties(agentIncrement,agentVo);
+                agentVo.setIncrementTypeName(map.get(agentIncrement.getIncrementTypeId()).getName());
+                agentIncrementVos.add(agentVo);
+            }
+            vo.setAgentIncrements(agentIncrementVos );
             voList.add(vo);
         }
 
@@ -57,4 +81,21 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         voPage.setRecords(voList);
         return PageInfo.PageInfo(voPage);
     }
+
+    @Override
+    public void addIncrementNum(AgentVo param) {
+        if(param.getId() == null ){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        if(param.getDownTotalNum()!=null){
+            LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(AgentNew::getId,param.getId());
+            wrapper.set(AgentNew::getDownTotalNum, param.getDownTotalNum());
+            this.update(wrapper);
+        }
+        if(param.getAgentIncrements() != null && param.getAgentIncrements().size() >0){
+           agentIncrementService.addNum(param.getAgentIncrements());
+        }
+
+    }
 }

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

@@ -6,6 +6,9 @@ import com.fdkankan.manage.service.IIncrementTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 会员权益类型 服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
 
+    @Override
+    public HashMap<Integer, IncrementType> getIdMap() {
+        HashMap<Integer, IncrementType> map = new HashMap<>();
+        List<IncrementType> list = this.list();
+        list.forEach(entity -> map.put(entity.getId(),entity));
+        return map;
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/AgentParam.java

@@ -1,8 +1,11 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.entity.AgentIncrement;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AgentParam extends RequestBase {
     private String name;

src/main/java/com/fdkankan/manage/vo/response/AgentIncrementVo.java

@@ -0,0 +1,12 @@
+package com.fdkankan.manage.vo.response;
+
+import lombok.Data;
+
+@Data
+public class AgentIncrementVo {
+    private Integer id;
+    private Integer incrementTypeId;
+    private String incrementTypeName;
+    private Integer totalNum;
+    private Integer useNum;
+}

src/main/java/com/fdkankan/manage/vo/response/AgentVo.java

@@ -1,9 +1,13 @@
 package com.fdkankan.manage.vo.response;
 
+import com.fdkankan.manage.entity.AgentIncrement;
 import com.fdkankan.manage.entity.AgentNew;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AgentVo extends AgentNew {
     private String sysUserName;
+    private List<AgentIncrementVo> agentIncrements;
 }

src/main/java/com/fdkankan/manage/vo/response/OrderVo.java

@@ -35,6 +35,7 @@ public class OrderVo {
     @ExcelProperty("订单状态")
     private String paymentStatus;           //付款状态（未付款unpaid、已付款paid、已取消cancel, 部分支付partPayment, 部分退款partRefund, 全额退款refunded）
 
+    private String shipAreaPath;
 
     @ExcelProperty("地址")
     private String shipAddress;
@@ -45,6 +46,10 @@ public class OrderVo {
     @ExcelProperty("收件人")
     private String shipName;
 
+    public String getShipAddress() {
+        return shipAreaPath + shipAddress;
+    }
+
     public String getPaymentTypeName() {
         switch (paymentTypeName){
             case "0" : return "微信";