Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -108,7 +108,7 @@ public class KwmAddressService {
         }
 
         if (Objects.nonNull(reqVo.getEndTime())) {
-            wrapper.lt(KwmAddress::getCreateTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
+            wrapper.le(KwmAddress::getCreateTime, reqVo.getEndTime());
         }
 
         if (StringUtils.isNotBlank(reqVo.getIds())) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerLogistics.java

@@ -95,6 +95,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "actual_price")
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    @TableField(value = "deduct_price")
+    private BigDecimal deductPrice;
 
     /**
      * 审核人联系方式（托运方）

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/KwpLedgerTrade.java

@@ -96,6 +96,12 @@ public class KwpLedgerTrade {
     @TableField(value = "actual_price")
     private BigDecimal actualPrice;
 
+    /**
+     * 扣款金额
+     */
+    @TableField(value = "deduct_price")
+    private BigDecimal deductPrice;
+
     /**
      * 审核人联系方式（采购方）
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerCarrierDto.java

@@ -93,6 +93,11 @@ public class LedgerCarrierDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
     /**
      * 对账审核人电话
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerLogisticsDto.java

@@ -107,6 +107,9 @@ public class LedgerLogisticsDto implements ILedger {
      */
     private BigDecimal actualPrice;
 
+    private BigDecimal deductPrice;
+
+
     /**
      * 对账清单凭证
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerPurchaseDto.java

@@ -76,6 +76,10 @@ public class LedgerPurchaseDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账完成人电话(销售方)

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerSellDto.java

@@ -77,6 +77,11 @@ public class LedgerSellDto implements ILedger {
      */
     private BigDecimal actualPrice;
 
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
+
     /**
      * 对账审核人电话
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerShipperDto.java

@@ -75,6 +75,10 @@ public class LedgerShipperDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
     /**
      * 对账审核人电话（承运方）
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/LedgerTradeDto.java

@@ -75,6 +75,10 @@ public class LedgerTradeDto implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账采购财务联系人电话

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

@@ -97,6 +97,10 @@ public class LedgerLogistics implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账清单凭证

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

@@ -77,6 +77,10 @@ public class LedgerSell implements ILedger {
      * 已收款/元
      */
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    private BigDecimal deductPrice;
 
     /**
      * 对账采购财务联系人名称

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

@@ -68,9 +68,11 @@ public class LogisticsSendReq implements IdsList {
     @PositiveOrZero(message = "总应收必须大于等于0")
     private BigDecimal totalPrice;
     /**
-     * 已收款/元
+     * 扣款金额
      */
-    private BigDecimal actualPrice;
+    @NotNull(message = "扣款金额不能为空")
+    @PositiveOrZero(message = "扣款金额必须大于等于0")
+    private BigDecimal deductPrice;
     /**
      * 备注
      */

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

