Merge branch 'dev-xucaiqin' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/auth/context/LoginUserHolder.java

@@ -1,140 +1,140 @@
-package com.sckw.core.model.auth.context;
-
-import com.sckw.core.model.auth.LoginUserInfo;
-
-/**
- * 当前登录用户的临时保存容器
- * @Author zhaokang
- * @date 2020/04/13 0021
- */
-public class LoginUserHolder {
-
-    private static final ThreadLocal<LoginUserInfo> LONGIN_USER_HOLDER = new ThreadLocal<LoginUserInfo>();
-
-    /**
-     * 赋值
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static void set(LoginUserInfo loginUserInfo) {
-        LONGIN_USER_HOLDER.set(loginUserInfo);
-    }
-
-    /**
-     * 取值
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static LoginUserInfo get() {
-        return LONGIN_USER_HOLDER == null ? null : LONGIN_USER_HOLDER.get();
-    }
-
-    /**
-     * 删除保存的用户
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static void remove() {
-        LONGIN_USER_HOLDER.remove();
-    }
-
-    /**
-     * 用户id
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Long getUserId(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getId();
-    }
-
-    /**
-     * 用户所属系统
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Integer getSystemType(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getSystemType();
-    }
-
-    /**
-     * 用户账号
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static String getAccount(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getAccount();
-    }
-
-    /**
-     * 用户姓名
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static String getUserName(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getUserName();
-    }
-
-    /**
-     * 用户电话
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static String getPhone(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getPhone();
-    }
-
-    /**
-     * 是否主账号（0是/1否）
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Integer getIsMain(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getIsMain();
-    }
-
-    /**
-     * 用户账号状态(0正常/1锁定)
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Integer getStatus(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getStatus();
-    }
-
-    /**
-     * 用户所属企业
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Long getEntId(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getEntId();
-    }
-
-    /**
-     * 用户登录终端
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static String getClientType(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getClientType();
-    }
-
-    /**
-     * 用户机构
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static Long getDeptId(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getDeptId();
-    }
-
-    /**
-     * (司机)
-     * @author zhaokang
-     * @Date 2020/04/13 0021
-     */
-    public static String getUserIds(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getUserIds();
-    }
-
-}
+//package com.sckw.core.model.auth.context;
+//
+//import com.sckw.core.model.auth.LoginUserInfo;
+//
+///**
+// * 当前登录用户的临时保存容器
+// * @Author zhaokang
+// * @date 2020/04/13 0021
+// */
+//public class LoginUserHolder {
+//
+//    private static final ThreadLocal<LoginUserInfo> LONGIN_USER_HOLDER = new ThreadLocal<LoginUserInfo>();
+//
+//    /**
+//     * 赋值
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static void set(LoginUserInfo loginUserInfo) {
+//        LONGIN_USER_HOLDER.set(loginUserInfo);
+//    }
+//
+//    /**
+//     * 取值
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static LoginUserInfo get() {
+//        return LONGIN_USER_HOLDER == null ? null : LONGIN_USER_HOLDER.get();
+//    }
+//
+//    /**
+//     * 删除保存的用户
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static void remove() {
+//        LONGIN_USER_HOLDER.remove();
+//    }
+//
+//    /**
+//     * 用户id
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Long getUserId(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getId();
+//    }
+//
+//    /**
+//     * 用户所属系统
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Integer getSystemType(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getSystemType();
+//    }
+//
+//    /**
+//     * 用户账号
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static String getAccount(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getAccount();
+//    }
+//
+//    /**
+//     * 用户姓名
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static String getUserName(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getUserName();
+//    }
+//
+//    /**
+//     * 用户电话
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static String getPhone(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getPhone();
+//    }
+//
+//    /**
+//     * 是否主账号（0是/1否）
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Integer getIsMain(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getIsMain();
+//    }
+//
+//    /**
+//     * 用户账号状态(0正常/1锁定)
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Integer getStatus(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getStatus();
+//    }
+//
+//    /**
+//     * 用户所属企业
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Long getEntId(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getEntId();
+//    }
+//
+//    /**
+//     * 用户登录终端
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static String getClientType(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getClientType();
+//    }
+//
+//    /**
+//     * 用户机构
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static Long getDeptId(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getDeptId();
+//    }
+//
+//    /**
+//     * (司机)
+//     * @author zhaokang
+//     * @Date 2020/04/13 0021
+//     */
+//    public static String getUserIds(){
+//        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getUserIds();
+//    }
+//
+//}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -2,12 +2,12 @@ package com.sckw.fleet.service;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;
-import com.sckw.core.model.auth.context.LoginUserHolder;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.RegularUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.fleet.dao.KwfDriverMapper;
 import com.sckw.fleet.dao.KwfTruckMapper;
@@ -15,7 +15,10 @@ import com.sckw.fleet.dao.KwfTruckReportMapper;
 import com.sckw.fleet.model.KwfDriver;
 import com.sckw.fleet.model.KwfTruck;
 import com.sckw.fleet.model.KwfTruckReport;
-import com.sckw.fleet.model.dto.*;
+import com.sckw.fleet.model.dto.KwfChangeFleetDto;
+import com.sckw.fleet.model.dto.KwfDriverDto;
+import com.sckw.fleet.model.dto.KwfTruckDto;
+import com.sckw.fleet.model.dto.KwfTruckReportDto;
 import com.sckw.fleet.model.vo.KwfTableTopCount;
 import com.sckw.fleet.model.vo.KwfTruckReportVo;
 import com.sckw.system.api.RemoteSystemService;
@@ -26,6 +29,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerLogisticsMapper.java

@@ -24,7 +24,7 @@ public interface KwpLedgerLogisticsMapper extends BaseMapper<KwpLedgerLogistics>
      */
     List<LedgerLogisticsDto> pageSelect(@Param("logisticsReq") LogisticsReq logisticsReq, @Param("ids") List<Long> ids);
 
-    Map<String, Long> countOrder();
+    Map<String, Long> countOrder(@Param("entId") Long entId);
 
     List<LedgerLogisticsDto> selectIds(@Param("ids") List<Long> ids);
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeMapper.java

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
     List<LedgerTradeDto> pageSelect(@Param("tradeReq") TradeReq tradeReq);
 
-    Map<String, Long> countOrder();
+    Map<String, Long> countOrder(@Param("entId") Long entId);
 
     List<LedgerTradeDto> selectIds(@Param("ids") List<Long> ids);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsReq.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.core.model.vo.BasePara;
 import com.sckw.payment.model.constant.LedgerEnum;
 import lombok.Getter;
@@ -18,7 +19,10 @@ import java.util.List;
 public class LogisticsReq extends BasePara {
     @Serial
     private static final long serialVersionUID = 5328731681168692784L;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+
     private LocalDateTime startCreateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endCreateTime;
     private Integer trading;
     /**
@@ -26,4 +30,5 @@ public class LogisticsReq extends BasePara {
      */
     private Integer status;
     private List<Long> ids;
+    private Long entId;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -8,6 +8,7 @@ import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.OrderGenerateUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.payment.dao.KwpLedgerLogisticsMapper;
 import com.sckw.payment.model.*;
 import com.sckw.payment.model.constant.LedgerEnum;
@@ -82,6 +83,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
      * @return
      */
     public PageRes<LedgerLogisticsDto> pageList(LogisticsReq logisticsReq) {
+        logisticsReq.setEntId(LoginUserHolder.getEntId());
         PageHelper.startPage(logisticsReq.getPage(), logisticsReq.getPageSize());
         List<LedgerLogisticsDto> kwpLedgerLogisticsList = logisticsMapper.pageSelect(logisticsReq, new ArrayList<>());
         //字典转换
@@ -129,14 +131,14 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     private Long saveDraft(LogisticsSendReq logisticsSendReq) {
         KwpLedgerLogistics kwpLedgerLogistics = new KwpLedgerLogistics();
         kwpLedgerLogistics.setId(Objects.isNull(logisticsSendReq.getId()) ? new IdWorker(1).nextId() : logisticsSendReq.getId());
-        kwpLedgerLogistics.setEntId(0L);
+        kwpLedgerLogistics.setEntId(LoginUserHolder.getEntId());
         kwpLedgerLogistics.setName(logisticsSendReq.getName());
         kwpLedgerLogistics.setStartTime(logisticsSendReq.getStartTime());
         kwpLedgerLogistics.setEndTime(logisticsSendReq.getEndTime());
         kwpLedgerLogistics.setTaxRate(logisticsSendReq.getTaxRate());
         kwpLedgerLogistics.setTrading(logisticsSendReq.getTrading());
         kwpLedgerLogistics.setTotalPrice(logisticsSendReq.getTotalPrice());
-        kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());//todo 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
         kwpLedgerLogistics.setSettlePrice(logisticsSendReq.getSettlePrice());
         kwpLedgerLogistics.setActualPrice(new BigDecimal("0.0"));
         kwpLedgerLogistics.setAuditUser("");
@@ -147,15 +149,17 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setGenerateTime(logisticsSendReq.getGenerateTime());
         kwpLedgerLogistics.setRemark("");
         kwpLedgerLogistics.setStatus(logisticsSendReq.getStatus());
-        kwpLedgerLogistics.setCreateBy(0L);
-        kwpLedgerLogistics.setCreateTime(LocalDateTime.now());
-        kwpLedgerLogistics.setUpdateBy(0L);
-        kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setDelFlag(0);
         if (Objects.isNull(logisticsSendReq.getId())) {
+            kwpLedgerLogistics.setCreateBy(LoginUserHolder.getUserId());
+            kwpLedgerLogistics.setCreateTime(LocalDateTime.now());
+            kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
+            kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
             kwpLedgerLogistics.setLLedgerNo(OrderGenerateUtils.generateOrderNo("LL"));
             logisticsMapper.insert(kwpLedgerLogistics);
         } else {
+            kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
+            kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
             logisticsMapper.updateById(kwpLedgerLogistics);
         }
         /*保存物流订单关联数据*/
@@ -171,9 +175,9 @@ public class KwpLedgerLogisticsService extends AbsLedger {
             logisticsOrder.setLOrderId(a.getId());
             logisticsOrder.setRemark("");
             logisticsOrder.setStatus(0);
-            logisticsOrder.setCreateBy(0L);
+            logisticsOrder.setCreateBy(LoginUserHolder.getUserId());
             logisticsOrder.setCreateTime(LocalDateTime.now());
-            logisticsOrder.setUpdateBy(0L);
+            logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
             logisticsOrder.setUpdateTime(LocalDateTime.now());
             logisticsOrder.setDelFlag(0);
             return logisticsOrder;
@@ -190,15 +194,15 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogisticsUnit.setLLedgerNo(kwpLedgerLogistics.getLLedgerNo());
         kwpLedgerLogisticsUnit.setUnitType(LogisticsUnitType.SHIPPER);
         kwpLedgerLogisticsUnit.setEntId(checkEntId);
-        kwpLedgerLogisticsUnit.setTopEntId(checkEntId);//todo
+        kwpLedgerLogisticsUnit.setTopEntId(checkEntId);//todo-xcq
         kwpLedgerLogisticsUnit.setFirmName("");
         kwpLedgerLogisticsUnit.setContacts("");
         kwpLedgerLogisticsUnit.setPhone("");
         kwpLedgerLogisticsUnit.setRemark("");
         kwpLedgerLogisticsUnit.setStatus(0);
-        kwpLedgerLogisticsUnit.setCreateBy(0L);
+        kwpLedgerLogisticsUnit.setCreateBy(LoginUserHolder.getUserId());
         kwpLedgerLogisticsUnit.setCreateTime(LocalDateTime.now());
-        kwpLedgerLogisticsUnit.setUpdateBy(0L);
+        kwpLedgerLogisticsUnit.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogisticsUnit.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogisticsUnit.setDelFlag(0);
 
@@ -209,16 +213,16 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         carrierUnit.setLLedgerId(kwpLedgerLogistics.getId());
         carrierUnit.setLLedgerNo(kwpLedgerLogistics.getLLedgerNo());
         carrierUnit.setUnitType(LogisticsUnitType.CARRIER);
-        carrierUnit.setEntId(checkEntId);//todo
-        carrierUnit.setTopEntId(checkEntId);//todo
+        carrierUnit.setEntId(LoginUserHolder.getEntId());
+        carrierUnit.setTopEntId(checkEntId);//todo-xcq
         carrierUnit.setFirmName("");
         carrierUnit.setContacts("");
         carrierUnit.setPhone("");
         carrierUnit.setRemark("");
         carrierUnit.setStatus(0);
-        carrierUnit.setCreateBy(0L);
+        carrierUnit.setCreateBy(LoginUserHolder.getUserId());
         carrierUnit.setCreateTime(LocalDateTime.now());
-        carrierUnit.setUpdateBy(0L);
+        carrierUnit.setUpdateBy(LoginUserHolder.getUserId());
         carrierUnit.setUpdateTime(LocalDateTime.now());
         carrierUnit.setDelFlag(0);
 
@@ -273,6 +277,8 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         revokeCheck(kwpLedgerLogistics.getStatus());
 
         kwpLedgerLogistics.setStatus(LedgerEnum.BACK.getStatus());
+        kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
+        kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
         return logisticsTrackService.saveTrack(id, "", LedgerTrackEnum.REVOKE);
     }
@@ -300,6 +306,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         }
         backCheck(kwpLedgerLogistics.getStatus());
         kwpLedgerLogistics.setStatus(LedgerEnum.BACK.getStatus());
+        kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
         return logisticsTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
@@ -324,6 +331,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setAuditUser(confirmReq.getAuditUser());
         kwpLedgerLogistics.setUrl(confirmReq.getUrl());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
+        kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         logisticsMapper.updateById(kwpLedgerLogistics);
         return logisticsTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
     }
@@ -344,12 +352,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
         kwpLedgerLogistics.setReceiptTime(ledgerReq.getReceiptTime());
         kwpLedgerLogistics.setStatus(LedgerEnum.SUCCESS.getStatus());
+        kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         logisticsMapper.updateById(kwpLedgerLogistics);
         //生成结算单
         KwpSettlementLogistics kwpSettlementLogistics = new KwpSettlementLogistics();
         kwpSettlementLogistics.setId(new IdWorker(1).nextId());
-        kwpSettlementLogistics.setEntId(0L);//todo
+        kwpSettlementLogistics.setEntId(LoginUserHolder.getEntId());
         kwpSettlementLogistics.setLLedgerId(kwpLedgerLogistics.getId());
         kwpSettlementLogistics.setSlOrderNo(OrderGenerateUtils.generateOrderNo("SL"));
         kwpSettlementLogistics.setName(kwpLedgerLogistics.getName());//取物流对账单名称
@@ -362,9 +371,9 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementLogistics.setReceiptTime(ledgerReq.getReceiptTime());
         kwpSettlementLogistics.setStatus(0);
-        kwpSettlementLogistics.setCreateBy(0L);
+        kwpSettlementLogistics.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementLogistics.setCreateTime(LocalDateTime.now());
-        kwpSettlementLogistics.setUpdateBy(0L);
+        kwpSettlementLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpSettlementLogistics.setUpdateTime(LocalDateTime.now());
         kwpSettlementLogistics.setDelFlag(0);
 
@@ -375,7 +384,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     }
 
     public List<LedgerCountVo> orderCount() {
-        Map<String, Long> map = logisticsMapper.countOrder();
+        Map<String, Long> map = logisticsMapper.countOrder(LoginUserHolder.getEntId());
         LedgerCountVo ledgerCountVo;
         List<LedgerCountVo> res = new ArrayList<>();
         for (LedgerEnum value : LedgerEnum.values()) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -9,6 +9,7 @@ import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.OrderGenerateUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.payment.dao.KwpLedgerTradeMapper;
@@ -105,14 +106,14 @@ public class KwpLedgerTradeService extends AbsLedger {
     private Long saveDraft(TradeSendReq tradeSendReq) {
         KwpLedgerTrade kwpLedgerTrade = new KwpLedgerTrade();
         kwpLedgerTrade.setId(Objects.isNull(tradeSendReq.getId()) ? new IdWorker(1).nextId() : tradeSendReq.getId());
-        kwpLedgerTrade.setEntId(0L);//todo
+        kwpLedgerTrade.setEntId(LoginUserHolder.getEntId());
         kwpLedgerTrade.setName(tradeSendReq.getName());
         kwpLedgerTrade.setStartTime(tradeSendReq.getStartTime());
         kwpLedgerTrade.setEndTime(tradeSendReq.getEndTime());
         kwpLedgerTrade.setTaxRate(tradeSendReq.getTaxRate());
         kwpLedgerTrade.setTrading(tradeSendReq.getTrading());
         kwpLedgerTrade.setTotalPrice(tradeSendReq.getTotalPrice());
-        kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());//todo 不含税金额计算方式：订单含税金额总和/1.13(税率)
+        kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());//todo-xcq 不含税金额计算方式：订单含税金额总和/1.13(税率)
         kwpLedgerTrade.setSettlePrice(tradeSendReq.getSettlePrice());
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
         kwpLedgerTrade.setAuditUser("");
@@ -123,21 +124,24 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setUrl("");
         kwpLedgerTrade.setRemark("");
         kwpLedgerTrade.setStatus(tradeSendReq.getStatus());
-        kwpLedgerTrade.setCreateBy(0L);
-        kwpLedgerTrade.setCreateTime(LocalDateTime.now());
-        kwpLedgerTrade.setUpdateBy(0L);
-        kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
+
         kwpLedgerTrade.setDelFlag(0);
         if (Objects.isNull(tradeSendReq.getId())) {
             kwpLedgerTrade.setTLedgerNo(OrderGenerateUtils.generateOrderNo("TL"));
+            kwpLedgerTrade.setCreateBy(LoginUserHolder.getUserId());
+            kwpLedgerTrade.setCreateTime(LocalDateTime.now());
+            kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
+            kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.insert(kwpLedgerTrade);
         } else {
+            kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
+            kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.updateById(kwpLedgerTrade);
         }
 
         /*保存贸易订单关联数据*/
         List<Long> ids = tradeSendReq.getIds();
-        //todo dubbo拿取销售订单数据
+        //todo-xcq dubbo拿取销售订单数据
         List<OrderDetailRes> resList = new ArrayList<>();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
@@ -153,16 +157,16 @@ public class KwpLedgerTradeService extends AbsLedger {
             kwpLedgerTradeOrder.setTOrderId(a.getId());
             kwpLedgerTradeOrder.setRemark("");
             kwpLedgerTradeOrder.setStatus(0);
-            kwpLedgerTradeOrder.setCreateBy(0L);
+            kwpLedgerTradeOrder.setCreateBy(LoginUserHolder.getUserId());
             kwpLedgerTradeOrder.setCreateTime(LocalDateTime.now());
-            kwpLedgerTradeOrder.setUpdateBy(0L);
+            kwpLedgerTradeOrder.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTradeOrder.setUpdateTime(LocalDateTime.now());
             kwpLedgerTradeOrder.setDelFlag(0);
             return kwpLedgerTradeOrder;
         }).collect(Collectors.toList());
         tradeOrderService.saveList(collect);
         /*保存企业单位相关信息*/
-        //todo dubbo拿取采购客户单位的信息
+        //todo-xcq dubbo拿取采购客户单位的信息
         Long purchaseEntId = tradeSendReq.getPurchaseEntId();
         List<KwpLedgerTradeUnit> list = new ArrayList<>();
         KwpLedgerTradeUnit kwpLedgerTradeUnit = new KwpLedgerTradeUnit();
@@ -172,14 +176,14 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTradeUnit.setUnitType(TradeUnitType.PURCHASE);
         kwpLedgerTradeUnit.setEntId(purchaseEntId);
         kwpLedgerTradeUnit.setTopEntId(0L);
-        kwpLedgerTradeUnit.setFirmName("");
+        kwpLedgerTradeUnit.setFirmName("");//todo-xcq
         kwpLedgerTradeUnit.setContacts("");
         kwpLedgerTradeUnit.setPhone("");
         kwpLedgerTradeUnit.setRemark("");
         kwpLedgerTradeUnit.setStatus(0);
-        kwpLedgerTradeUnit.setCreateBy(0L);
+        kwpLedgerTradeUnit.setCreateBy(LoginUserHolder.getUserId());
         kwpLedgerTradeUnit.setCreateTime(LocalDateTime.now());
-        kwpLedgerTradeUnit.setUpdateBy(0L);
+        kwpLedgerTradeUnit.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTradeUnit.setUpdateTime(LocalDateTime.now());
         kwpLedgerTradeUnit.setDelFlag(0);
 
@@ -190,16 +194,16 @@ public class KwpLedgerTradeService extends AbsLedger {
         sellLedgerTradeUnit.setTLedgerId(kwpLedgerTrade.getId());
         sellLedgerTradeUnit.setTLedgerNo(kwpLedgerTrade.getTLedgerNo());
         sellLedgerTradeUnit.setUnitType(TradeUnitType.SELL);
-        sellLedgerTradeUnit.setEntId(purchaseEntId);//todo
+        sellLedgerTradeUnit.setEntId(LoginUserHolder.getEntId());
         sellLedgerTradeUnit.setTopEntId(0L);
         sellLedgerTradeUnit.setFirmName("");
         sellLedgerTradeUnit.setContacts("");
         sellLedgerTradeUnit.setPhone("");
         sellLedgerTradeUnit.setRemark("");
         sellLedgerTradeUnit.setStatus(0);
-        sellLedgerTradeUnit.setCreateBy(0L);
+        sellLedgerTradeUnit.setCreateBy(LoginUserHolder.getUserId());
         sellLedgerTradeUnit.setCreateTime(LocalDateTime.now());
-        sellLedgerTradeUnit.setUpdateBy(0L);
+        sellLedgerTradeUnit.setUpdateBy(LoginUserHolder.getUserId());
         sellLedgerTradeUnit.setUpdateTime(LocalDateTime.now());
         sellLedgerTradeUnit.setDelFlag(0);
         list.add(sellLedgerTradeUnit);
@@ -261,6 +265,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         }
         deleteCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setDelFlag(1);
+        kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
         tradeTrackService.saveTrack(kwpLedgerTrade.getId(), "", LedgerTrackEnum.DELETE);
@@ -273,16 +278,19 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @param id
      * @return
      */
-    public Integer backOrder(Long id) {
+    public String backOrder(Long id) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(id);
         if (Objects.isNull(kwpLedgerTrade)) {
             throw new BusinessException("对账单不存在!");
         }
         revokeCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.BACK.getStatus());
+        kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
+        kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
 
-        return tradeTrackService.saveTrack(id, "", LedgerTrackEnum.REVOKE);
+        tradeTrackService.saveTrack(id, "", LedgerTrackEnum.REVOKE);
+        return "撤回成功";
     }
 
     /**
@@ -301,16 +309,18 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @param ledgerReq
      * @return
      */
-    public Integer doBack(LedgerReq ledgerReq) {
+    public String doBack(LedgerReq ledgerReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(ledgerReq.getId());
         if (Objects.isNull(kwpLedgerTrade)) {
             throw new BusinessException("对账单不存在!");
         }
         backCheck(kwpLedgerTrade.getStatus());
         kwpLedgerTrade.setStatus(LedgerEnum.BACK.getStatus());
+        kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        return tradeTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        tradeTrackService.saveTrack(ledgerReq.getId(), ledgerReq.getRemark(), LedgerTrackEnum.REJECT);
+        return "驳回成功";
     }
 
     /**
@@ -320,7 +330,7 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer confirmOrder(LedgerConfirmReq confirmReq) {
+    public String confirmOrder(LedgerConfirmReq confirmReq) {
         KwpLedgerTrade kwpLedgerTrade = tradeMapper.selectById(confirmReq.getId());
         if (Objects.isNull(kwpLedgerTrade)) {
             throw new BusinessException("对账单不存在!");
@@ -330,9 +340,11 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setAuditPhone(confirmReq.getAuditPhone());
         kwpLedgerTrade.setAuditUser(confirmReq.getAuditUser());
         kwpLedgerTrade.setUrl(confirmReq.getUrl());
+        kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
-        return tradeTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        tradeTrackService.saveTrack(confirmReq.getId(), "", LedgerTrackEnum.CONFIRM);
+        return "对账确认成功";
     }
 
     /**
@@ -356,7 +368,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //生成结算单
         KwpSettlementTrade kwpSettlementTrade = new KwpSettlementTrade();
         kwpSettlementTrade.setId(new IdWorker(1).nextId());
-        kwpSettlementTrade.setEntId(0L);//todo
+        kwpSettlementTrade.setEntId(LoginUserHolder.getEntId());
         kwpSettlementTrade.setTLedgerId(kwpLedgerTrade.getId());
         kwpSettlementTrade.setStOrderNo(OrderGenerateUtils.generateOrderNo("ST"));
         kwpSettlementTrade.setName(kwpLedgerTrade.getName());
@@ -369,9 +381,9 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementTrade.setReceiptTime(ledgerReq.getReceiptTime());
         kwpSettlementTrade.setStatus(0);
-        kwpSettlementTrade.setCreateBy(0L);
+        kwpSettlementTrade.setCreateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setCreateTime(LocalDateTime.now());
-        kwpSettlementTrade.setUpdateBy(0L);
+        kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
         kwpSettlementTrade.setDelFlag(0);
         settlementTradeService.save(kwpSettlementTrade);
@@ -381,7 +393,7 @@ public class KwpLedgerTradeService extends AbsLedger {
     }
 
     public List<LedgerCountVo> orderCount() {
-        Map<String, Long> map = tradeMapper.countOrder();
+        Map<String, Long> map = tradeMapper.countOrder(LoginUserHolder.getEntId());
         LedgerCountVo ledgerCountVo;
         List<LedgerCountVo> res = new ArrayList<>();
         for (LedgerEnum value : LedgerEnum.values()) {

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerLogisticsMapper.xml

@@ -87,6 +87,7 @@
         <where>
             kll.del_flag = 0
               and kllu.unit_type = 1
+              and kll.ent_id = #{logisticsReq.entId,jdbcType=BIGINT}
             <if test="logisticsReq.status != null">
                 and kll.status = #{logisticsReq.status}
             </if>
@@ -116,38 +117,39 @@
                count(IF(`status` = 4, 1, NULL)) "4",
                count(IF(`status` = 5, 1, NULL)) "5"
         FROM `kwp_ledger_logistics`
-        WHERE del_flag = 0;
+        WHERE del_flag = 0
+        and ent_id = #{entId,jdbcType=BIGINT}
     </select>
 
     <select id="selectIds" resultType="com.sckw.payment.model.dto.LedgerLogisticsDto">
         select kll.id,
-        kll.l_ledger_no   lLedgerNo,
-        kll.name,
-        kll.start_time    startTime,
-        kll.end_time      endTime,
-        kll.tax_rate      taxRate,
-        kll.trading,
-        kll.total_price   totalPrice,
-        kll.ex_tax_price  exTaxPrice,
-        kll.settle_price  settlePrice,
-        kll.actual_price  actualPrice,
-        kll.audit_phone   auditPhone,
-        kll.audit_user    auditUser,
-        kll.url,
-        kll.generate_time generateTime,
-        kll.receipt_time  receiptTime,
-        kll.remark,
-        kll.status,
-        kllu.contacts,
-        kllu.phone,
-        kllu.firm_name    firmName,
-        kll.order_count   orderCount
+               kll.l_ledger_no   lLedgerNo,
+               kll.name,
+               kll.start_time    startTime,
+               kll.end_time      endTime,
+               kll.tax_rate      taxRate,
+               kll.trading,
+               kll.total_price   totalPrice,
+               kll.ex_tax_price  exTaxPrice,
+               kll.settle_price  settlePrice,
+               kll.actual_price  actualPrice,
+               kll.audit_phone   auditPhone,
+               kll.audit_user    auditUser,
+               kll.url,
+               kll.generate_time generateTime,
+               kll.receipt_time  receiptTime,
+               kll.remark,
+               kll.status,
+               kllu.contacts,
+               kllu.phone,
+               kllu.firm_name    firmName,
+               kll.order_count   orderCount
         from kwp_ledger_logistics kll
-        inner join kwp_ledger_logistics_unit kllu on kll.id = kllu.l_ledger_id and kllu.del_flag = 0
+                 inner join kwp_ledger_logistics_unit kllu on kll.id = kllu.l_ledger_id and kllu.del_flag = 0
         <where>
             kll.del_flag = 0
-            and kllu.unit_type = 1
-            and kll.id in
+              and kllu.unit_type = 1
+              and kll.id in
             <foreach collection="ids" item="id" close=")" open="(" separator=",">
                 #{id,jdbcType=BIGINT}
             </foreach>

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeMapper.xml

@@ -116,7 +116,8 @@
                count(IF(`status` = 4, 1, NULL)) "4",
                count(IF(`status` = 5, 1, NULL)) "5"
         FROM `kwp_ledger_trade`
-        WHERE del_flag = 0;
+        WHERE del_flag = 0
+          and ent_id = #{entId,jdbcType=BIGINT}
     </select>
 
     <select id="selectIds" resultType="com.sckw.payment.model.dto.LedgerTradeDto">