修复

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

@@ -0,0 +1,85 @@
+package com.fdkankan.manage.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.common.response.Result;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.AgentNew;
+import com.fdkankan.manage.entity.User;
+import com.fdkankan.manage.exception.BusinessException;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@RestController
+@RequestMapping("/service/manage/agentNew")
+public class AgentNewController {
+
+    @Autowired
+    IAgentNewService agentNewService;
+    @Autowired
+    IAgentIncrementService agentIncrementService;
+    @Autowired
+    IUserService userService;
+
+    @PostMapping("/list")
+    public ResultData list(@RequestBody AgentParam agentParam){
+
+        return ResultData.ok(agentNewService.pageList(agentParam));
+    }
+
+    @GetMapping("/checkUserName")
+    public ResultData checkUserName(@RequestParam(required = false) String userName){
+        userService.checkUserName(userName);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/add")
+    public ResultData add(@RequestBody AgentNew param){
+        if(StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getUserName())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        userService.checkUserName(param.getUserName());
+        agentNewService.save(param);
+        agentIncrementService.saveByAgent(param);
+        return ResultData.ok();
+    }
+    @PostMapping("/update")
+    public ResultData update(@RequestBody AgentNew param){
+        if(param.getId() == null || StringUtils.isBlank(param.getName())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaUpdateWrapper<AgentNew> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(AgentNew::getId,param.getId());
+        wrapper.set(AgentNew::getName,param.getName());
+        wrapper.set(AgentNew::getNickName,param.getNickName());
+        agentNewService.update(wrapper);
+        return ResultData.ok();
+    }
+    @PostMapping("/delete")
+    public ResultData delete(@RequestBody AgentNew param){
+        if(param.getId() == null ){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        agentNewService.removeById(param.getId());
+        return ResultData.ok();
+    }
+
+
+}
+

src/main/java/com/fdkankan/manage/entity/AgentIncrement.java

@@ -0,0 +1,69 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Getter
+@Setter
+@TableName("t_agent_increment")
+public class AgentIncrement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 经销商权益数量
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 经销商id
+     */
+    @TableField("agent_id")
+    private Integer agentId;
+
+    /**
+     * 权益类型id
+     */
+    @TableField("increment_type_id")
+    private Integer incrementTypeId;
+
+    /**
+     * 总数量
+     */
+    @TableField("total_num")
+    private Integer totalNum;
+
+    /**
+     * 使用数量
+     */
+    @TableField("use_num")
+    private Integer useNum;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/entity/AgentNew.java

@@ -0,0 +1,74 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Getter
+@Setter
+@TableName("t_agent_new")
+public class AgentNew implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 经销商表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 经销商名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 联系人名称
+     */
+    @TableField("nick_name")
+    private String nickName;
+
+    /**
+     * 用户名称
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 创建人id
+     */
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField("down_total_num")
+    private Integer downTotalNum;
+
+    @TableField("down_use_num")
+    private Integer downUseNum;
+
+}

src/main/java/com/fdkankan/manage/entity/ReceiverInfo.java

@@ -0,0 +1,108 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 收货人信息表
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Getter
+@Setter
+@TableName("t_receiver_info")
+public class ReceiverInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 收货人姓名
+     */
+    @TableField("ship_name")
+    private String shipName;
+
+    /**
+     * 收货人的电话号码
+     */
+    @TableField("ship_mobile")
+    private String shipMobile;
+
+    /**
+     * 所在地区
+     */
+    @TableField("ship_area")
+    private String shipArea;
+
+    /**
+     * 收货的详细地址
+     */
+    @TableField("ship_address")
+    private String shipAddress;
+
+    /**
+     * 1表示默认地址，0表示不是默认地址
+     */
+    @TableField("set_default")
+    private Integer setDefault;
+
+    @TableField("country")
+    private String country;
+
+    /**
+     * 收货地区路径
+     */
+    @TableField("ship_area_path")
+    private String shipAreaPath;
+
+    /**
+     * 收货电话
+     */
+    @TableField("ship_phone")
+    private String shipPhone;
+
+    /**
+     * 收货邮编
+     */
+    @TableField("ship_zip_code")
+    private String shipZipCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_increment_type",
+                "t_receiver_info",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -96,6 +96,9 @@ public class LaserService {
             List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getUserName());
             param.setSnCodes(this.setSnCodes(cameraDetails));
         }
+        if(StringUtils.isBlank(param.getSnCode()) && (param.getSnCodes() == null || param.getSnCodes().size() <=0)){
+            param.setSnCode("phoneEmptySelect");
+        }
         LaserSceneParam newParam = new LaserSceneParam();
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());

src/main/java/com/fdkankan/manage/mapper/IAgentIncrementMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.AgentIncrement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Mapper
+public interface IAgentIncrementMapper extends BaseMapper<AgentIncrement> {
+
+}

src/main/java/com/fdkankan/manage/mapper/IAgentNewMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.AgentNew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Mapper
+public interface IAgentNewMapper extends BaseMapper<AgentNew> {
+
+}