@@ -71,6 +71,12 @@ public class TradeSendReq implements IdsList {
     @NotNull(message = "总应收不能为空")
     @PositiveOrZero(message = "总应收必须大于等于0")
     private BigDecimal totalPrice;
+    /**
+     * 扣款金额
+     */
+    @NotNull(message = "扣款金额不能为空")
+    @PositiveOrZero(message = "扣款金额必须大于等于0")
+    private BigDecimal deductPrice;
 
     /**
      * 备注

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerLogisticsVo.java

@@ -79,7 +79,11 @@ public class LedgerLogisticsVo {
      */
     @ExcelProperty(value = "已收款/元")
     private BigDecimal actualPrice;
-
+    /**
+     * 扣款金额
+     */
+    @ExcelProperty(value = "扣款金额")
+    private BigDecimal deductPrice;
     /**
      * 财务联系人
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerTradeVo.java

@@ -84,6 +84,11 @@ public class LedgerTradeVo {
      */
     @ExcelProperty(value = "已收款/元")
     private BigDecimal actualPrice;
+    /**
+     * 扣款金额
+     */
+    @ExcelProperty(value = "扣款金额")
+    private BigDecimal deductPrice;
 
     /**
      * 客户联系人

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

@@ -252,6 +252,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setExTaxPrice(logisticsSendReq.getTotalPrice());
         kwpLedgerLogistics.setSettlePrice(logisticsSendReq.getSettlePrice());
         kwpLedgerLogistics.setActualPrice(new BigDecimal("0.0"));
+        kwpLedgerLogistics.setDeductPrice(logisticsSendReq.getDeductPrice());
         kwpLedgerLogistics.setAuditUser(Global.EMPTY_STRING);
         kwpLedgerLogistics.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerLogistics.setReceiptTime(null);

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

@@ -219,6 +219,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setExTaxPrice(tradeSendReq.getTotalPrice());
         kwpLedgerTrade.setSettlePrice(tradeSendReq.getSettlePrice());
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
+        kwpLedgerTrade.setDeductPrice(tradeSendReq.getDeductPrice());
         kwpLedgerTrade.setAuditUser(Global.EMPTY_STRING);
         kwpLedgerTrade.setAuditPhone(Global.EMPTY_STRING);
         kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());

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

@@ -16,6 +16,7 @@
         <result column="ex_tax_price" jdbcType="DECIMAL" property="exTaxPrice"/>
         <result column="settle_price" jdbcType="DECIMAL" property="settlePrice"/>
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
+        <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
@@ -46,6 +47,7 @@
         ex_tax_price,
         settle_price,
         actual_price,
+        deduct_price,
         audit_user,
         audit_phone,
         success_user,
@@ -74,6 +76,7 @@
         kll.ex_tax_price  exTaxPrice,
         kll.settle_price  settlePrice,
         kll.actual_price  actualPrice,
+        kll.deduct_price  deductPrice,
         kll.audit_phone   auditPhone,
         kll.audit_user    auditUser,
         kll.success_phone successPhone,
@@ -102,6 +105,7 @@
                kll.ex_tax_price  exTaxPrice,
                kll.settle_price  settlePrice,
                kll.actual_price  actualPrice,
+               kll.deduct_price  deductPrice,
                kll.success_phone successPhone,
                kll.success_user  successUser,
                kll.url,
@@ -189,8 +193,9 @@
                kll.ex_tax_price  AS exTaxPrice,
                kll.settle_price  AS settlePrice,
                kll.actual_price  AS actualPrice,
-               kll.audit_phone      auditPhone,
-               kll.audit_user       auditUser,
+               kll.deduct_price  AS deductPrice,
+               kll.audit_phone   AS auditPhone,
+               kll.audit_user    AS auditUser,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -246,6 +251,7 @@
                kll.ex_tax_price  AS exTaxPrice,
                kll.settle_price  AS settlePrice,
                kll.actual_price  AS actualPrice,
+               kll.deduct_price  AS deductPrice,
                kll.audit_phone      auditPhone,
                kll.audit_user       auditUser,
                kll.success_phone AS successPhone,
@@ -685,6 +691,7 @@
                kll.ex_tax_price                    exTaxPrice,
                kll.settle_price                    settlePrice,
                kll.actual_price                    actualPrice,
+               kll.deduct_price                 AS deductPrice,
                kll.url,
                kll.generate_time                   generateTime,
                kll.receipt_time                    receiptTime,

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

@@ -16,6 +16,7 @@
         <result column="ex_tax_price" jdbcType="DECIMAL" property="exTaxPrice"/>
         <result column="settle_price" jdbcType="DECIMAL" property="settlePrice"/>
         <result column="actual_price" jdbcType="DECIMAL" property="actualPrice"/>
+        <result column="deduct_price" jdbcType="DECIMAL" property="deductPrice"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
@@ -46,6 +47,7 @@
         ex_tax_price,
         settle_price,
         actual_price,
+        deduct_price,
         audit_user,
         audit_phone,
         success_user,
@@ -74,6 +76,7 @@
         klt.ex_tax_price  exTaxPrice,
         klt.settle_price  settlePrice,
         klt.actual_price  actualPrice,
+        klt.deduct_price  deductPrice,
         klt.audit_phone   auditPhone,
         klt.audit_user    auditUser,
         klt.url,
@@ -99,6 +102,7 @@
         klt.ex_tax_price  exTaxPrice,
         klt.settle_price  settlePrice,
         klt.actual_price  actualPrice,
+        klt.deduct_price  deductPrice,
         klt.success_phone successPhone,
         klt.success_user  successUser,
         klt.url,
@@ -186,6 +190,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -251,6 +256,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -668,6 +674,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.url,
@@ -703,6 +710,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.url,
@@ -738,6 +746,7 @@
                klt.ex_tax_price  exTaxPrice,
                klt.settle_price  settlePrice,
                klt.actual_price  actualPrice,
+               klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
                klt.success_user  successUser,
@@ -806,6 +815,7 @@
                klt.ex_tax_price                    exTaxPrice,
                klt.settle_price                    settlePrice,
                klt.actual_price                    actualPrice,
+               klt.deduct_price                    deductPrice,
                klt.url,
                klt.generate_time                   generateTime,
                klt.receipt_time                    receiptTime,

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -215,11 +215,10 @@
     </select>
 
   <select id="selectByKeys" resultType="com.sckw.system.model.KwsEnterprise">
-    select
-    <include refid="Base_Column_List" />
-    from kws_enterprise
+    select a.*
+    from kws_enterprise a
     where del_flag = 0
-    and approval = 1
+      and exists( select 1 from kws_ent_check_track b where a.id = b.ent_id and b.status = 0)
     <if test="list != null and list.size() > 0">
       and id in
       <foreach collection="list" item="item" open="(" close=")" separator=",">