ERP发货单

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -1,24 +1,24 @@
 package com.qs.serve.modules.bir.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.RepeatSubmit;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
-import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bir.service.BirBaseActivityService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bir.entity.BirRoiRate;
 import com.qs.serve.modules.bir.service.BirRoiRateService;
 
-import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,6 +35,10 @@ public class BirRoiRateController {
     private BirRoiRateService birRoiRateService;
     private BirBaseActivityService activityService;
 
+    /**
+     *
+     * @return
+     */
     @GetMapping("/test")
     public R<PageVo<BirRoiRate>> getPage(){
         for (int i = 0; i < 12; i++) {
@@ -44,18 +48,38 @@ public class BirRoiRateController {
     }
 
 
+
     /**
-     * 翻页
+     * 获取费率
      * @param param
      * @return
      */
-    //@GetMapping("/page")
+    @RepeatSubmit
-    public R<PageVo<BirRoiRate>> getPage(BirRoiRate param){
+    @GetMapping("/costYearMonth")
-        LambdaQueryWrapper<BirRoiRate> lqw = new LambdaQueryWrapper<>(param);
+    @SysLog(module = SystemModule.Verification, title = "客户明细帐", biz = BizType.EXPORT)
-        PageUtil.startPage();
+    public R<List<BirRoiCostItemVo>> getCostRoiOfYearMonth(BirCostRoiSo param){
-        List<BirRoiRate> list = birRoiRateService.list(lqw);
+        List<BirRoiCostItemVo> list = new ArrayList<>();
-        return R.byPageHelperList(list);
+        BirRoiCostItemVo itemVo = new BirRoiCostItemVo();
+        itemVo.setYearMonth(202301);
+        itemVo.setYearMonthDate(LocalDate.of(2023,1,1));
+        itemVo.setCostAmt(BigDecimal.ZERO);
+        itemVo.setCheckAmt(BigDecimal.ZERO);
+        itemVo.setReturnAmt(BigDecimal.ONE);
+        itemVo.setDispatchAmt(BigDecimal.ZERO);
+
+        BirRoiCostItemVo itemVo2 = new BirRoiCostItemVo();
+        itemVo2.setYearMonth(202302);
+        itemVo.setYearMonthDate(LocalDate.of(2023,2,1));
+        itemVo2.setCostAmt(new BigDecimal(100));
+        itemVo2.setCheckAmt(new BigDecimal(80));
+        itemVo2.setReturnAmt(BigDecimal.ONE);
+        itemVo2.setDispatchAmt(new BigDecimal(60));
+
+        list.add(itemVo2);
+        list.add(itemVo);
+        return R.ok(list);
     }
 
+
 }
 

src/main/java/com/qs/serve/modules/bir/entity/so/BirCostRoiSo.java

@@ -0,0 +1,27 @@
+package com.qs.serve.modules.bir.entity.so;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/6/6
+ */
+@Data
+public class BirCostRoiSo {
+
+    /**
+     * 供应商ID
+     */
+    private String supplierId;
+
+    /**
+     * 加载类型
+     * 0->客户
+     * 1->客户的申请人
+     * 2->客户的行政区域
+     * 3->客户的销售区域
+     */
+    private Integer loadType;
+
+
+}

src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java

@@ -0,0 +1,45 @@
+package com.qs.serve.modules.bir.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @author YenHex
+ * @since 2023/6/6
+ */
+@Data
+public class BirRoiCostItemVo {
+
+    /**
+     * 年/月
+     */
+    private Integer yearMonth;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate yearMonthDate;
+
+    /**
+     * 费用金额
+     */
+    private BigDecimal costAmt;
+
+    /**
+     * 核销金额
+     */
+    private BigDecimal checkAmt;
+
+    /**
+     * 利润金额
+     */
+    private BigDecimal returnAmt;
+
+    /**
+     * 发货金额
+     */
+    private BigDecimal dispatchAmt;
+
+
+}

src/main/java/com/qs/serve/modules/bir/service/BirBaseActivityService.java

@@ -11,10 +11,13 @@ import com.qs.serve.modules.bir.entity.BirBaseActivity;
 public interface BirBaseActivityService extends IService<BirBaseActivity> {
 
     /**
-     * 创建
+     * 创建分割统计表
      * @param year
      * @param month
      */
     void buildReport(int year, int month);
+
+
+
 }
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -45,7 +45,6 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
         int lastDayNum2 = startDate.lengthOfMonth();
         LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
         LambdaQueryWrapper<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
-        //todo dev activityLqw.eq(TbsActivity::getCostPassFlag,1);
         activityLqw.and(qw->{
             qw.between(TbsActivity::getActStartDate,startDate,endDate)
               .or().between(TbsActivity::getActEndDate,startDate,endDate);
@@ -119,6 +118,11 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
             baseActivity.setTotalDays(currentActDays);
             birBaseActivities.add(baseActivity);
         }
+        //删除历史数据
+        LambdaQueryWrapper<BirBaseActivity> delLqw = new LambdaQueryWrapper<>();
+        delLqw.eq(BirBaseActivity::getKeyNum,yearMonth);
+        this.remove(delLqw);
+        //保存
         this.saveBatch(birBaseActivities);
     }
 

src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java

@@ -13,6 +13,7 @@ import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserSalesService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -48,9 +49,8 @@ public class BizVisitController {
             return R.byEmptyList();
         }
         PageUtil.startPage();
-        LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
         visitWrapper.in(BizVisit::getVisitorId,userIds);
-        visitWrapper.orderByDesc(BizVisit::getCreateTime);
         List<BizVisit> list = bizVisitService.list(visitWrapper);
         return R.byPageHelperList(list);
     }
@@ -64,16 +64,30 @@ public class BizVisitController {
     @GetMapping("/page")
     public R<PageVo<BizVisit>> getPage(BizVisit param){
         PageUtil.startPage();
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
+        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return R.byPageHelperList(list);
+    }
+
+    @NotNull
+    private LambdaQueryWrapper<BizVisit> getBizVisitLambdaQueryWrapper(BizVisit param) {
         LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
         visitWrapper.orderByDesc(BizVisit::getId);
         if(param.getQueryStartTime()!=null){
-            visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
+            visitWrapper.ge(BizVisit::getCreateTime, param.getQueryStartTime());
         }
         if(param.getQueryEndTime()!=null){
-            visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
+            visitWrapper.le(BizVisit::getCreateTime, param.getQueryEndTime().atTime(23,59,59));
         }
-        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(1)){
-        return R.byPageHelperList(list);
+            visitWrapper.eq(BizVisit::getLocalX,"0");
+            visitWrapper.eq(BizVisit::getLocalY,"0");
+        }
+        if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(0)){
+            visitWrapper.ne(BizVisit::getLocalX,"0");
+            visitWrapper.ne(BizVisit::getLocalY,"0");
+        }
+        return visitWrapper;
     }
 
     /**

src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java

@@ -20,6 +20,7 @@ import com.qs.serve.modules.wx.entity.WxUser;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,16 +57,30 @@ public class BizVisitApi {
         String userId = wxUser.getSysUserId();
         param.setVisitorId(userId);
         PageUtil.startPage();
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
+        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return R.byPageHelperList(list);
+    }
+
+    @NotNull
+    private LambdaQueryWrapper<BizVisit> getBizVisitLambdaQueryWrapper(BizVisit param) {
         LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
         if(param.getQueryStartTime()!=null){
-            visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
+            visitWrapper.ge(BizVisit::getCreateTime, param.getQueryStartTime());
         }
         if(param.getQueryEndTime()!=null){
-            visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
+            visitWrapper.le(BizVisit::getCreateTime, param.getQueryEndTime().atTime(23,59,59));
+        }
+        if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(1)){
+            visitWrapper.eq(BizVisit::getLocalX,"0");
+            visitWrapper.eq(BizVisit::getLocalY,"0");
+        }
+        if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(0)){
+            visitWrapper.ne(BizVisit::getLocalX,"0");
+            visitWrapper.ne(BizVisit::getLocalY,"0");
         }
         visitWrapper.orderByDesc(BizVisit::getCreateTime);
-        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return visitWrapper;
-        return R.byPageHelperList(list);
     }
 
     /**
@@ -85,15 +100,8 @@ public class BizVisitApi {
             return R.byEmptyList();
         }
         PageUtil.startPage();
-        LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
-        if(param.getQueryStartTime()!=null){
-            visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
-        }
-        if(param.getQueryEndTime()!=null){
-            visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
-        }
         visitWrapper.in(BizVisit::getVisitorId,userIds);
-        visitWrapper.orderByDesc(BizVisit::getCreateTime);
         List<BizVisit> list = bizVisitService.list(visitWrapper);
         return R.byPageHelperList(list);
     }

src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java

@@ -16,6 +16,7 @@ import com.qs.serve.modules.wx.service.WxUserService;
 import com.tencentcloudapi.mongodb.v20190725.models.Auth;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -46,16 +47,29 @@ public class BizVisitMyController {
         String userId = AuthContextUtils.getSysUserId();
         param.setVisitorId(userId);
         PageUtil.startPage();
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
+        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return R.byPageHelperList(list);
+    }
+
+    @NotNull
+    private LambdaQueryWrapper<BizVisit> getBizVisitLambdaQueryWrapper(BizVisit param) {
         LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
         if(param.getQueryStartTime()!=null){
-            visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
+            visitWrapper.ge(BizVisit::getCreateTime, param.getQueryStartTime());
         }
         if(param.getQueryEndTime()!=null){
-            visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
+            visitWrapper.le(BizVisit::getCreateTime, param.getQueryEndTime().atTime(23,59,59));
+        }if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(1)){
+            visitWrapper.eq(BizVisit::getLocalX,"0");
+            visitWrapper.eq(BizVisit::getLocalY,"0");
+        }
+        if(param.getMissLocalFlag()!=null&& param.getMissLocalFlag().equals(0)){
+            visitWrapper.ne(BizVisit::getLocalX,"0");
+            visitWrapper.ne(BizVisit::getLocalY,"0");
         }
         visitWrapper.orderByDesc(BizVisit::getCreateTime);
-        List<BizVisit> list = bizVisitService.list(visitWrapper);
+        return visitWrapper;
-        return R.byPageHelperList(list);
     }
 
     /**
@@ -71,15 +85,8 @@ public class BizVisitMyController {
             return R.byEmptyList();
         }
         PageUtil.startPage();
-        LambdaQueryWrapper<BizVisit> visitWrapper = new LambdaQueryWrapper<>(param);
+        LambdaQueryWrapper<BizVisit> visitWrapper = this.getBizVisitLambdaQueryWrapper(param);
         visitWrapper.in(BizVisit::getVisitorId,userIds);
-        visitWrapper.orderByDesc(BizVisit::getCreateTime);
-        if(param.getQueryStartTime()!=null){
-            visitWrapper.ge(BizVisit::getCreateTime,param.getQueryStartTime());
-        }
-        if(param.getQueryEndTime()!=null){
-            visitWrapper.le(BizVisit::getCreateTime,param.getQueryEndTime().atTime(23,59,59));
-        }
         List<BizVisit> list = bizVisitService.list(visitWrapper);
         return R.byPageHelperList(list);
     }

src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java

@@ -108,5 +108,8 @@ public class BizVisit implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate queryEndTime;
 
+    @TableField(exist = false)
+    private Integer missLocalFlag;
+
 }
 

src/main/java/com/qs/serve/modules/erp/entity/ErpDispatchData.java

@@ -0,0 +1,133 @@
+package com.qs.serve.modules.erp.entity;
+
+import java.time.LocalDate;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 发货单数据 实体类
+ * @author YenHex
+ * @since 2023-06-06
+ */
+@Data
+@TableName("erp_dispatch_data")
+public class ErpDispatchData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String place;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String dlCode;
+
+    /**  */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate date;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String cusCode;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String cusName;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String invCode;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String invName;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String invBatch;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String salesDepCode;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String depName;
+
+    /**  */
+    private Integer qty;
+
+    /**  */
+    private BigDecimal sumMoney;
+
+    /**  */
+    @Length(max = 255,message = "长度不能超过255字")
+    private String volume;
+
+    /**  */
+    private Double netWeight;
+
+    /**  */
+    private BigDecimal dispatchCost;
+
+    /**  */
+    private BigDecimal invDispatchCost;
+
+    /**  */
+    private BigDecimal invTransFee;
+
+    /**  */
+    private BigDecimal invProduceCost;
+
+    /**  */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+
+	public static ErpDispatchData toNewObject(ErpDispatchData source){
+		ErpDispatchData dispatchData = new ErpDispatchData();
+		dispatchData.setId(source.getId());
+		dispatchData.setPlace(source.getPlace());
+		dispatchData.setDlCode(source.getDlCode());
+		dispatchData.setDate(source.getDate());
+		dispatchData.setCusCode(source.getCusCode());
+		dispatchData.setCusName(source.getCusName());
+		dispatchData.setInvCode(source.getInvCode());
+		dispatchData.setInvName(source.getInvName());
+		dispatchData.setInvBatch(source.getInvBatch());
+		dispatchData.setSalesDepCode(source.getSalesDepCode());
+		dispatchData.setDepName(source.getDepName());
+		dispatchData.setQty(source.getQty());
+		dispatchData.setSumMoney(source.getSumMoney());
+		dispatchData.setVolume(source.getVolume());
+		dispatchData.setNetWeight(source.getNetWeight());
+		dispatchData.setDispatchCost(source.getDispatchCost());
+		dispatchData.setInvDispatchCost(source.getInvDispatchCost());
+		dispatchData.setInvTransFee(source.getInvTransFee());
+		dispatchData.setInvProduceCost(source.getInvProduceCost());
+		dispatchData.setCreateTime(source.getCreateTime());
+		return dispatchData;
+	}
+
+}
+