src/main/java/com/fdkankan/manage/mapper/IReceiverInfoMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.ReceiverInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 收货人信息表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Mapper
+public interface IReceiverInfoMapper extends BaseMapper<ReceiverInfo> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.AgentIncrement;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.AgentNew;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+public interface IAgentIncrementService extends IService<AgentIncrement> {
+
+    void saveByAgent(AgentNew param);
+}

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

@@ -0,0 +1,18 @@
+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;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+public interface IAgentNewService extends IService<AgentNew> {
+
+    Object pageList(AgentParam agentParam);
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.ReceiverInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * <p>
+ * 收货人信息表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+public interface IReceiverInfoService extends IService<ReceiverInfo> {
+
+    HashMap<Long, ReceiverInfo> getByUserIds(Set<Long> userids);
+}

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

@@ -27,4 +27,8 @@ public interface IUserService extends IService<User> {
     List<UserVo> userDetail(Integer userId);
 
     HashMap<Long, User> getByIds(List<Long> userIds);
+
+    List<User> getByUserName(String userName);
+
+    void checkUserName(String userName);
 }

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

@@ -0,0 +1,39 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.AgentIncrement;
+import com.fdkankan.manage.entity.AgentNew;
+import com.fdkankan.manage.entity.IncrementType;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Service
+public class AgentIncrementServiceImpl extends ServiceImpl<IAgentIncrementMapper, AgentIncrement> implements IAgentIncrementService {
+
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+
+    @Override
+    public void saveByAgent(AgentNew param) {
+        List<IncrementType> list = incrementTypeService.list();
+        for (IncrementType incrementType : list) {
+            AgentIncrement increment = new AgentIncrement();
+            increment.setAgentId(param.getId());
+            increment.setIncrementTypeId(incrementType.getId());
+            this.save(increment);
+        }
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.mapper.IAgentNewMapper;
+import com.fdkankan.manage.service.IAgentNewService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
+import com.fdkankan.manage.vo.request.AgentParam;
+import com.fdkankan.manage.vo.response.AgentVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Service
+public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew> implements IAgentNewService {
+
+    @Autowired
+    ISysUserService sysUserService;
+
+    @Override
+    public Object pageList(AgentParam agentParam) {
+        LambdaQueryWrapper<AgentNew> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(agentParam.getName())){
+            wrapper.like(AgentNew::getName,agentParam.getName());
+        }
+        wrapper.orderByDesc(AgentNew::getCreateTime);
+        Page<AgentNew> page = this.page(new Page<>(agentParam.getPageNum(), agentParam.getPageSize()), wrapper);
+        List<AgentVo> voList = new ArrayList<>();
+        for (AgentNew record : page.getRecords()) {
+            AgentVo vo = new AgentVo();
+            BeanUtils.copyProperties(record,vo);
+            SysUser sysUser = sysUserService.getById(vo.getSysUserId());
+            if(sysUser != null){
+                vo.setSysUserName(sysUser.getNickName());
+            }
+            voList.add(vo);
+        }
+
+        Page<AgentVo> voPage = new Page<>(agentParam.getPageNum(), agentParam.getPageSize());
+        voPage.setTotal(page.getTotal());
+        voPage.setRecords(voList);
+        return PageInfo.PageInfo(voPage);
+    }
+}

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

@@ -29,7 +29,7 @@ public class EmployNoteServiceImpl extends ServiceImpl<IEmployNoteMapper, Employ
     public PageInfo pageList(EmployNoteParam param) {
         LambdaQueryWrapper<EmployNote> wrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(param.getWorkName())){
-            wrapper.eq(EmployNote::getWorkName,param.getWorkName());
+            wrapper.like(EmployNote::getWorkName,param.getWorkName());
         }
         wrapper.orderByDesc(EmployNote::getIsTop);
         wrapper.orderByDesc(EmployNote::getIsPush);

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

@@ -19,9 +19,8 @@ import com.fdkankan.manage.vo.InvoiceVO;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.google.common.base.Strings;
 import com.google.common.primitives.Ints;
@@ -63,10 +62,23 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     @Autowired
     private MangerUploadToOssUtil mangeUploadToOssUtil;
 
+    @Autowired
+    IReceiverInfoService receiverInfoService;
+
     @Dict
     @Override
     public Page<InvoiceVO> pageInvoice(InvoicePageParamVO param) {
-        return baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
+        Page<InvoiceVO> invoiceVOPage = baseMapper.pageInvoice(new Page(param.getPageNum(), param.getPageSize()), param);
+        Set<Long> userids = invoiceVOPage.getRecords().stream().map(InvoiceVO::getUserId).collect(Collectors.toSet());
+        HashMap<Long,ReceiverInfo> map = receiverInfoService.getByUserIds(userids);
+        for (InvoiceVO record : invoiceVOPage.getRecords()) {
+            if(StringUtils.isBlank(record.getShipName()) && map.get(record.getUserId())!= null){
+                record.setShipName(map.get(record.getUserId()).getShipName());
+                record.setShipAddress(map.get(record.getUserId()).getShipAddress());
+                record.setShipMobile(map.get(record.getUserId()).getShipMobile());
+            }
+        }
+        return invoiceVOPage ;
     }
 
     @Override

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

@@ -0,0 +1,37 @@
+package com.fdkankan.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.entity.ReceiverInfo;
+import com.fdkankan.manage.entity.User;
+import com.fdkankan.manage.mapper.IReceiverInfoMapper;
+import com.fdkankan.manage.service.IReceiverInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 收货人信息表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-08
+ */
+@Service
+public class ReceiverInfoServiceImpl extends ServiceImpl<IReceiverInfoMapper, ReceiverInfo> implements IReceiverInfoService {
+
+    @Override
+    public HashMap<Long, ReceiverInfo> getByUserIds(Set<Long> userids) {
+        HashMap<Long, ReceiverInfo> map = new HashMap<>();
+        if(userids.size() >0){
+            LambdaQueryWrapper<ReceiverInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(ReceiverInfo::getUserId,userids);
+            List<ReceiverInfo> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getUserId(),entity));
+        }
+        return map;
+    }
+}

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

