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

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/dto/LogisticsOrderDTO.java

@@ -284,6 +284,12 @@ public class LogisticsOrderDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
+    /**
+     * 扣款金额
+     */
+    @JsonProperty("deductPrice")
+    private BigDecimal deductPrice;
+
     /**
      * 含税金额
      */

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/vo/LogisticsOrderVO.java

@@ -297,6 +297,12 @@ public class LogisticsOrderVO implements Serializable {
     @JsonProperty("taxMoney")
     private BigDecimal taxMoney;
 
+    /**
+     * 扣款金额
+     */
+    @JsonProperty("deductPrice")
+    private BigDecimal deductPrice;
+
     /**
      * 发货单位
      */

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

@@ -260,6 +260,11 @@ public class KwfTruckReportService {
                 } else {
                     continue;
                 }
+
+                //校验企业是否添加该车辆
+                KwfTruck truckEnt = new KwfTruck();
+                truckEnt.setId(truck.getId());
+                truckService.truckEntEdit(truckEnt);
             }
 
             /**档案信息**/
@@ -290,6 +295,11 @@ public class KwfTruckReportService {
                 } else {
                     continue;
                 }
+
+                //校验企业是否添加该司机
+                KwfDriver driverEnt = new KwfDriver();
+                driverEnt.setId(driver.getId());
+                driverService.driverEntEdit(driverEnt);
             }
             count += truckReportDao.insert(truckReport);
         }

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -779,6 +779,14 @@ public class KwoTradeOrderService {
             if (!Objects.equals(HttpStatus.SUCCESS_CODE, updateResult.getCode())) {
                 throw new BusinessException(updateResult.getMsg());
             }
+            //代客下单冻结金额
+            if (Objects.equals(source, OrderSourceEnum.SALE.getType()) && param.getTrading().startsWith("1")){
+                HttpResult freezeResult = paymentDubboService.freezeMoney(orderCheck.getProcureTopEntId(),
+                        ChannelEnum.getByTrading(param.getTrading()), orderCheck.getSupplyTopEntId(), param.getPrice(), order.getId());
+                if (!Objects.equals(HttpStatus.SUCCESS_CODE, freezeResult.getCode())) {
+                    throw new BusinessException(freezeResult.getMsg());
+                }
+            }
         }
         order.setAmount(param.getAmount()).setUnit(Objects.isNull(param.getGoodsInfo()) ? null : param.getGoodsInfo().getUnit())
                 .setPrice(param.getPrice()).setTrading(param.getTrading()).setPickupType(param.getPickupType())

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.dubbo;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.OrderUtils;
 import com.sckw.core.web.constant.HttpStatus;
@@ -61,6 +62,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
 
     @Override
     public HttpResult freezeMoney(Long payEntId, ChannelEnum channel, Long receiveEntId, BigDecimal money, Long tOrderId) {
+        log.info("贸易下单冻结订单，payEntId：{} channel：{} receiveEntId：{} money：{} tOrderId：{}", payEntId, channel, receiveEntId, money, tOrderId);
         if (Objects.isNull(payEntId)) {
             return HttpResult.error("支付企业不能为空");
         }
@@ -90,6 +92,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
         if (httpResult.getCode() == HttpStatus.SUCCESS_CODE) {
             kwpTradeFreezeService.save(tOrderId, orderNo);
         }
+        log.info("贸易下单冻结订单:{}", JSONObject.toJSONString(httpResult));
         return httpResult;
     }
 

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

@@ -12,13 +12,11 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
+ * 对账-物流订单
+ *
  * @author xucaiqin
  * @date 2023-07-17 15:34:39
  */
-
-/**
- * 对账-物流订单
- */
 @Getter
 @Setter
 @ToString
@@ -100,6 +98,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "deduct_price")
     private BigDecimal deductPrice;
+    /**
+     * 托运方财务联系人id
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
 
     /**
      * 审核人联系方式（托运方）
@@ -112,6 +115,11 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 承运方财务联系人id
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 财务联系人(承运方)
      */