src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.erp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.modules.erp.entity.ErpDispatchData;
+
+/**
+ * 发货单数据 Mapper
+ * @author YenHex
+ * @date 2023-06-06
+ */
+public interface ErpDispatchDataMapper extends BaseMapper<ErpDispatchData> {
+
+}
+

src/main/java/com/qs/serve/modules/erp/service/ErpDispatchDataService.java

@@ -0,0 +1,14 @@
+package com.qs.serve.modules.erp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.serve.modules.erp.entity.ErpDispatchData;
+
+/**
+ * 发货单数据 服务接口
+ * @author YenHex
+ * @date 2023-06-06
+ */
+public interface ErpDispatchDataService extends IService<ErpDispatchData> {
+
+}
+

src/main/java/com/qs/serve/modules/erp/service/impl/ErpDispatchDataServiceImpl.java

@@ -0,0 +1,22 @@
+package com.qs.serve.modules.erp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.qs.serve.modules.erp.entity.ErpDispatchData;
+import com.qs.serve.modules.erp.service.ErpDispatchDataService;
+import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
+
+/**
+ * 发货单数据 服务实现类
+ * @author YenHex
+ * @since 2023-06-06
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ErpDispatchDataServiceImpl extends ServiceImpl<ErpDispatchDataMapper,ErpDispatchData> implements ErpDispatchDataService {
+
+}
+

src/main/java/com/qs/serve/modules/check/common/DataSupplierSo.java → src/main/java/com/qs/serve/modules/excel/common/DataSupplierSo.java

@@ -1,4 +1,4 @@
-package com.qs.serve.modules.check.common;
+package com.qs.serve.modules.excel.common;
 
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/qs/serve/modules/check/controller/DateCheckApplyController.java → src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java

@@ -1,16 +1,14 @@
-package com.qs.serve.modules.check.controller;
+package com.qs.serve.modules.excel.controller;
 
 import com.qs.serve.common.model.annotation.RepeatSubmit;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.excel.common.DataSupplierSo;
-import com.qs.serve.modules.check.common.DataSupplierSo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
-import com.qs.serve.modules.check.entity.DataCheckApplyDetailInfo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
-import com.qs.serve.modules.check.entity.DataCheckApplyDetailItem;
+import com.qs.serve.modules.excel.service.DateCheckApplyService;
-import com.qs.serve.modules.check.entity.DataCheckApplyMainInfo;
-import com.qs.serve.modules.check.service.DateCheckApplyService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -58,4 +56,5 @@ public class DateCheckApplyController {
         return R.ok(detailInfo);
     }
 
+
 }

src/main/java/com/qs/serve/modules/check/entity/DataCheckApplyDetailInfo.java → src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyDetailInfo.java

@@ -1,8 +1,7 @@
-package com.qs.serve.modules.check.entity;
+package com.qs.serve.modules.excel.entity;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 

src/main/java/com/qs/serve/modules/check/entity/DataCheckApplyDetailItem.java → src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyDetailItem.java

@@ -1,9 +1,8 @@
-package com.qs.serve.modules.check.entity;
+package com.qs.serve.modules.excel.entity;
 
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 
 /**
  * 对账单

src/main/java/com/qs/serve/modules/check/entity/DataCheckApplyMainInfo.java → src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java

@@ -1,4 +1,4 @@
-package com.qs.serve.modules.check.entity;
+package com.qs.serve.modules.excel.entity;
 
 import lombok.Data;
 

src/main/java/com/qs/serve/modules/check/service/DateCheckApplyService.java → src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java

@@ -1,8 +1,8 @@
-package com.qs.serve.modules.check.service;
+package com.qs.serve.modules.excel.service;
 
-import com.qs.serve.modules.check.common.DataSupplierSo;
+import com.qs.serve.modules.excel.common.DataSupplierSo;
-import com.qs.serve.modules.check.entity.DataCheckApplyDetailInfo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
-import com.qs.serve.modules.check.entity.DataCheckApplyMainInfo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
 
 /**
  * @author YenHex

src/main/java/com/qs/serve/modules/check/service/impl/DateCheckApplyServiceImpl.java → src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java

@@ -1,21 +1,18 @@
-package com.qs.serve.modules.check.service.impl;
+package com.qs.serve.modules.excel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
-import com.qs.serve.modules.bms.mapper.BmsSupplierContactsMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsSupplierContactsService;
-import com.qs.serve.modules.check.common.DataSupplierSo;
+import com.qs.serve.modules.excel.common.DataSupplierSo;
-import com.qs.serve.modules.check.entity.DataCheckApplyDetailInfo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
-import com.qs.serve.modules.check.entity.DataCheckApplyDetailItem;
+import com.qs.serve.modules.excel.entity.DataCheckApplyDetailItem;
-import com.qs.serve.modules.check.entity.DataCheckApplyMainInfo;
+import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
-import com.qs.serve.modules.check.service.DateCheckApplyService;
+import com.qs.serve.modules.excel.service.DateCheckApplyService;
 import com.qs.serve.modules.pay.common.PaymentType;
-import com.qs.serve.modules.pay.entity.PayPayment;
 import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
-import com.qs.serve.modules.pay.mapper.PayPaymentMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;

src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@@ -106,6 +106,7 @@ public class TbsActivityController {
             activity.setGoodsList(goodsList);
             List<TbsActivitySubject> activitySubjects = activitySubjectService.list(qw);
             activity.setSubjectCenterList(activitySubjects);
+            this.buildDetailVo(activity);
         }
         return R.ok(list);
     }
@@ -184,8 +185,13 @@ public class TbsActivityController {
     @PreAuthorize("hasRole('tbs:activity:query')")
     public R<TbsActivity> getById(@PathVariable("id") String id){
         TbsActivity activity = tbsActivityService.getById(id);
+        this.buildDetailVo(activity);
+        return R.ok(activity);
+    }
+
+    private void buildDetailVo(TbsActivity activity) {
         QueryWrapper qw = new QueryWrapper<>();
-        qw.eq("activity_id",activity.getId());
+        qw.eq("activity_id", activity.getId());
         List<TbsActivityGoods> goodsList = activityGoodsService.list(qw);
         if(goodsList.size()>0){
             activity.setGoodsType(goodsList.get(0).getTargetType());
@@ -232,7 +238,6 @@ public class TbsActivityController {
         List<TbsActivityCenterGoods> activityCenterGoodsList = activityCenterGoodsService.list(qw);
         activityCenterGoodsList.forEach(TbsActivityCenterGoods::initSpuSkuName);
         activity.setCenterGoodsList(activityCenterGoodsList);
-        return R.ok(activity);
     }
 
     /**