@@ -129,4 +129,19 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         list.forEach(entity -> map.put(entity.getId(),entity));
         return map;
     }
+
+    @Override
+    public List<User> getByUserName(String userName) {
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(User::getUserName,userName);
+        return  this.list(wrapper);
+    }
+
+    @Override
+    public void checkUserName(String userName) {
+        List<User> userList = this.getByUserName(userName);
+        if(userList == null || userList.size() <=0){
+            throw new BusinessException(ResultCode.USER_NOT_EXIST);
+        }
+    }
 }

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -22,7 +22,7 @@ public class TestController {
     }
 
     public static void main(String[] args) {
-        System.out.println( SecurityUtil.MD5("@05\u0013\u0011EFG@AB"));
+        System.out.println( SecurityUtil.MD5("E\u0005\u0015\u000EG107"));
     }
 
 }

src/main/java/com/fdkankan/manage/vo/InvoiceVO.java

@@ -139,6 +139,7 @@ public class InvoiceVO {
     @ExcelProperty("状态")
     private String invoicedStr;
 
-
+    @ExcelIgnore
+    private Long userId;
 
 }

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

@@ -0,0 +1,9 @@
+package com.fdkankan.manage.vo.request;
+
+import com.fdkankan.common.request.RequestBase;
+import lombok.Data;
+
+@Data
+public class AgentParam extends RequestBase {
+    private String name;
+}

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

@@ -0,0 +1,9 @@
+package com.fdkankan.manage.vo.response;
+
+import com.fdkankan.manage.entity.AgentNew;
+import lombok.Data;
+
+@Data
+public class AgentVo extends AgentNew {
+    private String sysUserName;
+}

src/main/resources/mapper/manage/AgentIncrementMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IAgentIncrementMapper">
+
+</mapper>

src/main/resources/mapper/manage/AgentNewMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IAgentNewMapper">
+
+</mapper>

src/main/resources/mapper/manage/InvoiceMapper.xml

@@ -18,16 +18,15 @@
       i.`register_phone` as registerPhone,
       i.`bank_name` as bankName,
       i.`bank_account` as bankAccount,
-      re.`ship_name` as shipName,
-      re.`ship_mobile` as shipMobile,
-      re.`ship_address` as shipAddress,
+    i.`ship_name` as shipName,
+    i.`ship_mobile` as shipMobile,
+    i.`ship_address` as shipAddress,
       i.`email_address` AS email,
-      i.`invoiced`
+      i.`invoiced`,
+    i.`user_id` as userId
       FROM t_invoice i
       LEFT JOIN t_order o ON i.`order_id` = o.`id`
-      left join t_receiver_info re on i.user_id = re.user_id
       WHERE i.`consume_type` = 0 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
-        and re.rec_status = 'A'
       <if test="param.orderSn != null and param.orderSn != ''">
         and o.`order_sn` like  concat('%', #{param.orderSn}, '%')
       </if>
@@ -64,8 +63,9 @@
       i.`ship_mobile` AS shipMobile,
       i.`ship_address` AS shipAddress,
       i.`email_address` AS email,
-      i.`invoiced`
-      FROM t_invoice i
+      i.`invoiced`,
+    i.`user_id` as userId
+    FROM t_invoice i
       LEFT JOIN t_increment_order o ON i.`increment_order_id` = o.`id`
       WHERE i.`consume_type` = 2 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
       <if test="param.orderSn != null and param.orderSn != ''">
@@ -104,8 +104,9 @@
       i.`ship_mobile` AS shipMobile,
       i.`ship_address` AS shipAddress,
       i.`email_address` AS email,
-      i.`invoiced`
-      FROM t_invoice i
+      i.`invoiced`,
+    i.`user_id` as userId
+    FROM t_invoice i
       LEFT JOIN t_download_order o ON i.`download_order_id` = o.`id`
       WHERE i.`consume_type` = 3 AND i.`rec_status` = 'A' AND o.`rec_status` = 'A' AND i.`type` != 1
       <if test="param.orderSn != null and param.orderSn != ''">

src/main/resources/mapper/manage/ReceiverInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IReceiverInfoMapper">
+
+</mapper>