@@ -183,4 +191,4 @@ public class KwpLedgerLogistics {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -11,13 +11,10 @@ import lombok.ToString;
 import java.time.LocalDateTime;
 
 /**
+ * 对账-物流订单-状态信息
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
-
-/**
- * 对账-物流订单-状态信息
- */
 @Getter
 @Setter
 @ToString
@@ -67,4 +64,4 @@ public class KwpLedgerLogisticsTrack {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -11,13 +11,10 @@ import lombok.ToString;
 import java.time.LocalDateTime;
 
 /**
+ * 物流对账单托运方或承运方企业信息
  * @author xucaiqin
  * @date 2023-07-13 17:32:34
  */
-
-/**
- * 物流对账单托运方或承运方企业信息
- */
 @Getter
 @Setter
 @ToString
@@ -114,4 +111,4 @@ public class KwpLedgerLogisticsUnit {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -12,13 +12,10 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
+ * 对账-交易订单
  * @author xucaiqin
  * @date 2023-07-17 15:34:43
  */
-
-/**
- * 对账-交易订单
- */
 @Getter
 @Setter
 @ToString
@@ -102,6 +99,12 @@ public class KwpLedgerTrade {
     @TableField(value = "deduct_price")
     private BigDecimal deductPrice;
 
+    /**
+     * 采购方财务联系人id
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
+
     /**
      * 审核人联系方式（采购方）
      */
@@ -113,6 +116,11 @@ public class KwpLedgerTrade {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
+    /**
+     * 销售方财务联系人id
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 财务联系人(销售方)
      */
@@ -184,4 +192,4 @@ public class KwpLedgerTrade {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -4,19 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 /**
+ * 对账-交易订单-状态信息
+ *
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
 
-/**
- * 对账-交易订单-状态信息
- */
 @Getter
 @Setter
 @ToString
@@ -66,4 +66,4 @@ public class KwpLedgerTradeTrack {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -80,6 +80,11 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "trading")
     private String trading;
+    /**
+     * 对账托运方财务联系人
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
     /**
      * 对账托运方财务联系人
      */
@@ -91,7 +96,11 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "audit_phone")
     private String auditPhone;
-
+    /**
+     * 对账承运方财务联系人
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
     /**
      * 对账承运方财务联系人
      */
@@ -139,4 +148,4 @@ public class KwpSettlementLogistics {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -10,12 +10,10 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
+ * 结算归档表
 * @date 2023-09-13 18:48:30
 * @author xucaiqin
 */
-/**
-    * 结算归档表
-    */
 @Data
 @TableName(value = "kwp_settlement_record")
 public class KwpSettlementRecord {
@@ -90,4 +88,4 @@ public class KwpSettlementRecord {
      */
     @TableField(value = "order_type")
     private Integer orderType;
-}
+}

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

@@ -68,7 +68,11 @@ public class KwpSettlementTrade {
      */
     @TableField(value = "receipt_time")
     private LocalDateTime receiptTime;
-
+    /**
+     * 对账采购财务联系人
+     */
+    @TableField(value = "audit_user_id")
+    private Long auditUserId;
     /**
      * 对账采购财务联系人名称
      */
@@ -81,6 +85,12 @@ public class KwpSettlementTrade {
     @TableField(value = "audit_phone")
     private String auditPhone;
 
+    /**
+     * 对账销售财务联系人
+     */
+    @TableField(value = "success_user_id")
+    private Long successUserId;
+
     /**
      * 对账销售财务联系人名称
      */
@@ -129,4 +139,4 @@ public class KwpSettlementTrade {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -13,13 +13,10 @@ import lombok.ToString;
 import java.time.LocalDateTime;
 
 /**
+ * 结算-交易订单-状态信息
  * @author xucaiqin
  * @date 2023-07-10 16:42:19
  */
-
-/**
- * 结算-交易订单-状态信息
- */
 @Getter
 @Setter
 @ToString
@@ -83,4 +80,4 @@ public class KwpSettlementTradeTrack {
         kwpSettlementTradeTrack.setDelFlag(0);
         return kwpSettlementTradeTrack;
     }
-}
+}

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

@@ -9,13 +9,10 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 /**
+ * 预付操作
  * @date 2023-09-22 15:49:51
  * @author xucaiqin
  */
-
-/**
- * 预付操作
- */
 @Data
 @TableName(value = "kwp_wallet_prepay")
 public class KwpWalletPrepay {
@@ -78,4 +75,4 @@ public class KwpWalletPrepay {
      */
     @TableField(value = "del_flag")
     private Integer delFlag;
-}
+}

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

@@ -14,7 +14,6 @@ import java.time.LocalDateTime;
 * @date 2023-09-06 16:42:08
 * @author xucaiqin
 */
-
 @Data
 @TableName(value = "kwp_wallet_transfer")
 public class KwpWalletTransfer {
@@ -107,4 +106,4 @@ public class KwpWalletTransfer {
      */
     @TableField(value = "`status`")
     private Integer status;
-}
+}

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

@@ -98,6 +98,11 @@ public class LedgerCarrierDto implements ILedger {
      * 扣款金额
      */
     private BigDecimal deductPrice;
+    /**
+     * 托运方联系人id
+     */
+    private Long auditUserId;
+
     /**
      * 对账审核人电话
      */
@@ -152,4 +157,4 @@ public class LedgerCarrierDto implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

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

@@ -79,6 +79,8 @@ public class LedgerLogisticsDto implements ILedger {
      * 对账托运方财务联系人名称
      */
     private String auditUser;
+    private Long auditUserId;
+    private Long successUserId;
     /**
      * 对账承运方财务联系人名称
      */
@@ -154,4 +156,4 @@ public class LedgerLogisticsDto implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

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

@@ -79,6 +79,11 @@ public class LedgerShipperDto implements ILedger {
      * 扣款金额
      */
     private BigDecimal deductPrice;
+    /**
+     * 财务联系人id
+     */
+    private Long successUserId;
+
     /**
      * 对账审核人电话（承运方）
      */
@@ -135,4 +140,4 @@ public class LedgerShipperDto implements ILedger {
     private Integer orderCount;
 
 
-}
+}

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

@@ -49,7 +49,6 @@ public class LedgerLogistics implements ILedger {
     private String carrierFirmName;
 
 
-
     /**
      * 发票税率（%）
      */
@@ -61,6 +60,8 @@ public class LedgerLogistics implements ILedger {
      */
     private String trading;
     private String tradingLabel;
+    private Long auditUserId;
+
     /**
      * 对账托运方财务联系人电话
      */
@@ -70,10 +71,12 @@ public class LedgerLogistics implements ILedger {
      * 对账托运方财务联系人名称
      */
     private String auditUser;
+    private String successUser;
+
     /**
      * 对账承运方财务联系人名称
      */
-    private String successUser;
+    private Long successUserId;
     /**
      * 对账承运方财务联系人电话
      */
@@ -137,4 +140,4 @@ public class LedgerLogistics implements ILedger {
      * 订单数量
      */
     private Integer orderCount;
-}
+}

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

@@ -17,6 +17,8 @@ import lombok.Setter;
 public class LedgerConfirmReq implements IdsList {
     @NotNull(message = "id不能为空")
     private String id;
+
+    private Long auditUserId;
     /**
      * 对账审核人
      */
@@ -29,6 +31,6 @@ public class LedgerConfirmReq implements IdsList {
 //    @NotBlank(message = "对账审核人联系方式为空")
     @Size(max = 11, message = "对账审核人联系方式不能超过11个字符")
     private String auditPhone;
-//    @NotBlank(message = "对账清单凭证不能为空")
+    //    @NotBlank(message = "对账清单凭证不能为空")
     private String url;
 }

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

@@ -20,15 +20,17 @@ import java.time.LocalDate;
 public class LedgerSuccessReq implements IdsList {
     @NotBlank(message = "物流对账单id不能为空")
     private String id;
-//    @NotBlank(message = "财务联系人不能为空")
+    private Long successUserId;
+
+    //    @NotBlank(message = "财务联系人不能为空")
     @Size(max = 25, message = "财务联系人不能超过25个字符")
     private String successUser;
 
-//    @NotNull(message = "预计收款日期不能为空")
+    //    @NotNull(message = "预计收款日期不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate receiptTime;
 
-//    @NotBlank(message = "财务联系电话不能为空")
+    //    @NotBlank(message = "财务联系电话不能为空")
     @Size(max = 11, message = "财务联系电话不能超过11个字符")
     private String successPhone;
 

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

@@ -70,8 +70,8 @@ public class LogisticsSendReq implements IdsList {
     /**
      * 扣款金额
      */
-    @NotNull(message = "扣款金额不能为空")
-    @PositiveOrZero(message = "扣款金额必须大于等于0")
+//    @NotNull(message = "扣款金额不能为空")
+//    @PositiveOrZero(message = "扣款金额必须大于等于0")
     private BigDecimal deductPrice;
     /**
      * 备注

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

@@ -74,8 +74,8 @@ public class TradeSendReq implements IdsList {
     /**
      * 扣款金额
      */
-    @NotNull(message = "扣款金额不能为空")
-    @PositiveOrZero(message = "扣款金额必须大于等于0")
+//    @NotNull(message = "扣款金额不能为空")
+//    @PositiveOrZero(message = "扣款金额必须大于等于0")
     private BigDecimal deductPrice;
 
     /**

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

@@ -35,6 +35,7 @@ public class LedgerLogisticsDetailVo {
     private BigDecimal totalPrice;
     private BigDecimal settlePrice;
     private BigDecimal actualPrice;
+    private BigDecimal deductPrice;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -34,6 +34,7 @@ public class LedgerTradeDetailVo {
     private BigDecimal totalPrice;
     private BigDecimal settlePrice;
     private BigDecimal actualPrice;
+    private BigDecimal deductPrice;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -530,6 +530,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpLedgerLogistics.setStatus(LedgerEnum.LEDGERED.getStatus());
         kwpLedgerLogistics.setAuditPhone(confirmReq.getAuditPhone());
         kwpLedgerLogistics.setAuditUser(confirmReq.getAuditUser());
+        kwpLedgerLogistics.setAuditUserId(confirmReq.getAuditUserId());
         kwpLedgerLogistics.setUrl(confirmReq.getUrl());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
@@ -577,6 +578,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         }
         kwpLedgerLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpLedgerLogistics.setSuccessUser(ledgerReq.getSuccessUser());
+        kwpLedgerLogistics.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpLedgerLogistics.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerLogistics.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerLogistics.setUpdateTime(LocalDateTime.now());
@@ -594,8 +596,10 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setActualPrice(kwpLedgerLogistics.getActualPrice());
         kwpSettlementLogistics.setTrading(kwpLedgerLogistics.getTrading());
         kwpSettlementLogistics.setRemark(Global.EMPTY_STRING);
+        kwpSettlementLogistics.setAuditUserId(kwpLedgerLogistics.getAuditUserId());
         kwpSettlementLogistics.setAuditUser(kwpLedgerLogistics.getAuditUser());
         kwpSettlementLogistics.setAuditPhone(kwpLedgerLogistics.getAuditPhone());
+        kwpSettlementLogistics.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpSettlementLogistics.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementLogistics.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementLogistics.setReceiptTime(receiptTime);
@@ -759,6 +763,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         ledgerLogisticsDetailVo.setTotalPrice(ledgerLogisticsDto.getTotalPrice());
         ledgerLogisticsDetailVo.setSettlePrice(ledgerLogisticsDto.getSettlePrice());
         ledgerLogisticsDetailVo.setActualPrice(ledgerLogisticsDto.getActualPrice());
+        ledgerLogisticsDetailVo.setDeductPrice(ledgerLogisticsDto.getDeductPrice());
         ledgerLogisticsDetailVo.setStartTime(ledgerLogisticsDto.getStartTime());
         ledgerLogisticsDetailVo.setEndTime(ledgerLogisticsDto.getEndTime());
         ledgerLogisticsDetailVo.setRemark(ledgerLogisticsDto.getRemark());

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

@@ -546,6 +546,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setStatus(LedgerEnum.LEDGERED.getStatus());
         kwpLedgerTrade.setAuditPhone(confirmReq.getAuditPhone());
         kwpLedgerTrade.setAuditUser(confirmReq.getAuditUser());
+        kwpLedgerTrade.setAuditUserId(confirmReq.getAuditUserId());
         kwpLedgerTrade.setUrl(confirmReq.getUrl());
         kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
@@ -598,6 +599,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         }
         kwpLedgerTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpLedgerTrade.setSuccessUser(ledgerReq.getSuccessUser());
+        kwpLedgerTrade.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpLedgerTrade.setStatus(LedgerEnum.SUCCESS.getStatus());
         kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
         tradeMapper.updateById(kwpLedgerTrade);
@@ -612,8 +614,10 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setActualPrice(kwpLedgerTrade.getActualPrice());
         kwpSettlementTrade.setRemark(Global.EMPTY_STRING);
         kwpSettlementTrade.setTrading(kwpLedgerTrade.getTrading());
+        kwpSettlementTrade.setAuditUserId(kwpLedgerTrade.getAuditUserId());
         kwpSettlementTrade.setAuditUser(kwpLedgerTrade.getAuditUser());
         kwpSettlementTrade.setAuditPhone(kwpLedgerTrade.getAuditPhone());
+        kwpSettlementTrade.setSuccessUserId(ledgerReq.getSuccessUserId());
         kwpSettlementTrade.setSuccessUser(ledgerReq.getSuccessUser());
         kwpSettlementTrade.setSuccessPhone(ledgerReq.getSuccessPhone());
         kwpSettlementTrade.setReceiptTime(receiptTime);
@@ -758,6 +762,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         ledgerTradeDetailVo.setTotalPrice(ledgerTradeDto.getTotalPrice());
         ledgerTradeDetailVo.setSettlePrice(ledgerTradeDto.getSettlePrice());
         ledgerTradeDetailVo.setActualPrice(ledgerTradeDto.getActualPrice());
+        ledgerTradeDetailVo.setDeductPrice(ledgerTradeDto.getDeductPrice());
         ledgerTradeDetailVo.setStartTime(ledgerTradeDto.getStartTime());
         ledgerTradeDetailVo.setEndTime(ledgerTradeDto.getEndTime());
         ledgerTradeDetailVo.setRemark(ledgerTradeDto.getRemark());

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

@@ -223,6 +223,9 @@ public class WalletService {
     private void time(PrePayWalletVo prePayWalletVo) {
         prePayWalletVo.setUpdateTime(kwpWalletService.queryTime(prePayWalletVo.getUid(), prePayWalletVo.getFilter(), prePayWalletVo.getChannel()));
     }
+    private void timeReceive(PrePayWalletVo prePayWalletVo) {
+        prePayWalletVo.setUpdateTime(kwpWalletService.queryTime(prePayWalletVo.getFilter(), prePayWalletVo.getUid(), prePayWalletVo.getChannel()));
+    }
 
     /**
      * 资金明细设置退款中金额
@@ -1233,6 +1236,7 @@ public class WalletService {
                     prePayWalletVo.setSettlingApMoney(dfMoney(row.getSettlingApMoney()));
                     prePayWalletVo.setTotalApMoney(dfMoney(row.getTotalApMoney()));
                     refundMoney(row, prePayWalletVo, true);
+                    timeReceive(prePayWalletVo);
                     list.add(prePayWalletVo);
                 }
             }

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

@@ -17,8 +17,10 @@
         <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_id" jdbcType="VARCHAR" property="auditUserId"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="url" jdbcType="VARCHAR" property="url"/>
@@ -48,8 +50,10 @@
         settle_price,
         actual_price,
         deduct_price,
+        audit_user_id,
         audit_user,
         audit_phone,
+        success_user_id,
         success_user,
         success_phone,
         url,
@@ -79,6 +83,8 @@
         kll.deduct_price  deductPrice,
         kll.audit_phone   auditPhone,
         kll.audit_user    auditUser,
+        kll.audit_user_id    auditUserId,
+        kll.success_user_id  successUserId,
         kll.success_phone successPhone,
         kll.success_user  successUser,
         kll.url,
@@ -95,30 +101,31 @@
     </sql>
     <select id="shipperSelect" resultType="com.sckw.payment.model.dto.LedgerShipperDto">
         select kll.id,
-               kll.l_ledger_no   lLedgerNo,
+               kll.l_ledger_no     lLedgerNo,
                kll.name,
-               kll.start_time    startTime,
-               kll.end_time      endTime,
-               kll.tax_rate      taxRate,
+               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.deduct_price  deductPrice,
-               kll.success_phone successPhone,
-               kll.success_user  successUser,
+               kll.total_price     totalPrice,
+               kll.ex_tax_price    exTaxPrice,
+               kll.settle_price    settlePrice,
+               kll.actual_price    actualPrice,
+               kll.deduct_price    deductPrice,
+               kll.success_user_id successUserId,
+               kll.success_phone   successPhone,
+               kll.success_user    successUser,
                kll.url,
-               kll.generate_time generateTime,
-               kll.receipt_time  receiptTime,
+               kll.generate_time   generateTime,
+               kll.receipt_time    receiptTime,
                kll.remark,
                kll.status,
-               kll.create_by     createBy,
-               kllu.top_ent_id   checkEntId,
+               kll.create_by       createBy,
+               kllu.top_ent_id     checkEntId,
                kllu.contacts,
                kllu.phone,
-               kllu.firm_name    firmName,
-               kll.order_count   orderCount
+               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 and
@@ -196,6 +203,8 @@
                kll.deduct_price  AS deductPrice,
                kll.audit_phone   AS auditPhone,
                kll.audit_user    AS auditUser,
+               kll.audit_user_id    auditUserId,
+               kll.success_user_id  successUserId,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -254,6 +263,8 @@
                kll.deduct_price  AS deductPrice,
                kll.audit_phone      auditPhone,
                kll.audit_user       auditUser,
+               kll.audit_user_id    auditUserId,
+               kll.success_user_id  successUserId,
                kll.success_phone AS successPhone,
                kll.success_user  AS successUser,
                kll.url           AS url,
@@ -797,4 +808,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>

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

@@ -18,7 +18,9 @@
         <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_user_id" jdbcType="VARCHAR" property="auditUserId"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="generate_time" jdbcType="TIMESTAMP" property="generateTime"/>
@@ -48,8 +50,10 @@
         settle_price,
         actual_price,
         deduct_price,
+        audit_user_id,
         audit_user,
         audit_phone,
+        success_user_id,
         success_user,
         success_phone,
         generate_time,
@@ -79,6 +83,7 @@
         klt.deduct_price  deductPrice,
         klt.audit_phone   auditPhone,
         klt.audit_user    auditUser,
+        klt.audit_user_id auditUserId,
         klt.url,
         klt.generate_time generateTime,
         klt.receipt_time  receiptTime,
@@ -92,29 +97,30 @@
     </sql>
     <sql id="purchase_col">
         klt.id,
-        klt.t_ledger_no   tLedgerNo,
+        klt.t_ledger_no     tLedgerNo,
         klt.name,
-        klt.start_time    startTime,
-        klt.end_time      endTime,
-        klt.tax_rate      taxRate,
+        klt.start_time      startTime,
+        klt.end_time        endTime,
+        klt.tax_rate        taxRate,
         klt.trading,
-        klt.total_price   totalPrice,
-        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.total_price     totalPrice,
+        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.success_user_id successUserId,
         klt.url,
-        klt.generate_time generateTime,
-        klt.receipt_time  receiptTime,
+        klt.generate_time   generateTime,
+        klt.receipt_time    receiptTime,
         klt.remark,
-        klt.create_by     createBy,
+        klt.create_by       createBy,
         klt.status,
         kltu.contacts,
         kltu.phone,
-        kltu.firm_name    firmName,
-        klt.order_count   orderCount
+        kltu.firm_name      firmName,
+        klt.order_count     orderCount
     </sql>
     <!--销售2 采购1-->
     <select id="sellList" resultType="com.sckw.payment.model.dto.LedgerSellDto">
@@ -180,32 +186,34 @@
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.LedgerSell">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               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,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               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.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
-               klt.create_by     createBy,
+               klt.create_by       createBy,
                kltu.contacts,
                kltu.phone,
-               kltu.firm_name    purchaseFirmName,
-               kltu2.firm_name   sellFirmName,
-               klt.order_count   orderCount
+               kltu.firm_name      purchaseFirmName,
+               kltu2.firm_name     sellFirmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -246,32 +254,34 @@
     </select>
     <select id="selectIds" resultType="com.sckw.payment.model.vo.LedgerSell">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               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,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               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.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
-               klt.create_by     createBy,
+               klt.create_by       createBy,
                kltu.contacts,
                kltu.phone,
-               kltu.firm_name    purchaseFirmName,
-               kltu2.firm_name   sellFirmName,
-               klt.order_count   orderCount
+               kltu.firm_name      purchaseFirmName,
+               kltu2.firm_name     sellFirmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu
                             on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
@@ -677,6 +687,7 @@
                klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
+               klt.audit_user_id auditUserId,
                klt.url,
                klt.generate_time generateTime,
                klt.receipt_time  receiptTime,
@@ -713,6 +724,7 @@
                klt.deduct_price  deductPrice,
                klt.audit_phone   auditPhone,
                klt.audit_user    auditUser,
+               klt.audit_user_id    auditUserId,
                klt.url,
                klt.generate_time generateTime,
                klt.receipt_time  receiptTime,
@@ -736,31 +748,33 @@
     </select>
     <select id="selectId" resultType="com.sckw.payment.model.dto.LedgerTradeDto">
         select klt.id,
-               klt.t_ledger_no   tLedgerNo,
+               klt.t_ledger_no     tLedgerNo,
                klt.name,
-               klt.start_time    startTime,
-               klt.end_time      endTime,
-               klt.tax_rate      taxRate,
+               klt.start_time      startTime,
+               klt.end_time        endTime,
+               klt.tax_rate        taxRate,
                klt.trading,
-               klt.total_price   totalPrice,
-               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,
-               klt.success_phone successPhone,
+               klt.total_price     totalPrice,
+               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.audit_user_id   auditUserId,
+               klt.success_user_id successUserId,
+               klt.success_user    successUser,
+               klt.success_phone   successPhone,
                klt.url,
-               klt.generate_time generateTime,
-               klt.receipt_time  receiptTime,
+               klt.generate_time   generateTime,
+               klt.receipt_time    receiptTime,
                klt.remark,
                klt.status,
                kltu.contacts,
-               kltu.top_ent_id   purchaseEntId,
+               kltu.top_ent_id     purchaseEntId,
                kltu.phone,
-               kltu.firm_name    firmName,
-               klt.order_count   orderCount
+               kltu.firm_name      firmName,
+               klt.order_count     orderCount
         from kwp_ledger_trade klt
                  inner join kwp_ledger_trade_unit kltu on klt.id = kltu.t_ledger_id and kltu.del_flag = 0
         <where>
@@ -926,4 +940,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>

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

@@ -16,6 +16,8 @@
         <result column="trading" jdbcType="VARCHAR" property="trading"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
@@ -39,6 +41,8 @@
         trading,
         audit_user,
         audit_phone,
+        audit_user_id,
+        success_user_id,
         success_user,
         success_phone,
         status,
@@ -584,4 +588,4 @@
         WHERE ksl.del_flag = 0
         GROUP BY kllu.top_ent_id
     </select>
-</mapper>
+</mapper>

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

@@ -14,6 +14,8 @@
         <result column="receipt_time" jdbcType="TIMESTAMP" property="receiptTime"/>
         <result column="audit_user" jdbcType="VARCHAR" property="auditUser"/>
         <result column="audit_phone" jdbcType="VARCHAR" property="auditPhone"/>
+        <result column="audit_user_id" jdbcType="VARCHAR" property="auditUserId"/>
+        <result column="success_user_id" jdbcType="VARCHAR" property="successUserId"/>
         <result column="success_user" jdbcType="VARCHAR" property="successUser"/>
         <result column="success_phone" jdbcType="VARCHAR" property="successPhone"/>
         <result column="trading" jdbcType="VARCHAR" property="trading"/>
@@ -37,9 +39,11 @@
         receipt_time,
         audit_user,
         audit_phone,
+        audit_user_id,
+        success_user_id,
         success_user,
-        trading,
         success_phone,
+        trading,
         remark,
         `status`,
         create_by,
@@ -627,4 +631,4 @@
             </choose>
         </where>
     </select>
-</mapper>
+</mapper>

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -231,12 +231,16 @@ public class TransportServiceImpl implements TransportService {
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
+                //todo 2023-10-10 含税金额不减去罚款值 另指定罚款值进行返回数据
                 BigDecimal actualAmount = new BigDecimal("0.00");
                 if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
+                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price);
+//                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
                 } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
+                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price);
+//                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
                 }
+                logisticsOrderDTO.setDeductPrice(fineValue);
                 logisticsOrderDTO.setTaxMoney(actualAmount);
 //                logisticsOrderDTO.setContractId();
                 logisticsOrderDTO.setContractName(contract.getContractName());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -292,7 +292,7 @@ public class AcceptCarriageOrderService {
         checkUnit.setUnitType(1);
         checkUnit.setFirmName(bo.getCheckCompany());
         checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
-        checkUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+        checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
         checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
 
         //承运单位
@@ -302,14 +302,14 @@ public class AcceptCarriageOrderService {
         carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
         carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
         carriageUnit.setFirmName(bo.getConsignCompany());
-        carriageUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+        carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
         commonService.newSendLogisticsOrderToMessage(carriageUnit,checkUnit,  logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
                 MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
-                "2");
+                "1");
 
         //修改父级mongodb数据
         //更新mongodb

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/CommonService.java

@@ -276,11 +276,13 @@ public class CommonService {
             sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
         } else {
-            sendLogisticsCarriageMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
-            sendLogisticsConsignMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
+            sendLogisticsConsignMessage(consignUnit, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
+            sendLogisticsCarriageMessage(carriageUnit, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             if (type.equals("1")) {
+                map.put("companyName", consignUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcConsignUrl, appConsignUrl, consignMessageEnum);
             } else {
+                map.put("companyName", carriageUnit.getFirmName());
                 sendLogisticsCreateByMessage(createBy, entId, map, pcCarriageUrl, appCarriageUrl, carriageMessageEnum);
             }
 
@@ -290,12 +292,13 @@ public class CommonService {
 
     private void sendLogisticsCreateByMessage(Long createBy, Long entId, Map<String, Object> map, String pcUrl, String appUrl, MessageEnum messageEnum) {
         UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
+        String name = remoteSystemService.queryUserCacheById(createBy).getName();
         //给订单创建人发消息
         List<UserInfo> userInfos = new ArrayList<>();
         UserInfo createUser = new UserInfo();
         createUser.setUserId(createBy).setEntId(entId);
         userInfos.add(createUser);
-        map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
+//        map.put("companyName", userCacheResDto == null ? null : userCacheResDto.getEntInfo().getFirmName());
         SckwMessage msg = new SckwMessage();
         msg.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
@@ -309,6 +312,7 @@ public class CommonService {
                 .setUserInfos(userInfos)
                 .setCreateBy(LoginUserHolder.getUserId());
         log.info("发起物流托运-[贸易订单物流托运确认/承运订单分包托运确认]-创建人：{}", JSON.toJSONString(msg));
+        log.info("发起物流托运-企业:{},消息内容:{},-创建人：{},所有消息:{}", userCacheResDto.getEntInfo().getFirmName(),messageEnum.getContent(),name,JSON.toJSONString(msg));
         streamBridge.send("sckw-message", JSON.toJSONString(msg));
     }
 
@@ -324,6 +328,7 @@ public class CommonService {
         //给业务联系人发消息[承运方]
         List<UserInfo> userInfoList = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(carriageUnit.getContactsId());
         userInfo.setUserId(carriageUnit.getContactsId()).setEntId(carriageUnit.getTopEntId());
         userInfoList.add(userInfo);
         map.put("companyName", carriageUnit.getFirmName());
@@ -354,6 +359,7 @@ public class CommonService {
         //给业务联系人发消息[托运方]
         List<UserInfo> list = new ArrayList<>();
         UserInfo userInfo = new UserInfo();
+        UserCacheResDto userCacheResDto = remoteSystemService.queryUserCacheById(consignUnit.getContactsId());
         userInfo.setUserId(consignUnit.getContactsId()).setEntId(consignUnit.getTopEntId());
         list.add(userInfo);
         map.put("companyName", consignUnit.getFirmName());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -13,6 +13,7 @@ import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.excel.utils.DateUtil;
 import com.sckw.fleet.api.RemoteFleetService;
 import com.sckw.fleet.api.model.vo.RDriverVo;
 import com.sckw.fleet.api.model.vo.RTruckVo;
@@ -40,7 +41,6 @@ import com.sckw.transport.model.vo.WaybillCountVo;
 import com.sckw.transport.model.vo.WaybillOrderDriverVo;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -2202,16 +2202,16 @@ public class KwtWaybillOrderService {
         result.put("loadStatus", loadTicket != null ? 0 : 1);
         result.put("loadAmount", loadTicket != null ? loadTicket.getAmount() : null);
         result.put("loadUrls", loadTicket != null ? FileUtils.spliceBatch(loadTicket.getUrls()) : null);
-        result.put("loadOperateTime", loadTicket != null ? loadTicket.getOperateTime() : null);
-        result.put("loadCreateTime", loadTicket != null ? loadTicket.getCreateTime() : null);
+        result.put("loadOperateTime", loadTicket != null ? DateUtil.dateTimeFormatter(loadTicket.getOperateTime()) : null);
+        result.put("loadCreateTime", loadTicket != null ? DateUtil.dateTimeFormatter(loadTicket.getCreateTime()) : null);
         result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
         result.put("loadCityName", loadAddress != null ? loadAddress.getCityName() : null);
         result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
         result.put("unloadStatus", loadTicket != null ? 0 : 1);
         result.put("unloadAmount", unloadTicket != null ? unloadTicket.getAmount() : null);
         result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
-        result.put("unloadOperateTime", unloadTicket != null ? unloadTicket.getOperateTime() : null);
-        result.put("unloadCreateTime", unloadTicket != null ? unloadTicket.getCreateTime() : null);
+        result.put("unloadOperateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getOperateTime()) : null);
+        result.put("unloadCreateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getCreateTime()) : null);
         result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
         result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
         result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -641,12 +641,16 @@ public class TransportCommonService {
                  * 2、按卸货量：总运价=实卸量*运价-罚款值
                  * 3、按趟次：总运价=运价*趟次【后期加】
                  */
+                //todo 2023-10-10 含税金额不减去罚款值 另指定罚款值进行返回数据
                 BigDecimal actualAmount = new BigDecimal("0.00");
                 if (DictEnum.CHARGING_TYPE_1.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
+//                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price).subtract(fineValue);
+                    actualAmount = (logisticsOrderDTO.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalLoadAmount()).multiply(price);
                 } else if (DictEnum.CHARGING_TYPE_2.getValue().equals(billingMode)) {
-                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
+//                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price).subtract(fineValue);
+                    actualAmount = (logisticsOrderDTO.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrderDTO.getTotalUnloadAmount()).multiply(price);
                 }
+                logisticsOrderDTO.setDeductPrice(fineValue);
                 logisticsOrderDTO.setTaxMoney(actualAmount);
 //                logisticsOrderDTO.setContractId();
                 logisticsOrderDTO.setContractName(contract.getContractName());