Merge branch 'v17.5_order_child_sync_broker_20240617' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -37,7 +37,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     ORDER_WEIGHT_LACK(1201, "剩余吨数不足，请联系客服"),
     ORDER_INVALID(1202, "无效的货单"),
     ORDER_INVALID1(1203, "当前运单的货源已完成或取消，请查看其他货源"),
-
+    ORDER_DRIVER_LIMIT(1204, "该货单不支持车主抢单"),
 
     ORDER_CHILD_NO_FOUND(1301, "运单不存在"),
     ORDER_CHILD_STATUS_CHANGED(1302, "运单状态已变更，请重新刷新页面"),
@@ -97,6 +97,10 @@ public enum PerformanceResultEnum implements ResultEnum {
     INTEGRAL_RULE_NAME_EXIST(1703, "层级名称已存在"),
 
     APP_POP_UP_ERROR(-1000, "app弹窗提示"),
+    /**司机提示语 **/
+    APP_POP_UP_DRIVER_RESIDUE_ERROR(-500, "app弹窗提示"),
+    /**车主提示语 **/
+    APP_POP_UP_OWNER_RESIDUE_ERROR(-499, "app弹窗提示"),
     WALLET_CODE_IS_NULL(1704, "用户钱包不存在"),
 
     ORDER_GOODS_SAVE_FAIL(1801, "保存货单失败,请稍后再试"),

performance-api/src/main/java/com/clx/performance/enums/PlatformServiceFeeConfigEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@AllArgsConstructor
+public enum PlatformServiceFeeConfigEnum {
+
+    /**
+     * 未税
+     */
+    TAX_EXCLUDED(0, "未税"),
+    /**
+     * 含税
+     */
+    TAX_INCLUDED(1, "含税");
+
+    private final Integer code;
+    private final String msg;
+
+    public static Optional<PlatformServiceFeeConfigEnum> getByCode(int code) {
+        return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+    }
+
+    public static String getMsgByCode(int code) {
+        return getByCode(code).map(PlatformServiceFeeConfigEnum::getMsg).orElse(null);
+    }
+}

performance-api/src/main/java/com/clx/performance/enums/payment/PayOperationStatusEnum.java

+package com.clx.performance.enums.payment;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ */
+public enum PayOperationStatusEnum {
+    FREEZE(1, "冻结"),
+    ADJUSTMENT(2, "调整"),
+    UNFREEZE(3, "解冻"),
+    PART_UNFREEZE(4, "部分解冻"),
+    PART_PAY(5, "部分支付"),
+    PAY(6, "支付"),
+    COMPLETE(7, "完成")
+    ;
+
+    private static Map<Integer, String> map = new ConcurrentHashMap<>();
+    static {
+        for(PayOperationStatusEnum payOperationStatusEnum : PayOperationStatusEnum.values()){
+            map.put(payOperationStatusEnum.getValue(), payOperationStatusEnum.getDisplayValue());
+        }
+    }
+    private int value;
+    private String displayValue;
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getDisplayValue() {
+        return displayValue;
+    }
+
+    public void setDisplayValue(String displayValue) {
+        this.displayValue = displayValue;
+    }
+
+    private PayOperationStatusEnum(int value, String displayValue){
+        this.value = value;
+        this.displayValue = displayValue;
+    }
+    public int getValue(){
+        return value;
+    }
+    public static String toString(int value){
+        return map.get(value);
+    }
+}

performance-api/src/main/java/com/clx/performance/enums/payment/PaymentActionEnum.java

+package com.clx.performance.enums.payment;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum PaymentActionEnum {
+    ;
+    /** 操作类型 1撤销 2完成 3修改*/
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        CANCEL(1, "撤销"),
+        COMPLETE(2, "完成"),
+        ADJUST(3, "修改"),
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Type::getMsg).orElse(null);
+        }
+    }
+
+
+}

performance-api/src/main/java/com/clx/performance/enums/payment/PaymentStatusEnum.java

+package com.clx.performance.enums.payment;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ * 支付状态
+ */
+public enum PaymentStatusEnum {
+    CREATE(0, "发起"),
+    SUCCESS(1, "成功"),
+    FAIL(2, "失败")
+    ;
+
+    private static Map<Integer, String> map = new ConcurrentHashMap<>();
+    static {
+        for(PaymentStatusEnum paymentStatusEnum : PaymentStatusEnum.values()){
+            map.put(paymentStatusEnum.getValue(), paymentStatusEnum.getDisplayValue());
+        }
+    }
+    private int value;
+    private String displayValue;
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getDisplayValue() {
+        return displayValue;
+    }
+
+    public void setDisplayValue(String displayValue) {
+        this.displayValue = displayValue;
+    }
+
+    private PaymentStatusEnum(int value, String displayValue){
+        this.value = value;
+        this.displayValue = displayValue;
+    }
+    public int getValue(){
+        return value;
+    }
+    public static String toString(int value){
+        return map.get(value);
+    }
+}

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementOwnerEnum.java

@@ -100,6 +100,7 @@ public enum SettlementOwnerEnum {
 
         IMMEDIATE(1, "拉运完成结算"),
         MONTH(2, "月结"),
+        DAILY(3, "日结"),
 
         ;
 

performance-api/src/main/java/com/clx/performance/enums/settle/SettlementWayEnum.java

@@ -13,7 +13,9 @@ public enum SettlementWayEnum {
     @AllArgsConstructor
     public enum WayType {
         LOAD(1, "装车净重"),
-        UNLOAD(2, "卸车净重");
+        UNLOAD(2, "卸车净重"),
+        UNLOAD_LOSS(3, "卸车净重（减货损）"),
+        ;
         private final Integer code;
         private final String msg;
 

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -4,6 +4,7 @@ import com.clx.performance.param.app.collect.CollectTruckParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildReportParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
@@ -11,6 +12,7 @@ import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.clx.performance.vo.feign.FreightEstimateVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
 import com.clx.performance.vo.pc.OwnerLoanAccountVO;
@@ -132,4 +134,15 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/orderGoods/saveBindTruck"})
     Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param);
 
+    /**
+     * 更新挂单运费
+     */
+    @PostMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight);
+
+    /**
+     * 获取平台服务费配置
+     */
+    @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
+    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildSaveParam.java

@@ -25,4 +25,7 @@ public class OrderChildSaveParam extends PositionParam {
     @NotNull(message = "司机用户编号空")
     private Long driverUserNo;
 
+    @ApiModelProperty(value = "支付方密码", example = "2356", dataType = "String")
+    private String pwd;
+
 }

performance-api/src/main/java/com/clx/performance/param/pc/carrier/SavePlatformServiceFeeConfigParam.java

+package com.clx.performance.param.pc.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@Setter
+public class SavePlatformServiceFeeConfigParam {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "订单报价方式,0:未税,1:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "接单保证金，最多保留两位小数")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerParam.java

@@ -28,10 +28,16 @@ public class PageCarrierSettlementOwnerParam extends PageParam {
     @ApiModelProperty(value="货主姓名",example = "张三")
     private String ownerUserName;
 
-    @ApiModelProperty("结算方式  1装车净重 2卸车净重")
+    @ApiModelProperty("结算方式  1装车净重 2卸车净重 3卸车净重（减货损）")
     private Integer settlementWay;
 
 
     @ApiModelProperty("订单编号")
     private String orderNo;
+
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementPlatformServiceFeeParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName PageCarrierSettlementOwnerParam
+ * @Description
+ * @Author
+ * @Date 2023/10/17 13:25
+ * @Version 1.0
+ */
+@Getter
+@Setter
+public class PageCarrierSettlementPlatformServiceFeeParam extends PageParam {
+
+    @ApiModelProperty(value = "运单编号", example = "JS415")
+    private String childNo;
+
+    @ApiModelProperty(value="车主编码",example = "201457878")
+    private Long driverUserNo;
+
+    @ApiModelProperty(value="车主姓名",example = "张三")
+    private String driverUserName;
+    @ApiModelProperty(value="车主手机",example = "13000000000")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "开始时间")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/CallServiceDTO.java

+package com.clx.performance.param.pc.payment;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 
+ * @author xujianke
+ * @date 2017年4月22日
+ * @description
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CallServiceDTO {
+	/** 业务系统编码  参考<SystemCodeEnum> */
+	Integer system;
+	/** 支付结果通知回调地址 */
+	String notifyUrl;
+	/** 操作唯一标识 UUID */
+	String uuid;
+	/** 关联单号 */
+	String orderNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/FreezeBatchDTO.java

+package com.clx.performance.param.pc.payment;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ *
+ * @author xujianke
+ * @date 2017年5月31日
+ * @description 批量处理冻结
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class FreezeBatchDTO extends CallServiceDTO{
+	/** 处理冻结  */
+	private List<FreezeUnitDTO> FreezeUnitList;
+	/** 增加支付单元的处理，为了在解冻的时候额外增加赔偿 add by cuiwanzhe 20200430 */
+	private PayBatchDTO payBatchDTO;
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/PayBatchDTO.java

+package com.clx.performance.param.pc.payment;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ *
+ * @author xujianke
+ * @date 2017年4月18日
+ * @description 同一个订单的批量支付操作类 不能跨订单支付
+ */
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PayBatchDTO extends CallServiceDTO{
+	/**支付操作*/
+	private List<PayUnitDTO> payUnitList;
+	/**主钱包*/
+	private Integer walletCode;
+	/**子钱包*/
+	private Integer walletSubCode;
+	/**主钱包的交易密码*/
+	private String pwd;
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/PayPlatformFeeParam.java

+package com.clx.performance.param.pc.payment;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Accessors(chain = true)
+public class PayPlatformFeeParam {
+	@ApiModelProperty(value = "支付来源", example = "2234", dataType = "int")
+	Integer from;
+	@ApiModelProperty(value = "支付方密码", example = "2356", dataType = "String")
+	String pwd;
+
+	@ApiModelProperty(value = "金额", example = "2356", dataType = "int")
+	Integer figure;
+	@NotBlank(message = "交易单号不能为空")
+	@ApiModelProperty(value = "交易单号", example = "2356", dataType = "String")
+	String tradeNo;
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/WalletParam.java

+package com.clx.performance.param.pc.payment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@ApiModel(description = "钱包查询")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class WalletParam {
+
+    /**
+     * 用户编号从10000001开始
+     */
+	@ApiModelProperty(value = "主钱包账号", dataType = "int", example = "1")
+    private Integer userCode;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/WalletResidueDTO.java

+package com.clx.performance.param.pc.payment;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+
+public class WalletResidueDTO {
+	//余额
+	@ApiModelProperty(value = "余额", dataType = "double", example = "11.10")
+	private Long residue;
+	//冻结的资金
+	@ApiModelProperty(value = "冻结的资金", dataType = "double", example = "11.10")
+	private Long frozen;
+	//保证金
+	@ApiModelProperty(value = "保证金", dataType = "double", example = "11.10")
+	private Double deposit;
+	//状态0锁定1正常2异常
+	@ApiModelProperty(value = "状态0锁定1正常2异常", dataType = "int", example = "1")
+	private Integer status;
+	//是否设置交易密码0没有1有
+	@ApiModelProperty(value = "是否设置交易密码0没有1有", dataType = "String", example = "1")
+	private String pwd;
+	
+	public Long getResidue() {
+		return residue;
+	}
+	public void setResidue(Long residue) {
+		this.residue = residue;
+	}
+	public Long getFrozen() {
+		return frozen;
+	}
+	public void setFrozen(Long frozen) {
+		this.frozen = frozen;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public String getPwd() {
+		return pwd;
+	}
+	public void setPwd(String pwd) {
+		this.pwd = pwd;
+	}
+	@JsonGetter(value="frozen")
+	public BigDecimal frozenFormat() {
+		return new BigDecimal(new Double(this.frozen)/100);
+	}
+	@JsonGetter(value="residue")
+	public Double residueFormat() {
+		return new Double(this.residue)/100;
+	}
+	@JsonGetter(value="deposit")
+	public Double depositFormat() {
+		return new Double(this.deposit)/100;
+	}
+
+	public Double getDeposit() {
+		return deposit;
+	}
+
+	public void setDeposit(Double deposit) {
+		this.deposit = deposit;
+	}
+
+	@Override
+	public String toString() {
+		return "WalletDTO [residue=" + residue + ", frozen=" + frozen
+				+ ", status=" + status + "]";
+	}
+	
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -181,6 +181,14 @@ public class OrderChildVO {
     @ApiModelProperty("最晚装货时间")
     private String lastLoadTime;
 
+    @MoneyOutConvert
+    @ApiModelProperty("平台服务费")
+    private BigDecimal platformServiceFee;
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+    @MoneyOutConvert
+    @ApiModelProperty("接单保证金（元/车）")
+    private BigDecimal deposit;
 
     //结算信息
     @ApiModelProperty(value = "实际运费", example = "1.23")
@@ -219,5 +227,7 @@ public class OrderChildVO {
     @ApiModelProperty(value = "车辆未开启中交兴路的提示信息")
     private String notOpenZJXLMsg;
 
+    @ApiModelProperty("接单保证金 平台服务费费率 弹窗和文案显示 0 不显示  1 显示")
+    private Integer goodsOrderDetailShow =  0;
 
 }

performance-api/src/main/java/com/clx/performance/vo/feign/PlatformServiceFeeConfigFeignVO.java

+package com.clx.performance.vo.feign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class PlatformServiceFeeConfigFeignVO {
+
+    @ApiModelProperty(value = "订单报价方式,1:未税,2:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "结算方式")
+    private Integer settlementType;
+    @ApiModelProperty(value = "接单保证金")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -146,4 +147,20 @@ public class OrderGoodsVO {
 
     @ApiModelProperty("已派单数")
     private Integer dispatchedOrders;
+
+    @ApiModelProperty("平台运费报价税类型：0未税 1含税")
+    private Integer platformFreightQuotationTaxType;
+
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+
+    @MoneyOutConvert
+    @ApiModelProperty("接单保证金（分/车）")
+    private BigDecimal deposit;
+
+    @ApiModelProperty("结算方式  1装车净重 2卸车净重")
+    private Integer settlementWay;
+
+    @ApiModelProperty("接单保证金 平台服务费费率 弹窗和文案显示 0 不显示  1 显示")
+    private Integer goodsOrderDetailShow =  0;
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPagePlatformServiceFeeConfigVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author yangqifa
+ */
+@Getter
+@Setter
+@ToString
+public class CarrierPagePlatformServiceFeeConfigVO {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "订单报价方式,0:未税,1:含税")
+    private Integer orderQuotationType;
+    @ApiModelProperty(value = "订单报价方式")
+    private String orderQuotationTypeMsg;
+    @ApiModelProperty(value = "接单保证金，最多保留两位小数")
+    private BigDecimal deposit;
+    @ApiModelProperty(value = "平台服务费费率")
+    private BigDecimal serviceFeeRate;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java

@@ -73,6 +73,17 @@ public class CarrierPageSettlementDriverDetailVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;
+
+    @ApiModelProperty(value = "开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty(value = "开票公司简称")
+    private Integer invoicingCompanyShorterName;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "平台服务费")
+    private BigDecimal platformServiceFee;
+    @ApiModelProperty(value = "平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -66,6 +66,16 @@ public class CarrierPageSettlementDriverVO {
     @ApiModelProperty(value = "借款标示  0：未借款 1：已借款 2:已还款")
     private String loanFlagMsg;
 
+    @ApiModelProperty(value = "开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty(value = "开票公司简称")
+    private Integer invoicingCompanyShorterName;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "平台服务费")
+    private BigDecimal platformServiceFee;
+    @ApiModelProperty(value = "平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java

@@ -74,6 +74,10 @@ public class CarrierPageSettlementOwnerDetailVO {
     private BigDecimal loanFreight;
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")
     private Integer settlementWay;
+    @ApiModelProperty("开票公司id")
+    private Integer invoicingCompanyId;
+    @ApiModelProperty("开票公司简称")
+    private String invoicingCompanyShorterName;
     @ApiModelProperty(value = "创建时间")
     private String createTime;
 

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -51,6 +51,10 @@ public class CarrierPageSettlementOwnerVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "开票服务费")
+    private BigDecimal invoiceServiceFee;
+
     @ApiModelProperty(value = "创建时间")
     private String createTime;
     @ApiModelProperty(value = "状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/SettlementPlatformServiceFeeVO.java

+package com.clx.performance.vo.pc.carrier.settle;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 平台服务费
+* @Date: 2024/06/18 15:10:40
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class SettlementPlatformServiceFeeVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "车主用户编号", example = "")
+    private Long driverUserNo;
+    @ApiModelProperty(value = "车主名称", example = "")
+    private String driverName;
+    @ApiModelProperty(value = "司机手机号", example = "")
+    private String driverMobile;
+    @ApiModelProperty(value = "发货地址id", example = "")
+    private Integer sendAddressId;
+    @ApiModelProperty(value = "发货地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货地址id", example = "")
+    private Integer receiveAddressId;
+    @ApiModelProperty(value = "收货地址", example = "")
+    private String receiveAddress;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "结算金额（分）", example = "")
+    private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "开票服务费（分）", example = "")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value = "开票服务率%", example = "")
+    private BigDecimal invoiceServiceFeeRate;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -80,13 +80,19 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="开票标识：1网运单 2普通单",example = "普通单")
     private String invoiceTypeMsg;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="开票服务费",example = "2.1")
+    private BigDecimal invoiceServiceFee;
+    @ApiModelProperty(value="开票费率%",example = "12.34")
+    private BigDecimal invoiceServiceFeeRate;
+
     @ApiModelProperty(value="尾款状态 0-否,1-是,2-无需支付",example = "无需支付")
     private String finalPaymentStatusMsg;
 
     @ApiModelProperty(value="开票状态 0-否,1-是",example = "是")
     private String invoiceStatusMsg;
 
-    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重",example = "1")
+    @ApiModelProperty(value="结算方式  1装车净重 2卸车净重 3卸车净重（减货损）",example = "1")
     private Integer settlementWay;
 
 

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -34,6 +34,8 @@ import com.clx.performance.model.loan.OwnerLoanAccountRunningWaterRecord;
 import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
+import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -42,6 +44,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,7 +87,7 @@ public class OrderChildLoanComponent {
 
     private final NetworkDriverRunningWaterRecordService networkDriverRunningWaterRecordService;
 
-
+    private final  PaymentService paymentService;
 
     /**
      * 接单校验判断
@@ -338,6 +341,45 @@ public class OrderChildLoanComponent {
         networkDriverRunningWaterRecordService.generateNetworkCaseOutRecord(settlementDriverDetail);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void orderChildCancelAfter(String childNo){
+        //运单取消
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(
+                PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+
+        BigDecimal platformServiceFee = orderChild.getPlatformServiceFee(); //平台服务费
+
+        List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
+
+        if (CollectionUtil.isEmpty(runningWaterRecordList)) {
+            if( Objects.nonNull(platformServiceFee) && platformServiceFee.compareTo(BigDecimal.ZERO) != 0){
+                PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
+                payPlatformFeeParam.setTradeNo(childNo);
+                payPlatformFeeParam.setFigure(platformServiceFee.intValue());
+                paymentService.paymentCancelPlatformFee(payPlatformFeeParam);
+            }
+            return;
+        }
+
+        Long ownerUserNo = runningWaterRecordList.get(0).getOwnerUserNo();
+        log.info("当前解冻货主：{},流水记录长度{},流水记录{}", ownerUserNo, runningWaterRecordList.size(), JSONUtil.parse(runningWaterRecordList));
+
+        for (OwnerLoanAccountRunningWaterRecord record : runningWaterRecordList) {
+            Long loanNo = record.getLoanNo();
+            Integer loanType = record.getLoanType();
+            String ownerUserName = record.getOwnerUserName();
+            BigDecimal balance = record.getAlterationBalance();
+            //解冻借款
+            thawOwnerLoanAccount(loanNo, loanType, ownerUserNo, ownerUserName, record.getMobile(), childNo, balance);
+        }
+        if( Objects.nonNull(platformServiceFee) && platformServiceFee.compareTo(BigDecimal.ZERO) != 0){
+            PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
+            payPlatformFeeParam.setTradeNo(childNo);
+            payPlatformFeeParam.setFigure(platformServiceFee.intValue());
+            paymentService.paymentCancelPlatformFee(payPlatformFeeParam);
+        }
+    }
+
     //归还借款单的剩余金额+解冻流水
     public void thawOwnerLoanAccount(Long loanNo, Integer loanType, Long userNo, String userName, String mobile, String childNo, BigDecimal balance) {
         log.info("归还借款单的剩余金额+解冻流水,loanNo:{},loanType:{},userNo:{},childNo:{}, balance:{}", loanNo, loanType, userNo, childNo, balance);

performance-web/src/main/java/com/clx/performance/config/MslPaymentConfig.java

@@ -17,4 +17,6 @@ public class MslPaymentConfig {
     private String notifyhost;
     @Value("${msl.payment.transport.walletCode}")
     private Integer transportWalletCode;
+    @Value("${msl.payment.system.walletCode}")
+    private Integer systemWalletCode;
 }

performance-web/src/main/java/com/clx/performance/config/SettlementConfig.java

+package com.clx.performance.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "settlement")
+@Data
+@Component
+public class SettlementConfig {
+
+    // 普通单开票公司
+    private InvoiceCompany invoiceCompanyDefault;
+
+    @Data
+    public class InvoiceCompany {
+        String companyGroupCode;
+    }
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -48,6 +49,15 @@ public class OrderGoodsFeignController {
         return Result.ok(orderGoodsService.listFreightEstimate(param));
     }
 
+    @ApiOperation(value = "更新挂单运费", notes = "<br>By:艾庆国")
+    @PostMapping(value = {"/updatePendingOrderFright"})
+    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,
+                                          @RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight){
+
+        orderGoodsService.updateFrightPrice(orderGoodsNo, pendingOrderFreight);
+        return Result.ok();
+    }
+
     @ApiOperation(value = "定向单绑定车辆", notes = "<br>By:刘海泉")
     @PostMapping({"/saveBindTruck"})
     Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param) {

performance-web/src/main/java/com/clx/performance/controller/feign/PlatformServiceFeeFeignController.java

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.service.PlatformServiceFeeConfigService;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/feign/platformServiceFee")
+@Validated
+@Api(tags = "平台服务费Feign")
+public class PlatformServiceFeeFeignController {
+
+    @Autowired
+    private PlatformServiceFeeConfigService platformServiceFeeConfigService;
+
+    @GetMapping(value = {"/getPlatformServiceFeeConfig"})
+    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig(){
+
+        return Result.ok(platformServiceFeeConfigService.getConfig());
+
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/payment/PayNotifyController.java

 package com.clx.performance.controller.payment;
 
+import com.clx.performance.enums.PayUnitTypeEnum;
+import com.clx.performance.enums.payment.PayOperationStatusEnum;
+import com.clx.performance.enums.payment.PaymentStatusEnum;
+import com.clx.performance.model.payment.OrderPayment;
 import com.clx.performance.param.pay.NotifyString;
+import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.breakcontract.BreakContractMqHandlerService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.msl.common.result.Result;
@@ -27,6 +32,12 @@ public class PayNotifyController {
     @Autowired
     private BreakContractMqHandlerService breakContractMqHandlerService;
 
+    @Autowired
+    private PaymentService paymentService;
+
+
+
+
     @ApiOperation(value = "用户支付完成回调接口", notes = " <br>By:胡宁宁")
     @RequestMapping(value = "/userPayNotify", method = RequestMethod.POST)
     public Result<Object> userPayNotify(@RequestBody NotifyString notify) {
@@ -70,4 +81,137 @@ public class PayNotifyController {
         Result<Object> ret = new Result<>();
         return ret;
     }
+
+    @ApiOperation(value = "司机冻结保证金回调接口", notes = " <br>By:胡宁宁")
+    @RequestMapping(value = "/userPayDriverFreezeNotify", method = RequestMethod.POST)
+    public Result<Object> userPayDriverFreezeNotify(@RequestBody NotifyString notify) {
+        log.info("司机冻结保证金回调接口 传参 {}", notify);
+        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+            return new Result<>();
+        }
+        String paymentItem = PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode()+"";
+        int operation = PayOperationStatusEnum.FREEZE.getValue();
+        if (notify.getCode() != 0) {
+            paymentService.updateOrderPaymentFail(notify.getOrderNo(), notify.getMsg(),
+                    operation,
+                    paymentItem
+                   );
+            // 支付失败处理
+            log.info("支付失败处理 唯一id {}", notify.getOrderNo());
+        } else {
+            analysisSuccess(notify.getData().toString(), operation,  paymentItem);
+            paymentService.updateOrderPaymentSuccess(notify.getOrderNo(), operation,
+                    paymentItem);
+
+            // 支付支付成功处理
+            log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());
+        }
+        Result<Object> ret = new Result<>();
+        return ret;
+    }
+
+    @ApiOperation(value = "司机调整保证金回调接口", notes = " <br>By:胡宁宁")
+    @RequestMapping(value = "/userPayAdjustDriverFreezeNotify", method = RequestMethod.POST)
+    public Result<Object> userPayAdjustDriverFreezeNotify(@RequestBody NotifyString notify) {
+        log.info("司机调整保证金回调接口 传参 {}", notify);
+        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+            return new Result<>();
+        }
+        String paymentItem = PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode()+"";
+        int operation = PayOperationStatusEnum.ADJUSTMENT.getValue();
+        if (notify.getCode() != 0) {
+            paymentService.updateOrderPaymentFail(notify.getOrderNo(), notify.getMsg(),
+                    operation,
+                    paymentItem
+            );
+            // 支付失败处理
+            log.info("支付失败处理 唯一id {}", notify.getOrderNo());
+        } else {
+            paymentService.updateOrderPaymentSuccess(notify.getOrderNo(), operation,
+                    paymentItem);
+
+            // 支付支付成功处理
+            log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());
+        }
+        Result<Object> ret = new Result<>();
+        return ret;
+    }
+
+
+    @ApiOperation(value = "司机取消运单退还保证金回调接口", notes = " <br>By:胡宁宁")
+    @RequestMapping(value = "/userPayCancelDriverFreezeNotify", method = RequestMethod.POST)
+    public Result<Object> userPayCancelDriverFreezeNotify(@RequestBody NotifyString notify) {
+        log.info("司机取消运单退还保证金回调接口 传参 {}", notify);
+        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+            return new Result<>();
+        }
+        String paymentItem = PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode()+"";
+        int operation = PayOperationStatusEnum.UNFREEZE.getValue();
+        if (notify.getCode() != 0) {
+            paymentService.updateOrderPaymentFail(notify.getOrderNo(), notify.getMsg(),
+                    operation,
+                    paymentItem
+            );
+            // 支付失败处理
+            log.info("支付失败处理 唯一id {}", notify.getOrderNo());
+        } else {
+            paymentService.updateOrderPaymentSuccess(notify.getOrderNo(), operation,
+                    paymentItem);
+
+            // 支付支付成功处理
+            log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());
+        }
+        Result<Object> ret = new Result<>();
+        return ret;
+    }
+
+
+    @ApiOperation(value = "运单完成 保证金回调接口", notes = " <br>By:胡宁宁")
+    @RequestMapping(value = "/userPayCompleteDriverFreezeNotify", method = RequestMethod.POST)
+    public Result<Object> userPayCompleteDriverFreezeNotify(@RequestBody NotifyString notify) {
+        log.info("运单完成 保证金回调接口 传参 {}", notify);
+        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+            return new Result<>();
+        }
+        String paymentItem = PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode()+"";
+        int operation = PayOperationStatusEnum.UNFREEZE.getValue();
+        if (notify.getCode() != 0) {
+            paymentService.updateOrderPaymentFail(notify.getOrderNo(), notify.getMsg(),
+                    operation,
+                    paymentItem
+            );
+            // 支付失败处理
+            log.info("支付失败处理 唯一id {}", notify.getOrderNo());
+        } else {
+            paymentService.updateOrderPaymentSuccess(notify.getOrderNo(), operation,
+                    paymentItem);
+
+            // 支付支付成功处理
+            log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());
+        }
+        Result<Object> ret = new Result<>();
+        return ret;
+    }
+
+
+    private void analysisSuccess(String result,Integer operation, String paymentItem){
+        if(result.contains(",")){
+            String[] stringFlag = result.split(",");
+            if(stringFlag.length>0){
+                //最多四笔，直接循环修改
+                for(int i=0;i<stringFlag.length;i++){
+                    String [] ress = stringFlag[i].split("=");
+                    if(ress.length==2){//例如 id=serialNo
+                        paymentService.updateOrderPaymentSerialNoSuccess(ress[0],ress[1],operation,paymentItem);
+                    }
+                }
+            }
+        }else{
+            String[] ress = result.split("=");
+            if(ress.length==2){//例如 id=serialNo
+                paymentService.updateOrderPaymentSerialNoSuccess(ress[0],ress[1],operation,paymentItem);
+            }
+        }
+    }
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementPlatformServiceFeeController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.clx.performance.service.settle.SettlementPlatformServiceFeeExportService;
+import com.clx.performance.service.settle.SettlementPlatformServiceFeeService;
+import com.clx.performance.vo.pc.carrier.settle.SettlementPlatformServiceFeeVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/settlement/platformServiceFee")
+@Validated
+@Api(tags = "承运端-平台服务费统计-平台服务费")
+public class CarrierSettlementPlatformServiceFeeController {
+    @Autowired
+    private SettlementPlatformServiceFeeService settlementPlatformServiceFeeService;
+    @Autowired
+    private SettlementPlatformServiceFeeExportService settlementPlatformServiceFeeExportService;
+
+    @ApiOperation(value = "平台服务费统计",notes = "<br>By:艾庆国")
+    @PostMapping("/pagePlatformServiceFee")
+    @UnitCovert(param = false)
+    public Result<PageData<SettlementPlatformServiceFeeVO>> pagePlatformServiceFee(
+            @RequestBody @Validated PageCarrierSettlementPlatformServiceFeeParam param) {
+        IPage<SettlementPlatformServiceFeeVO> page  = settlementPlatformServiceFeeService
+                .pagePlatformServiceFee(param);
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
+
+    @ApiOperation(value = "导出平台服务费统计",notes = "<br>By:艾庆国")
+    @PostMapping("/exportPlatformServiceFee")
+    public void exportPlatformServiceFee(@RequestBody @Validated PageCarrierSettlementPlatformServiceFeeParam param) {
+
+        settlementPlatformServiceFeeExportService.exportPlatformServiceFee(param);
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/PlatformServiceFeeConfigController.java

+package com.clx.performance.controller.pc.carrier;
+
+import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
+import com.clx.performance.service.PlatformServiceFeeConfigService;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author yangqifa
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/pc/carrier/platformServiceFeeConfig")
+@Validated
+@Api(tags = "承运端-平台费率配置")
+@AllArgsConstructor
+public class PlatformServiceFeeConfigController {
+
+    private final PlatformServiceFeeConfigService platformServiceFeeConfigService;
+
+    @ApiOperation(value = "平台费率配置列表", notes = "<br>By:杨启发")
+    @GetMapping("/listPlatformServiceFeeConfig")
+    @UnitCovert(param = false)
+    public Result<CarrierPagePlatformServiceFeeConfigVO> listPlatformServiceFeeConfig() {
+        return Result.ok(platformServiceFeeConfigService.listPlatformServiceFeeConfig());
+    }
+
+    @ApiOperation(value = "平台费率配置详情", notes = "<br>By:杨启发")
+    @GetMapping("/getPlatformServiceFeeConfigDetail")
+    @UnitCovert(param = false)
+    public Result<CarrierPagePlatformServiceFeeConfigVO> getPlatformServiceFeeConfigDetail(@NotNull(message = "id不能为空") Integer id) {
+        return Result.ok(platformServiceFeeConfigService.getPlatformServiceFeeConfigDetail(id));
+    }
+
+    @ApiOperation(value = "编辑平台费率配置", notes = "<br>By:杨启发")
+    @PostMapping("/updatePlatformServiceFeeConfig")
+    public Result updatePlatformServiceFeeConfig(@RequestBody @Validated SavePlatformServiceFeeConfigParam param) {
+        platformServiceFeeConfigService.updatePlatformServiceFeeConfig(param);
+        return Result.ok();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
-import com.clx.message.feign.ClxMessageOpenapiFeign;
-import com.clx.message.req.batch.ClinkBatchMessageReq;
-import com.clx.message.req.message.ClinkMessageReq;
-import com.clx.performance.config.ClxMessageConfig;
 import com.clx.open.sdk.callback.message.OrderChildSyncMessage;
 import com.clx.performance.extranal.transport.TransportService;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.listener.OrderChildDtsListener;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
-import com.clx.performance.service.child.OrderChildPostService;
-import com.clx.performance.service.TempService;
-import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.validation.constraints.NotBlank;
 
 
 /**
@@ -51,50 +41,31 @@ public class TempController {
 
     @Autowired
     private OrderChildDtsListener orderChildDtsListener;
-    @Autowired
-    private ClxMessageConfig clxMessageConfig;
-    @Autowired
-    private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
-    @Autowired
-    private OrderChildPostService orderChildPostService;
+
 
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/test", method = RequestMethod.POST)
-    public Result test( String mobile, String warnName, String truckNo, String childNo) {
-        //触发{指定预警名称}预警；车牌号{车牌号}；运单{运单号}；请尽快核实情况
-        ClinkMessageReq req = new ClinkMessageReq();
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("触发");
-        sb.append(warnName);
-        sb.append("预警；车牌号");
-        sb.append(truckNo);
-        sb.append("；运单");
-        sb.append(childNo);
-        sb.append("；请尽快核实情况");
+    @RequestMapping(value = "/test", method = RequestMethod.GET)
+    public Result test() {
 
         OrderChildSyncMessage message = new OrderChildSyncMessage();
         message.setId(1);
         orderChildDtsListener.thirdpartySync(message);
-        String content = sb.toString();
-
-        req.setChannelId(clxMessageConfig.getChannelId());
-        req.setAppId(clxMessageConfig.getAppId().toString());
-        req.setMobile(mobile);
-        req.setContent(content);
-        clxMessageOpenapiFeign.sendClink(req);
 
         return Result.ok();
     }
-    @ApiOperation(value = "orderChildAdd", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/orderChildAdd", method = RequestMethod.POST)
-    public Result orderChildAdd( String mobile, String warnName, String truckNo, String childNo) {
-        orderChildPostService.orderChildAdd("123");
+
+    @ApiOperation(value = "测试支付划账 (临时接口)", notes = "<br>By:胡宁宁")
+    @RequestMapping(value = "/paymentTest", method = RequestMethod.GET)
+    public Result<Void> paymentTest(@RequestParam("fromUser") @NotBlank(message = "扣款方") String fromUser,
+                                    @RequestParam("pwd") @NotBlank(message = "收款方") String pwd,
+                                    @RequestParam("tradeNo") @NotBlank(message = "金额") String tradeNo,
+                                    @RequestParam("type") @NotBlank(message = "类型") int type) {
+
+        tempService.paymentTest(fromUser,pwd,tradeNo,type);
 
         return Result.ok();
     }
 
-
 //    @ApiOperation(value = "更新网运标识", notes = "<br>By:艾庆国")
 //    @RequestMapping(value = "/updateInvoiceType", method = RequestMethod.POST)
 //    public Result<Void> updateInvoiceType(String childNo, Integer invoiceType) {

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -42,6 +42,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     boolean updateSettlement(OrderChild item);
 
     boolean updateCancel(OrderChild item);
+    boolean updatePlatformServiceFee(OrderChild item);
 
 
     Optional<OrderChild> getByChildNo(String childNo);

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -61,6 +61,7 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     List<OrderGoods> listIntegralOrderGoodsSync();
 
     boolean updatePendingOrderFreightById(Integer id, BigDecimal pendingOrderFreight);
+    boolean updatePendingOrderFreightByIdList(BigDecimal pendingOrderFreight, List<Integer>idList);
 
     Boolean updateStopFlagByOrderNo(String orderNo, Integer stopFlag);
 

performance-web/src/main/java/com/clx/performance/dao/PlatformServiceFeeConfigDao.java

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.PlatformServiceFeeConfigMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.msl.common.dao.BaseDao;
+
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigDao extends BaseDao<PlatformServiceFeeConfigMapper, PlatformServiceFeeConfig, Integer> {
+
+    PlatformServiceFeeConfig listPlatformServiceFeeConfig();
+
+    boolean updatePlatformServiceFeeConfig(PlatformServiceFeeConfig config);
+
+}

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -68,6 +68,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
                 .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getDeposit, item.getDeposit())
+                .set(OrderChild::getPlatformServiceFee, item.getPlatformServiceFee())
         );
     }
 
@@ -85,6 +87,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
                 .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getDeposit, item.getDeposit())
+                .set(OrderChild::getPlatformServiceFee, item.getPlatformServiceFee())
         );
     }
 
@@ -105,6 +109,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .set(OrderChild::getWeight, item.getWeight())
                 .set(OrderChild::getFreight, item.getFreight())
                 .set(OrderChild::getPoundStatus, item.getPoundStatus())
+                .set(OrderChild::getDeposit, item.getDeposit())
+                .set(OrderChild::getPlatformServiceFee, item.getPlatformServiceFee())
         );
     }
 
@@ -156,6 +162,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public boolean updatePlatformServiceFee(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getId, item.getId())
+                .set(OrderChild::getPlatformServiceFee, item.getPlatformServiceFee())
+        );
+    }
+
 
     @Override
     public Optional<OrderChild> getByChildNo(String childNo) {

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -158,6 +158,15 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         return update(lUdWrapper().eq(OrderGoods :: getId,id).set(OrderGoods :: getPendingOrderFreight,pendingOrderFreight));
     }
 
+    @Override
+    public boolean updatePendingOrderFreightByIdList(BigDecimal pendingOrderFreight, List<Integer> idList) {
+        return update(lUdWrapper()
+                .in(OrderGoods::getId,idList)
+                .set(OrderGoods::getPendingOrderFreight,pendingOrderFreight)
+        );
+
+    }
+
     @Override
     public Boolean updateStopFlagByOrderNo(String orderNo, Integer stopFlag) {
         return update(lUdWrapper().eq(OrderGoods :: getOrderNo,orderNo).set(OrderGoods :: getStopFlag,stopFlag));

performance-web/src/main/java/com/clx/performance/dao/impl/PlatformServiceFeeConfigImpl.java

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.PlatformServiceFeeConfigDao;
+import com.clx.performance.mapper.PlatformServiceFeeConfigMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @author yangqifa
+ */
+@Repository
+public class PlatformServiceFeeConfigImpl extends BaseDaoImpl<PlatformServiceFeeConfigMapper, PlatformServiceFeeConfig, Integer> implements PlatformServiceFeeConfigDao {
+
+    @Override
+    public PlatformServiceFeeConfig listPlatformServiceFeeConfig() {
+        return list().get(0);
+    }
+
+    @Override
+    public boolean updatePlatformServiceFeeConfig(PlatformServiceFeeConfig config) {
+        return update(lUdWrapper()
+                .eq(PlatformServiceFeeConfig::getId, config.getId())
+                .set(PlatformServiceFeeConfig::getOrderQuotationType, config.getOrderQuotationType())
+                .set(PlatformServiceFeeConfig::getDeposit, config.getDeposit())
+                .set(PlatformServiceFeeConfig::getServiceFeeRate, config.getServiceFeeRate())
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/payment/OrderPaymentDaoImpl.java

+package com.clx.performance.dao.impl.payment;
+
+import com.clx.performance.dao.payment.OrderPaymentDao;
+import com.clx.performance.mapper.payment.OrderPaymentMapper;
+import com.clx.performance.model.payment.OrderPayment;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ */
+@Repository
+public class OrderPaymentDaoImpl extends BaseDaoImpl<OrderPaymentMapper, OrderPayment, Integer> implements OrderPaymentDao {
+    @Override
+    public Optional<OrderPayment> selectByOrderNoAndItemId(String orderNo, String paymentItem) {
+        return Optional.of(orderNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderPayment::getOrderNo, item)
+                        .eq(OrderPayment::getPaymentItem, paymentItem)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public Optional<OrderPayment> selectByRelationNo(String relationNo, Integer operation, String paymentItem) {
+        return Optional.of(relationNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderPayment::getRelationNo, item)
+                        .eq(OrderPayment::getOperation, operation)
+                        .eq(OrderPayment::getPaymentItem, paymentItem)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public Optional<OrderPayment> selectByOrderNoAndItemIdAndOperation(String orderNo, String paymentItem,
+                                                                       Integer operation) {
+        return Optional.of(orderNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderPayment::getOrderNo, item)
+                        .eq(OrderPayment::getPaymentItem, paymentItem)
+                        .eq(OrderPayment::getOperation, operation)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public List<OrderPayment> listByOrderNo(String orderNo, String paymentItem) {
+        return list(lQrWrapper()
+                .eq(OrderPayment::getOrderNo, orderNo)
+                .eq(OrderPayment::getPaymentItem, paymentItem)
+        );
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -18,7 +18,6 @@ import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * @Author: aiqinguo
@@ -37,6 +36,10 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
                 .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
                 .set(SettlementDriverDetail::getLoanFlag, item.getLoanFlag())
                 .set(SettlementDriverDetail::getLoanTypeFlag, item.getLoanTypeFlag())
+
+                .set(SettlementDriverDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
+                .set(SettlementDriverDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
+                .set(SettlementDriverDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -40,6 +40,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
                 .set(SettlementOwner::getInvoiceFreight, item.getInvoiceFreight())
                 .set(SettlementOwner::getLoanFreight, item.getLoanFreight())
                 .set(SettlementOwner::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementOwner::getInvoiceServiceFee, item.getInvoiceServiceFee())
         );
     }
 
@@ -118,6 +119,13 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(StringUtils.isNotBlank(param.getOrderNo())){
             query.eq(SettlementOwner :: getOrderNo,param.getOrderNo());
         }
+        if(StringUtils.isNotBlank(param.getBeginTime())){
+            query.ge(SettlementOwner :: getCreateTime,param.getBeginTime());
+        }
+        if(StringUtils.isNotBlank(param.getEndTime())){
+            query.le(SettlementOwner :: getCreateTime,param.getEndTime());
+        }
+
         query.orderByDesc(SettlementOwner :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
 
@@ -165,10 +173,29 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     }
 
     @Override
-    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(String orderNo, LocalDateTime settlementPeriodTime, Integer invoiceType) {
+    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(String orderNo, Integer invoicingCompanyId,
+                                                                         LocalDateTime settlementPeriodTime, Integer invoiceType) {
         return Optional.of(lQrWrapper()
                         .eq(SettlementOwner::getOrderNo, orderNo)
-                        .eq(SettlementOwner::getSettlementPeriodType, SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode())
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
+                        .eq(SettlementOwner::getSettlementPeriodType,
+                                SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode())
+                        .eq(SettlementOwner::getSettlementPeriodTime, settlementPeriodTime)
+                        .eq(SettlementOwner::getInvoiceType, invoiceType)
+                        .eq(SettlementOwner::getStatus, SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
+                )
+                .map(super::getOne);
+    }
+    @Override
+    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodDaily(String orderNo,
+                                                                         Integer invoicingCompanyId,
+                                                                         LocalDateTime settlementPeriodTime,
+                                                                         Integer invoiceType) {
+        return Optional.of(lQrWrapper()
+                        .eq(SettlementOwner::getOrderNo, orderNo)
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
+                        .eq(SettlementOwner::getSettlementPeriodType,
+                                SettlementOwnerEnum.SettlementPeriodType.DAILY.getCode())
                         .eq(SettlementOwner::getSettlementPeriodTime, settlementPeriodTime)
                         .eq(SettlementOwner::getInvoiceType, invoiceType)
                         .eq(SettlementOwner::getStatus, SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
@@ -177,9 +204,12 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     }
 
     @Override
-    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(String orderNo, Integer invoiceType) {
+    public Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(String orderNo,
+                                                                             Integer invoicingCompanyId,
+                                                                             Integer invoiceType) {
         return Optional.of(lQrWrapper()
                         .eq(SettlementOwner::getOrderNo, orderNo)
+                        .eq(SettlementOwner::getInvoicingCompanyId, invoicingCompanyId)
                         .eq(SettlementOwner::getSettlementPeriodType, SettlementOwnerEnum.SettlementPeriodType.IMMEDIATE.getCode())
                         .eq(SettlementOwner::getInvoiceType, invoiceType)
                         .eq(SettlementOwner::getStatus, SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
@@ -243,6 +273,15 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
                 .set(SettlementOwner::getStatus, toStatus)
         );
     }
+    @Override
+    public boolean updateDailyLock(Integer settlementPeriodType, LocalDateTime settlementPeriodTime, Integer fromStatus,Integer toStatus){
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getSettlementPeriodType, settlementPeriodType)
+                .eq(SettlementOwner::getSettlementPeriodTime, settlementPeriodTime)
+                .eq(SettlementOwner::getStatus, fromStatus)
+                .set(SettlementOwner::getStatus, toStatus)
+        );
+    }
 
     @Override
     public void updateSettlementMerge(@Param("settlementNo")String settlementNo,

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -37,6 +37,12 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .set(SettlementOwnerDetail::getFinalPaymentStatus, item.getFinalPaymentStatus())
                 .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
                 .set(SettlementOwnerDetail::getLoanFreight, item.getLoanFreight())
+
+                .set(SettlementOwnerDetail::getInvoicingCompanyId, item.getInvoicingCompanyId())
+                .set(SettlementOwnerDetail::getInvoicingCompanyShorterName, item.getInvoicingCompanyShorterName())
+                .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
+                .set(SettlementOwnerDetail::getInvoiceServiceFeeRate, item.getInvoiceServiceFeeRate())
+                .set(SettlementOwnerDetail::getInvoiceServiceFee, item.getInvoiceServiceFee())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementPlatformServiceFeeDaoImpl.java

+package com.clx.performance.dao.impl.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.dao.settle.SettlementPlatformServiceFeeDao;
+import com.clx.performance.mapper.settle.SettlementPlatformServiceFeeMapper;
+import com.clx.performance.model.settle.SettlementPlatformServiceFee;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Author: aiqinguo
+ * @Description:
+ * @Date: 2023-10-11 18:04:09
+ * @Version: 1.0
+ */
+@Repository
+public class SettlementPlatformServiceFeeDaoImpl extends BaseDaoImpl<SettlementPlatformServiceFeeMapper,
+        SettlementPlatformServiceFee, Integer> implements SettlementPlatformServiceFeeDao {
+
+    @Override
+    public IPage<SettlementPlatformServiceFee> pageByParam(PageCarrierSettlementPlatformServiceFeeParam param) {
+        Page<SettlementPlatformServiceFee> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageByParam(page,param);
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/payment/OrderPaymentDao.java

+package com.clx.performance.dao.payment;
+
+import com.clx.performance.mapper.payment.OrderPaymentMapper;
+import com.clx.performance.model.payment.OrderPayment;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ */
+public interface OrderPaymentDao extends BaseDao<OrderPaymentMapper, OrderPayment, Integer> {
+
+    Optional<OrderPayment> selectByOrderNoAndItemId(@Param("orderNo")String orderNo,
+                                                    @Param("paymentItem")String paymentItem);
+
+    Optional<OrderPayment> selectByRelationNo(@Param("relationNo")String relationNo,
+                                              @Param("operation")Integer operation,
+                                              @Param("paymentItem")String paymentItem);
+
+    Optional<OrderPayment> selectByOrderNoAndItemIdAndOperation(@Param("orderNo")String orderNo,
+                                                    @Param("paymentItem")String paymentItem,
+                                                                @Param("operation")Integer operation);
+
+    List<OrderPayment> listByOrderNo(@Param("orderNo")String orderNo, @Param("paymentItem")String paymentItem);
+
+}

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -36,9 +36,17 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
     IPage<SettlementOwner> pageSettlementOwner(Long userNo,PageOwnerSettlementParam param);
 
     Optional<SettlementOwner> selectUnlockOfSettlementPeriodMonth(@Param("orderNo")String orderNo,
+                                                                  @Param("invoicingCompanyId") Integer invoicingCompanyId,
                                                                   @Param("settlementPeriodTime") LocalDateTime settlementPeriodTime,
                                                                   @Param("invoiceType")Integer invoiceType);
+
+    Optional<SettlementOwner> selectUnlockOfSettlementPeriodDaily(String orderNo,
+                                                                  Integer invoicingCompanyId,
+                                                                  LocalDateTime settlementPeriodTime,
+                                                                  Integer invoiceType);
+
     Optional<SettlementOwner> selectUnlockOfSettlementPeriodImmediate(@Param("orderNo")String orderNo,
+                                                                      @Param("invoicingCompanyId") Integer invoicingCompanyId,
                                                                       @Param("invoiceType")Integer invoiceType);
     List<SettlementOwner> listToBeLockOfSettlementPeriodMonth(@Param("settlementPeriodTime") LocalDateTime settlementPeriodTime);
 
@@ -61,6 +69,9 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
                                   @Param("fromStatus")Integer fromStatus,
                                   @Param("toStatus")Integer toStatus);
 
+    boolean updateDailyLock(Integer settlementPeriodType, LocalDateTime settlementPeriodTime,
+                            Integer fromStatus, Integer toStatus);
+
     void updateSettlementMerge(@Param("settlementNo")String settlementNo,
             @Param("settlementNos")List<String> settlementNos,
             @Param("mergedBy") String mergedBy,

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementPlatformServiceFeeDao.java

+package com.clx.performance.dao.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.mapper.settle.SettlementPlatformServiceFeeMapper;
+import com.clx.performance.model.settle.SettlementPlatformServiceFee;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.msl.common.dao.BaseDao;
+
+
+/**
+ * @Author: aiqinguo
+ * @Description:
+ * @Date: 2023-10-11 18:00:53
+ * @Version: 1.0
+ */
+public interface SettlementPlatformServiceFeeDao extends BaseDao<SettlementPlatformServiceFeeMapper,
+        SettlementPlatformServiceFee, Integer> {
+    IPage<SettlementPlatformServiceFee> pageByParam(PageCarrierSettlementPlatformServiceFeeParam param);
+
+}

performance-web/src/main/java/com/clx/performance/dto/payment/PaymentDTO.java

+package com.clx.performance.dto.payment;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ *
+ * @author 胡宁宁
+ * @date 2024年06
+ * @description
+ */
+@Data
+@Builder
+public class PaymentDTO {
+	/** 本次调整金额 **/
+	BigDecimal changeDeposit ;
+	/** 最新的保证金**/
+	BigDecimal platformServiceFeeNew;
+}

performance-web/src/main/java/com/clx/performance/dto/payment/WalletResidueCardDTO.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  *
  * @author 胡宁宁
- * @date 2023年11月12日
+ * @date 2024年06
  * @description
  */
 public class WalletResidueCardDTO extends WalletResidueDTO{

performance-web/src/main/java/com/clx/performance/dto/payment/WalletResidueDTO.java

@@ -7,12 +7,11 @@ import java.math.BigDecimal;
 
 
 /**
- * 
+ *
  * @author 胡宁宁
- * @date 2023年11月12日
+ * @date 2024年06
  * @description
  */
-
 public class WalletResidueDTO {
 
 	@ApiModelProperty(value = "余额", dataType = "double", example = "11.10")

performance-web/src/main/java/com/clx/performance/enums/HttpEnum.java

@@ -7,7 +7,17 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum HttpEnum {
 
-    PERFORMANCE_PAY_CLX_PAYMENT(10000, "履约服务向老马上来发起钱包转账","/payment-service/performance/payUserWalletTransfer"),
+    PERFORMANCE_PAY_CLX_PAYMENT(10000, "履约服务向老马上来发起钱包转账",
+            "/payment-service/performance/payUserWalletTransfer"),
+
+    PERFORMANCE_PAY_CLX_DRIVER_FREEZE(10001, "履约服务向老马上来发起司机押金冻结",
+            "/payment-service/performance/freezeUserMQ"),
+
+    PERFORMANCE_PAY_CLX_ADJUST_DRIVER_FREEZE(10002, "履约服务向老马上来发起司机押金冻结调整",
+            "/payment-service/performance/completeFreezeBatchMQ"),
+
+    PERFORMANCE_PAY_CLX_WALLET(10003, "履约服务向老马上来发起司机余额查询",
+            "/payment-service/performance/getWalletAndCard"),
     ;
 
     private final int code;

performance-web/src/main/java/com/clx/performance/enums/PayRemarkEnum.java

@@ -26,6 +26,7 @@ public enum PayRemarkEnum {
     //v78 解冻保险
     OWNER_PAY_DRIVER_INSURANCE(15, "货主取消订单赔偿金"),
     DRIVER_PAY_OWNER_DRIVER_INSURANCE(16, "司机取消订单赔偿金"),
+    UPDATE_DRIVER_FREEZE(17, "修正司机押金"),
 
     ;
 

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -140,6 +140,7 @@ public class EventListenerComponent {
                 throw e;
             }
             log.info("处理货主借款监听器执行成功");
+
             settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
             settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
@@ -210,24 +211,7 @@ public class EventListenerComponent {
         String childNo = event.getChildNo();
         log.info("需要解冻借款的的运单号:{}", childNo);
 
-        List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
-
-        if (CollectionUtil.isEmpty(runningWaterRecordList)) {
-            return;
-        }
-
-        Long ownerUserNo = runningWaterRecordList.get(0).getOwnerUserNo();
-        log.info("当前解冻货主：{},流水记录长度{},流水记录{}", ownerUserNo, runningWaterRecordList.size(), JSONUtil.parse(runningWaterRecordList));
-
-        for (OwnerLoanAccountRunningWaterRecord record : runningWaterRecordList) {
-            Long loanNo = record.getLoanNo();
-            Integer loanType = record.getLoanType();
-            String ownerUserName = record.getOwnerUserName();
-            BigDecimal balance = record.getAlterationBalance();
-            //解冻借款
-            orderChildLoanComponent.thawOwnerLoanAccount(loanNo, loanType, ownerUserNo, ownerUserName, record.getMobile(), childNo, balance);
-        }
-
+        orderChildLoanComponent.orderChildCancelAfter(childNo);
     }
 
     @EventListener(classes = {OwnerLoanThawEvent.class})

performance-web/src/main/java/com/clx/performance/extranal/order/InvoicingCompanyService.java

+package com.clx.performance.extranal.order;
+
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
+import com.msl.common.base.Optional;
+
+public interface InvoicingCompanyService {
+
+    Optional<InvoicingCompanyVO> getInvoicingCompany(int  id);
+
+    InvoicingCompanyVO getInvoicingCompanyByGroupCode(String companyGroupCode);
+
+}

performance-web/src/main/java/com/clx/performance/extranal/order/impl/InvoicingCompanyServiceImpl.java

+package com.clx.performance.extranal.order.impl;
+
+import com.clx.order.feign.InvoicingCompanyFeign;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
+import com.clx.performance.extranal.order.InvoicingCompanyService;
+import com.msl.common.base.Optional;
+import com.msl.common.result.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class InvoicingCompanyServiceImpl implements InvoicingCompanyService {
+    @Autowired
+    private InvoicingCompanyFeign invoicingCompanyFeign;
+
+    @Override
+    public Optional<InvoicingCompanyVO> getInvoicingCompany(int  id) {
+        return Optional.ofNullable(invoicingCompanyFeign.getInvoicingCompany(id))
+                .filter(Result::succeed)
+                .map(Result::getData);
+    }
+
+    @Override
+    public InvoicingCompanyVO getInvoicingCompanyByGroupCode(String companyGroupCode) {
+        return Optional.of(invoicingCompanyFeign.getInvoicingCompanyByGroupCode(companyGroupCode))
+                .filter(Result::succeed)
+                .map(Result::getData)
+                .orNull();
+    }
+}

performance-web/src/main/java/com/clx/performance/job/SettlementOwnerMontnJob.java

 package com.clx.performance.job;
 
+import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.service.settle.SettlementOwnerService;
+import com.clx.performance.utils.LocalDateTimeUtils;
 import com.msl.common.job.JobLog;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 @Slf4j
 @Component
 public class SettlementOwnerMontnJob {
 
     @Autowired
     SettlementOwnerService settlementOwnerService;
+    @Autowired
+    private SettlementOwnerDao settlementOwnerDao;
 
     /**
      * 月结货主结算单状态变更为锁定
@@ -32,7 +38,25 @@ public class SettlementOwnerMontnJob {
         }
     }
 
+    /**
+     * 日结货主结算单状态变更为锁定
+     */
+    @XxlJob("settlementOwnerDailyInit")
+    public void settlementOwnerDailyInit() {
+        try {
+            // 锁定前一天数据
+            LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getDayStart().minusDays(1);
 
-
+            //所有日结的待锁定的货主结算单修改状态为锁定
+            settlementOwnerDao.updateDailyLock(
+                    SettlementOwnerEnum.SettlementPeriodType.DAILY.getCode(),
+                    settlementPeriodTime,
+                    SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode(),
+                    SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
+        } catch (Exception e) {
+            log.warn("日结货主结算单状态变更为锁定，异常原因:{}",e);
+            JobLog.error("日结货主结算单状态变更为锁定，异常原因=====================", e);
+        }
+    }
 
 }

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

 package com.clx.performance.listener;
 
 import cn.hutool.json.JSONUtil;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.component.IdGenerateSnowFlake;
-import com.clx.performance.component.OrderChildLoanComponent;
 import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.config.SettlementConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -19,7 +20,7 @@ import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.event.OwnerLoanEvent;
-import com.clx.performance.event.SettlementUpdateEvent;
+import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.model.*;
 import com.clx.performance.model.settle.SettlementDriverDetail;
@@ -27,19 +28,16 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
-import com.clx.performance.service.settle.SettlementMqService;
 import com.msl.common.dto.HttpDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Objects;
 
@@ -72,7 +70,12 @@ public class OrderChildSyncTransportListener {
     private final OrderChildSyncTransportInvoiceRecordDao orderChildSyncTransportInvoiceRecordDao;
 
     private final ApplicationEventPublisher applicationEventPublisher;
+    private final InvoicingCompanyService invoicingCompanyService;
+    private final SettlementConfig settlementConfig;
 
+    /**
+     * 承运同步网络货运运单
+     */
     @RabbitListener(queues = RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_QUEUE)
     public void onMessage(String message) {
         OrderChild orderChild = JSONUtil.toBean(message, OrderChild.class);
@@ -93,12 +96,15 @@ public class OrderChildSyncTransportListener {
     public void transportOrderChildProcess(OrderChild orderChild) {
         Integer invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
 
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
+
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
         ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+
+        // 同步网络货运
         HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
         String decrypt = ThirdComponent.decrypt(httpDTOResult.getData());
         OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
@@ -109,7 +115,7 @@ public class OrderChildSyncTransportListener {
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,
                            SettlementOwnerDetail settlementOwnerDetail,
                            Integer invoiceType, SettlementDriverDetail settlementDriverDetail) {
-        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
         if (null != bean  && bean.getCode() == 0) {
             log.info("当前OrderChildSyncTransportListener监听同步网络货运成功,运单号为{}", orderChild.getChildNo());
@@ -159,32 +165,57 @@ public class OrderChildSyncTransportListener {
                         settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
                     }
                 }
-            } else {
+            }
+            else {
                 settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
                 settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
             }
-        } else {
+        }
+        else {
             log.info("当前OrderChildSyncTransportListener监听同步网络货运失败,变为普通单,运单号{}, 错误信息{}", orderChild.getChildNo(), remark);
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         }
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
+            // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
+            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
+
+            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
+                    settlementConfig.getInvoiceCompanyDefault().getCompanyGroupCode());
+            //设置开票公司信息
+            settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
+            settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
+            settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
+
+            settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
+            settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
+            settlementDriverDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
         } else {
             if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
+            // 如果开票标识为“网运单”时，开票费率取货单单所记录的开票费率
+            settlementOwnerDetail.setInvoiceServiceFeeRate(
+                    orderGoods.getInvoiceServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
         }
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
+        // 开票服务费
+        settlementOwnerDetail.setInvoiceServiceFee(invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        // 开票金额
+        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
+                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
+
         //货主借款事件处理
         OwnerLoanMqDTO dto = new OwnerLoanMqDTO();
         dto.setSettlementOwnerDetail(settlementOwnerDetail);
@@ -261,20 +292,49 @@ public class OrderChildSyncTransportListener {
     /**
      * 开票金额
      */
-    private BigDecimal invoiceFreightCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
+    private BigDecimal invoiceFreightCalc(Integer settlementWay, BigDecimal invoiceServiceFeeRate, SettlementOwnerDetail settlementOwnerDetail) {
         if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，开票金额=实际净重*平台运费报价-货损金额。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
                     .subtract(settlementOwnerDetail.getLossFreight());
-        } else { //订单结算方式为“卸车净重”时，开票金额=实际净重*平台运费报价。
+        }
+        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            if (invoiceServiceFeeRate!=null){
+                //结算方式为“卸车净重（减货损）”，平台运费报价为“未税”时，开票金额=平台运费单价*实际净重-货损单价*货损吨数+开票服务费。
+                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
+                        .subtract(settlementOwnerDetail.getLossPrice())
+                        .add(settlementOwnerDetail.getInvoiceServiceFee());
+            }
+            else{
+                //结算方式为“卸车净重（减货损）”，平台运费报价为“含税”时   开票金额=平台运费单价*实际净重-货损单价*货损吨数
+                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
+                        .subtract(settlementOwnerDetail.getLossFreight());
+            }
+        }
+        else { //订单结算方式为“卸车净重”时，开票金额=实际净重*平台运费报价。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice());
         }
     }
+    /**
+     * 开票服务费金额
+     */
+    private BigDecimal invoiceServiceFeeCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
+        return settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight())
+                .divide(BigDecimal.ONE.subtract(settlementOwnerDetail.getInvoiceServiceFeeRate()), 0, RoundingMode.HALF_UP)
+                .multiply(settlementOwnerDetail.getInvoiceServiceFeeRate()).setScale(0, RoundingMode.HALF_UP);
+    }
 
     private BigDecimal settlementFreightCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
         if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
                     .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
-        } else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
+        }
+        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            //结算方式为“卸车净重（减货损）“，结算金额=开票金额-预付运费金额-借款抵扣金额。
+            return settlementOwnerDetail.getInvoiceFreight()
+                    .subtract(settlementOwnerDetail.getPrepayFreight())
+                    .subtract(settlementOwnerDetail.getLoanFreight());
+
+        }else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice()).subtract(settlementOwnerDetail.getPrepayFreight());
         }
     }

performance-web/src/main/java/com/clx/performance/mapper/PlatformServiceFeeConfigMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigMapper extends BaseMapper<PlatformServiceFeeConfig> {
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/payment/OrderPaymentMapper.java

+package com.clx.performance.mapper.payment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.payment.OrderPayment;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ */
+public interface OrderPaymentMapper extends BaseMapper<OrderPayment> {
+}

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementPlatformServiceFeeMapper.java

+package com.clx.performance.mapper.settle;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.settle.SettlementPlatformServiceFee;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.clx.performance.sqlProvider.settle.SettlementPlatformServiceFeeSqlProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+@Mapper
+public interface SettlementPlatformServiceFeeMapper extends BaseMapper<SettlementPlatformServiceFee> {
+    /**
+     * @see SettlementPlatformServiceFeeSqlProvider#pageByParam(Page, PageCarrierSettlementPlatformServiceFeeParam)
+     */
+    @SelectProvider(type = SettlementPlatformServiceFeeSqlProvider.class, method = "pageByParam")
+    IPage<SettlementPlatformServiceFee> pageByParam(@Param("page") Page page, @Param("param") PageCarrierSettlementPlatformServiceFeeParam param);
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -99,6 +99,9 @@ public class OrderChild implements HasKey<Integer> {
     private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
     private Integer reportFlag;  //是否上报 0-否;1-是
 
+    private BigDecimal platformServiceFee;                  //平台服务费（分）
+    private BigDecimal platformServiceFeeRate;              //平台服务费费率%
+    private BigDecimal deposit;                             //接单保证金（分/车）
 
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -191,6 +191,16 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("批次号")
     private Long batchNumber;
 
+    @ApiModelProperty("平台运费报价税类型：0未税 1含税")
+    private Integer platformFreightQuotationTaxType;
+    @ApiModelProperty("开票服务率%")
+    private BigDecimal invoiceServiceFeeRate;
+
+    @ApiModelProperty("平台服务费费率%")
+    private BigDecimal platformServiceFeeRate;
+    @ApiModelProperty("接单保证金（分/车）")
+    private BigDecimal deposit;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

performance-web/src/main/java/com/clx/performance/model/PlatformServiceFeeConfig.java

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 平台服务费配置表
+ *
+ * @author yangqifa
+ */
+@Setter
+@Getter
+public class PlatformServiceFeeConfig implements HasKey<Integer> {
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 订单报价方式,0:未税,1:含税
+     */
+    private Integer orderQuotationType;
+
+    /**
+     * 接单保证金，最多保留两位小数
+     */
+    private BigDecimal deposit;
+
+    /**
+     * 平台服务费费率
+     */
+    private BigDecimal serviceFeeRate;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    private Date modifiedTime;
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/payment/OrderPayment.java

+package com.clx.performance.model.payment;
+
+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 com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author huningning
+ * Date 2024-06-18
+ * Time 14:01
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("order_payment")
+public class OrderPayment implements HasKey<Integer>  {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("order_no")
+    @ApiModelProperty("主订单号")
+    private String orderNo;
+
+    @TableField("relation_no")
+    @ApiModelProperty("业务关联单号")
+    private String relationNo;
+
+    @TableField("payment_item")
+    @ApiModelProperty("交易名目")
+    private String paymentItem;
+
+    @TableField("serial_no")
+    @ApiModelProperty("流水号")
+    private String serialNo;
+
+    @TableField("amount")
+    @ApiModelProperty("金额")
+    private Integer amount;
+
+    @TableField("operation")
+    @ApiModelProperty("1:冻结 2:调整 3:解冻 4:部分解冻 5:部分支付 6:支付")
+    private Integer operation;
+
+    @TableField("status")
+    @ApiModelProperty("0: 发起，1: 成功，2:失败")
+    private Integer status;
+
+    @TableField("reason")
+    @ApiModelProperty("")
+    private String reason;
+
+    @TableField("create_time")
+    @ApiModelProperty("")
+    private LocalDateTime createTime;
+
+    @TableField("modified_time")
+    @ApiModelProperty("")
+    private LocalDateTime modifiedTime;
+
+    @Override
+    @KeyColumn("id")
+    public Integer gainKey() {
+    return this.id;
+    }
+}

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriver.java

@@ -48,6 +48,11 @@ public class SettlementDriver implements HasKey<Integer> {
     private String settlementPlatform;              //结算平台
     private Integer prepayFreightFlag;              //预付运费标示  0:未预付 1：已预付
     private String payErrorMsg;              //支付失败原因
+    private Integer invoicingCompanyId;             //开票公司id
+    private Integer invoicingCompanyShorterName;    //开票公司简称
+    private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
+    private BigDecimal platformServiceFee;           //平台服务费（分）
+    private BigDecimal platformServiceFeeRate;       //平台服务费费率%
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

performance-web/src/main/java/com/clx/performance/model/settle/SettlementDriverDetail.java

@@ -48,6 +48,11 @@ public class SettlementDriverDetail implements HasKey<Integer> {
     private Integer loanTypeFlag;                   //借款类型标示  0：虚拟货币+资金 1：虚拟货币 2：资金
     private BigDecimal settlementFreight;           //结算金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private Integer invoicingCompanyId;             //开票公司id
+    private String invoicingCompanyShorterName;     //开票公司简称
+    private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
+    private BigDecimal platformServiceFee;           //平台服务费（分）
+    private BigDecimal platformServiceFeeRate;       //平台服务费费率%
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwner.java

@@ -29,10 +29,10 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer id;                             //id
     private Long ownerUserNo;                       //货主用户编号
     private String ownerName;                       //货主名称
-    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重
+    private Integer settlementWay;                  //结算方式  1装车净重 2卸车净重 3卸车净重（减货损）
     private String settlementNo;                    //结算单编号
     private String settlementSubNo;                 //结算子单号
-    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结
+    private Integer settlementPeriodType;           //结算周期类型：1拉运完成结 2月结 3日结
     private LocalDateTime settlementPeriodTime;     //结算周期时间（月结）
     private String orderNo;                         //订单编号
     private BigDecimal weight;                      //实际净重（吨）
@@ -45,6 +45,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private BigDecimal invoiceFreight;              //开票金额（分）
     private String invoiceImg;                      //结算凭证
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
     private String payee;                           //收款人
     private String payeeBankName;                   //收款银行
     private String payeeBankCardNo;                //收款银行卡卡号

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -52,6 +52,8 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private BigDecimal loanFreight;                 //借款抵扣金额（分）
     private BigDecimal invoiceFreight;              //开票金额（分）
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务率
     private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
     private Integer invoiceStatus;                  //开票状态 0-否,1-是,2-无需开票
     private Integer invoicingCompanyId;  //开票公司id

performance-web/src/main/java/com/clx/performance/model/settle/SettlementPlatformServiceFee.java

+package com.clx.performance.model.settle;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 平台服务费
+* @Date: 2024/06/18 15:10:40
+* @Version: 1.0
+*/
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class SettlementPlatformServiceFee implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private String childNo;                         //运单编号
+    private Long driverUserNo;                      //车主用户编号
+    private String driverName;                      //车主名称
+    private Integer sendAddressId;                  //发货地址id
+    private String sendAddress;                     //发货地址
+    private Integer receiveAddressId;               //收货地址id
+    private String receiveAddress;                  //收货地址
+    private String truckNo;                         //车牌号
+    private BigDecimal settlementFreight;           //结算金额（分）
+    private BigDecimal invoiceServiceFee;           //开票服务费（分）
+    private BigDecimal invoiceServiceFeeRate;       //开票服务率%
+    private LocalDateTime createTime;               //创建时间
+    private LocalDateTime modifiedTime;             //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -102,4 +102,6 @@ public interface OrderGoodsService {
     void batchUpdateResidueWeight(List<OrderGoods> list);
 
     void saveBindTruck(DistributionTruckParam param);
+
+    void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
 }

performance-web/src/main/java/com/clx/performance/service/PaymentService.java

@@ -2,6 +2,8 @@ package com.clx.performance.service;
 
 
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
+import com.clx.performance.param.pc.payment.WalletResidueDTO;
 import com.msl.common.result.Result;
 
 public interface PaymentService {
@@ -9,4 +11,21 @@ public interface PaymentService {
     Result paymentWallet( PayParam noCheckPwd);
 
     Result paymentBreakContractWallet( PayParam noCheckPwd);
+
+    Result paymentPlatformFee(PayPlatformFeeParam param);
+
+    Result paymentChangePlatformFee(PayPlatformFeeParam param);
+
+    Result paymentCompletePlatformFee(PayPlatformFeeParam param);
+
+    Result paymentCancelPlatformFee(PayPlatformFeeParam param);
+
+    void  updateOrderPaymentFail(String orderNo,String msg,Integer operation, String paymentItem);
+
+    void  updateOrderPaymentSuccess(String orderNo,Integer operation, String paymentItem);
+    void  updateOrderPaymentSerialNoSuccess(String orderNo,String serialNo,Integer operation, String paymentItem);
+
+    WalletResidueDTO getWalletAndCard(Integer userCode);
+
+
 }

performance-web/src/main/java/com/clx/performance/service/PlatformServiceFeeConfigService.java

+package com.clx.performance.service;
+
+import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+
+
+/**
+ * @author yangqifa
+ */
+public interface PlatformServiceFeeConfigService {
+
+    CarrierPagePlatformServiceFeeConfigVO listPlatformServiceFeeConfig();
+
+    CarrierPagePlatformServiceFeeConfigVO getPlatformServiceFeeConfigDetail(int id);
+
+    void updatePlatformServiceFeeConfig(SavePlatformServiceFeeConfigParam config);
+
+    PlatformServiceFeeConfigFeignVO getConfig();
+}

performance-web/src/main/java/com/clx/performance/service/TempService.java

@@ -6,6 +6,6 @@ public interface TempService {
 
     void updateBreakContractDriverSettlementFinish(String settlementNo);
 
-    void  paymentTest(String fromUser,String toUser,String figure);
+    void  paymentTest(String fromUser,String toUser,String figure,int type);
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -3,12 +3,15 @@ package com.clx.performance.service.impl;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.InvoicingCompanyEnum;
 import com.clx.order.enums.OrderEnum;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
+import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderChildLoanComponent;
 import com.clx.performance.constant.RedisConstants;
@@ -18,10 +21,14 @@ import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.OrderChildExpectDTO;
 import com.clx.performance.dto.gd.GdRouteDTO;
+import com.clx.performance.dto.payment.PaymentDTO;
 import com.clx.performance.dto.payment.WalletResidueCardDTO;
 import com.clx.performance.dto.zjxl.TruckLocationDTO;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
 import com.clx.performance.enums.*;
+import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.extranal.order.InvoicingCompanyService;
+import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.extranal.user.*;
 import com.clx.performance.feign.FeignPaymentService;
 import com.clx.performance.model.*;
@@ -33,6 +40,7 @@ import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.*;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
@@ -47,6 +55,7 @@ import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -185,8 +194,15 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Autowired
     private TruckTraceService truckTraceService;
+    @Autowired
+    private PlatformServiceFeeConfigService platformServiceFeeConfigService;
+    @Autowired
+    private InvoicingCompanyService invoicingCompanyService;
+    @Autowired
+    private PaymentService paymentService;
 
-
+    @Autowired
+    private QuotationService quotationService;
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 
@@ -266,8 +282,10 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 司机接单限制
         driverTakeOrderLimit(driverTruckInfo.getUserNo());
 
-        //接单钱包限制
-        driverTakeOrderPaymentLimit(driverTruckInfo.getWalletCode(),driverTruckInfo.getTruckOwnWalletCode());
+        /**  判断当前用户是否为车主  true 车主 */
+        boolean truckOwnerFlag = Objects.equals(driverTruckInfo.getWalletCode(), driverTruckInfo.getTruckOwnWalletCode());
+        /** 冻结的钱包账户**/
+        Integer checkWalletCode = truckOwnerFlag ? driverTruckInfo.getWalletCode() : driverTruckInfo.getTruckOwnWalletCode();
 
         LocalDateTime now = LocalDateTime.now();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo()).orElseThrow(
@@ -277,6 +295,13 @@ public class OrderChildServiceImpl implements OrderChildService {
             log.warn("货单已暂停");
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_INVALID,"当前货单无效");
         }
+        //获取平台 接单保证金 和服务费率
+        BigDecimal deposit = BigDecimal.ZERO;
+        if(Objects.nonNull(orderGoods.getDeposit())){
+            deposit = orderGoods.getDeposit();//接单保证金
+        }
+        //接单钱包限制
+        driverTakeOrderPaymentLimit(driverTruckInfo.getWalletCode(),driverTruckInfo.getTruckOwnWalletCode(),deposit);
 
         // 状态验证
         if (!Objects.equals(orderGoods.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.PAYING.getCode()) &&
@@ -286,6 +311,21 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
+        /** 存在开票公司 **/
+        if (Objects.nonNull(orderInfo.getInvoicingCompanyId())
+                && orderInfo.getInvoicingCompanyId() > 0) {
+            InvoicingCompanyVO invoicingCompanyVO = invoicingCompanyService.
+                    getInvoicingCompany(orderInfo.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+            /** 是否支持车主接单,0:否,1:是,默认是
+             * 逻辑：如果结算方式是 卸车净重（减货损）,开票公司支持车主模式 , 那么都可以接单 如果不支持车主模式 ,只能车主接单**/
+            if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 1) &&
+                    Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+                if (!truckOwnerFlag) {
+                    throw new ServiceSystemException(PerformanceResultEnum.ORDER_DRIVER_LIMIT);
+                }
+            }
+        }
+
         OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(orderInfo.getOwnerUserNo());
 
 //        // 车型限制
@@ -418,6 +458,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
         orderChild.setReportFlag(orderInfo.getReportFlag());
 
+        // 平台服务费
+        orderChild.setPlatformServiceFeeRate(orderGoods.getPlatformServiceFeeRate());
+        orderChild.setPlatformServiceFee(orderGoods.getDeposit());
+        orderChild.setDeposit(orderGoods.getDeposit());
+
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);
 
@@ -434,7 +479,16 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 新增日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(),
                 OrderChildLogEnum.Type.CREATED.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-
+        // 冻结司机保证金
+        if(deposit.compareTo(BigDecimal.ZERO) ==1){
+            PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
+            payPlatformFeeParam.setTradeNo(childNo);
+            payPlatformFeeParam.setFrom(checkWalletCode);
+            payPlatformFeeParam.setFigure(orderGoods.getDeposit().intValue());
+            payPlatformFeeParam.setPwd(param.getPwd());
+            //冻结司机押金
+            paymentService.paymentPlatformFee(payPlatformFeeParam);
+        }
         // 司机接单后置逻辑
         orderChildPostService.orderChildAdd(orderChild.getChildNo());
 
@@ -746,18 +800,77 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         if (orderChild.getLoadTime() == null &&
                 Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())) {
+            //计算司机保证金
+            BigDecimal net = param.getLoadRough().subtract(param.getLoadTare());
+            PaymentDTO paymentDTO = getPaymentDTO(net, orderChild);
+            if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
+                    paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
+
             updateLoadFirst(param, orderChild, orderGoods);
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.LOAD.getCode(),
                     OrderChildLogEnum.Type.LOAD.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            //判断是否平衡冻结金额
+            if(Objects.nonNull(paymentDTO.getChangeDeposit()) &&
+                    paymentDTO.getChangeDeposit().compareTo(BigDecimal.ZERO) !=0){
+                paymentChangePlatformFee(childNo,paymentDTO.getChangeDeposit());
+            }
         } else {
+            //计算司机保证金
+            BigDecimal net =param.getLoadRough().subtract(param.getLoadTare());
+            PaymentDTO paymentDTO = getPaymentDTO(net, orderChild);
+            if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
+                    paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
+
             updateReload(param, orderChild, orderGoods);
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.RELOAD.getCode(),
                     OrderChildLogEnum.Type.RELOAD.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            //判断是否平衡冻结金额
+            if(Objects.nonNull(paymentDTO.getChangeDeposit()) &&
+                    paymentDTO.getChangeDeposit().compareTo(BigDecimal.ZERO) !=0){
+                paymentChangePlatformFee(childNo,paymentDTO.getChangeDeposit());
+            }
         }
     }
 
+    /***
+     * 获取最新的保证金金额和本次调增的金额
+     */
+    public PaymentDTO getPaymentDTO(BigDecimal net , OrderChild orderChild){
+        //计算司机保证金
+        BigDecimal freightPrice = orderChild.getFreightPrice();
+        BigDecimal deposit = orderChild.getDeposit();
+        BigDecimal platformServiceFeeRate = orderChild.getPlatformServiceFeeRate();
+        BigDecimal platformServiceFee = orderChild.getPlatformServiceFee(); //平台服务费
+        //本次调整金额
+        BigDecimal changeDeposit = BigDecimal.ZERO;
+        //本次调整金额
+        BigDecimal platformServiceFeeNew = BigDecimal.ZERO;
+        /**
+         * 如果之前未冻结保证金，本次不调整
+         * 如果 平台服务费率 为0 本次不处理
+         * 如果 本次吨数为 0 本次不处理
+         * 如果 本次调整金额为 0 本次不处理
+         * **/
+        if(Objects.nonNull(deposit) && deposit.compareTo(BigDecimal.ZERO) != 0 &&
+                Objects.nonNull(platformServiceFee) && platformServiceFee.compareTo(BigDecimal.ZERO) != 0 &&
+                Objects.nonNull(platformServiceFeeRate) && platformServiceFeeRate.compareTo(BigDecimal.ZERO) != 0 &&
+                Objects.nonNull(net) && net.compareTo(BigDecimal.ZERO) != 0
+        )
+        {
+            platformServiceFeeNew = net.multiply(freightPrice).setScale(2, RoundingMode.HALF_UP).multiply(platformServiceFeeRate).setScale(2, RoundingMode.HALF_UP);
+            changeDeposit = platformServiceFeeNew.subtract(platformServiceFee);
+
+        }
+        return   PaymentDTO.builder().changeDeposit(changeDeposit).platformServiceFeeNew(platformServiceFeeNew).build();
+    }
+
+
     private void updateLoadFirst(OrderChildLoadParam param, OrderChild orderChild, OrderGoods orderGoods) {
         String childNo = param.getChildNo();
         BigDecimal loadNet = param.getLoadRough().subtract(param.getLoadTare());
@@ -874,16 +987,38 @@ public class OrderChildServiceImpl implements OrderChildService {
 //            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
 //        }
 
+
         if (orderChild.getUnloadTime() == null &&
                 Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())) {
+            //计算司机保证金
+            BigDecimal net =  param.getUnloadRough().subtract(param.getUnloadTare());
+            PaymentDTO paymentDTO = getPaymentDTO(net, orderChild);
+            if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
+                    paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
             updateUnloadFirst(param, orderChild);
+
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.UNLOAD.getCode(),
                     OrderChildLogEnum.Type.UNLOAD.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
             orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(),
                     OrderChildPoundAuditEnum.Status.AUDIT.getMsg(), OrderChildLogEnum.CreateType.DRIVER.getCode(),
                     loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            //判断是否平衡冻结金额
+            if(Objects.nonNull(paymentDTO.getChangeDeposit()) &&
+                    paymentDTO.getChangeDeposit().compareTo(BigDecimal.ZERO) !=0){
+                paymentChangePlatformFee(childNo,paymentDTO.getChangeDeposit());
+            }
         } else {
+            //计算司机保证金
+            BigDecimal net =  param.getUnloadRough().subtract(param.getUnloadTare());
+            PaymentDTO paymentDTO = getPaymentDTO(net, orderChild);
+            if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
+                    paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
+                orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+            }
+
             updateReUnload(param, orderChild);
             // 日志
             orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.REUNLOAD.getCode(),
@@ -891,6 +1026,24 @@ public class OrderChildServiceImpl implements OrderChildService {
             orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(),
                     OrderChildPoundAuditEnum.Status.AUDIT.getMsg(), OrderChildLogEnum.CreateType.DRIVER.getCode(),
                     loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+            //判断是否平衡冻结金额
+            if(Objects.nonNull(paymentDTO.getChangeDeposit()) &&
+                    paymentDTO.getChangeDeposit().compareTo(BigDecimal.ZERO) !=0){
+                paymentChangePlatformFee(childNo,paymentDTO.getChangeDeposit());
+            }
+        }
+    }
+
+    /***
+     * 平衡司机冻结保证金
+     */
+    public void paymentChangePlatformFee(String childNo,BigDecimal changeDeposite){
+        if(changeDeposite.compareTo(BigDecimal.ZERO) ==1){
+            PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
+            payPlatformFeeParam.setTradeNo(childNo);
+            payPlatformFeeParam.setFigure(changeDeposite.intValue());
+            //冻结司机押金
+            paymentService.paymentChangePlatformFee(payPlatformFeeParam);
         }
     }
 
@@ -1107,6 +1260,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         audit.setLoadRough(orderChild.getLoadRough());
         audit.setLoadTare(orderChild.getLoadTare());
 
+        //计算司机保证金
+        BigDecimal net =param.getLoadRough().subtract(param.getLoadTare());
+        PaymentDTO paymentDTO = getPaymentDTO(net, orderChild);
+        if (Objects.nonNull(paymentDTO.getPlatformServiceFeeNew()) &&
+                paymentDTO.getPlatformServiceFeeNew().compareTo(BigDecimal.ZERO) != 0) {
+            orderChild.setPlatformServiceFee(paymentDTO.getPlatformServiceFeeNew());
+        }
         // 更新装车净重
         updateOrderGoodsAmountLoad(orderGoods, childNo,dif,OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
 
@@ -1125,6 +1285,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildPoundLogService.saveDriverOrderChildLog(childNo, OrderChildPoundAuditEnum.Status.AUDIT.getCode(),
                 OrderChildPoundAuditEnum.Status.AUDIT.getMsg(), OrderChildLogEnum.CreateType.DRIVER.getCode(),
                 loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+
+        //判断是否平衡冻结金额
+        if(Objects.nonNull(paymentDTO.getChangeDeposit()) &&
+                paymentDTO.getChangeDeposit().compareTo(BigDecimal.ZERO) !=0){
+            paymentChangePlatformFee(childNo,paymentDTO.getChangeDeposit());
+        }
     }
 
     @Override
@@ -1165,7 +1331,6 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
         orderChild.setConfirmTime(LocalDateTime.now());
-
         orderChildDao.updateDriverConfirm(orderChild);
 
         // 更新车辆状态
@@ -1450,7 +1615,20 @@ public class OrderChildServiceImpl implements OrderChildService {
             result.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
             result.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
         }
-
+        //获取订单配置的违约金方案
+        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
+                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if(Objects.isNull(quotationDetailVO.getLiquidatedDamagesPlanId())){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+        //货源详情页面 是否显示弹窗和显示平台服务费率
+        /**  订单结算方式为“卸车净重（减货损）”且平台运费报价为“未税”时 显示平台服务费率和弹窗提示司机平台服务费率**/
+        if (Objects.equals(orderGoods.getSettlementWay(),
+                SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
+                && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
+                InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
+            result.setGoodsOrderDetailShow(0);
+        }
         //查询进行中的运单车辆是否开启了中交兴路
         result.setNotOpenZJXLMsg(isOpenZJXL(orderChild.getStatus(),orderChild.getTruckNo()));
         return result;
@@ -1809,7 +1987,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     /**
      * 司机接单支付校验
      */
-    private void driverTakeOrderPaymentLimit(Integer driverWallCode, Integer truckWalletCode) {
+    private void driverTakeOrderPaymentLimit(Integer driverWallCode, Integer truckWalletCode,BigDecimal deposit) {
         //判断是司机还是车主 接单校验 必须两个都有钱包
         if (Objects.isNull(driverWallCode) || Objects.isNull(truckWalletCode)) {
             throw new ServiceSystemException(PerformanceResultEnum.WALLET_CODE_IS_NULL);
@@ -1825,6 +2003,15 @@ public class OrderChildServiceImpl implements OrderChildService {
                 String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
                 throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
             }
+            //判断余额是否能够缴纳保证金
+            if (data.getResidue() < deposit.longValue()) {
+                String remark = truckOwnerFlag ? "账户可用余额不足，接单保证金冻结失败，请尽快充值，本次需重置"+deposit.movePointLeft(2) +"元" : "车主钱包余额不足，保证金冻结失败请联系车主充值";
+              if(truckOwnerFlag){
+                  throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_OWNER_RESIDUE_ERROR, remark);
+              }else{
+                  throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_DRIVER_RESIDUE_ERROR, remark);
+              }
+            }
 
             //有效银行卡数量 不能为空
             if (Objects.isNull(data.getCardCount()) || data.getCardCount() <= 0) {

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -5,12 +5,14 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.InvoicingCompanyEnum;
 import com.clx.order.enums.UpdateEnum;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.component.OrderGoodsStatusLazyComponent;
@@ -19,6 +21,8 @@ import com.clx.performance.dao.*;
 import com.clx.performance.dto.OrderGoodsBindTruckNumDTO;
 import com.clx.performance.dto.OrderGoodsCancelDTO;
 import com.clx.performance.enums.*;
+import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.*;
 import com.clx.performance.param.app.AppGoodsOrderSearchParam;
@@ -39,6 +43,7 @@ import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.feign.UserClxFeign;
+import com.github.mustachejava.ObjectHandler;
 import com.msl.common.base.Optional;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
@@ -111,6 +116,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     private OrderChildPostService orderChildPostService;
     @Autowired
     private RabbitTemplate rabbitTemplate;
+    @Autowired
+    private  QuotationService quotationService;
 
     @Autowired
     private OrderGoodsFleetOpenTruckDao orderGoodsFleetOpenTruckDao;
@@ -154,6 +161,21 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsVO.setLoadBeginTime(orderInfoFeign.getLoadBeginTime());
         orderGoodsVO.setLoadEndTime(orderInfoFeign.getLoadEndTime());
         orderGoodsVO.setResidueTransportWeight(BigDecimal.ZERO.compareTo(orderGoodsVO.getResidueTransportWeight()) > 0 ? BigDecimal.ZERO : orderGoodsVO.getResidueTransportWeight());
+
+        //获取订单配置的违约金方案
+        OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        if(Objects.isNull(quotationDetailVO.getLiquidatedDamagesPlanId())){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+        //货源详情页面 是否显示弹窗和显示平台服务费率
+        /**  订单结算方式为“卸车净重（减货损）”且平台运费报价为“未税”时 显示平台服务费率和弹窗提示司机平台服务费率**/
+        if (Objects.equals(orderGoodsVO.getSettlementWay(),
+                SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())
+                && Objects.equals(quotationDetailVO.getPlatformFreightQuotationTaxType(),
+                InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
+            orderGoodsVO.setGoodsOrderDetailShow(0);
+        }
+
         return orderGoodsVO;
     }
 
@@ -923,6 +945,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         orderGoodsDao.batchUpdateResidueWeight(collect,BigDecimal.ZERO);
     }
 
+    @Override
+    public void updateFrightPrice(String orderNo, BigDecimal pendingOrderFreight) {
+        List<OrderGoods> list = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+        if (list.isEmpty()) {return;}
+        log.info("更新货单运费, orderNo:{}, pendingOrderFreight:{}", orderNo, pendingOrderFreight);
+        orderGoodsDao.updatePendingOrderFreightByIdList(pendingOrderFreight, list.stream().map(item->item.getId()).collect(Collectors.toList()));
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         orderGoodsCancelMap.put(1, this::cancelOperateOneTypeStrategy);

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -2,36 +2,49 @@ package com.clx.performance.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.clx.performance.config.MslPaymentConfig;
 import com.clx.performance.constant.ActionConstants;
 import com.clx.performance.dao.ThirdPartRequestLogDao;
+import com.clx.performance.dao.payment.OrderPaymentDao;
 import com.clx.performance.encryption.oldmsl.PayEncryptTools;
 import com.clx.performance.encryption.oldmsl.PrivateKeyConfig;
 import com.clx.performance.encryption.oldmsl.SystemCodeEnum;
-import com.clx.performance.enums.PayUnitTypeEnum;
-import com.clx.performance.enums.PerformanceResultEnum;
-import com.clx.performance.enums.ThirdRequestTypeEnum;
+import com.clx.performance.enums.*;
+import com.clx.performance.enums.payment.PayOperationStatusEnum;
+import com.clx.performance.enums.payment.PaymentActionEnum;
+import com.clx.performance.enums.payment.PaymentStatusEnum;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.model.ThirdPartRequestLog;
-import com.clx.performance.param.pc.payment.PayParam;
-import com.clx.performance.param.pc.payment.PayUnitDTO;
-import com.clx.performance.param.pc.payment.PayUserDTO;
+import com.clx.performance.model.payment.OrderPayment;
+import com.clx.performance.param.pc.payment.*;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.ThirdPartRequestLogService;
 import com.google.gson.Gson;
+import com.msl.common.base.Optional;
 import com.msl.common.dto.HttpDTO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.EncryptUtil;
 import com.msl.common.utils.HttpUtil;
+import com.msl.common.utils.LocalDateTimeUtils;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.security.GeneralSecurityException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.clx.performance.enums.HttpEnum.PERFORMANCE_PAY_CLX_PAYMENT;
 
@@ -48,6 +61,18 @@ public class PaymentServiceImpl implements PaymentService {
     /** 违约回调地址 **/
     public static final String NOTIFY_BROKER_URL = "/clx-performance/payment/notify/userPayBrokerContractNotify";
 
+    /** 司机平台押金冻结回调地址 **/
+    public static final String NOTIFY_PLATFORM_FEE_URL = "/clx-performance/payment/notify/userPayDriverFreezeNotify";
+
+    /** 司机平台押金冻结调整回调地址 **/
+    public static final String NOTIFY_ADJUST_PLATFORM_FEE_URL = "/clx-performance/payment/notify/userPayAdjustDriverFreezeNotify";
+
+    /** 司机平台押金冻结取消回调地址 **/
+    public static final String NOTIFY_CANCEL_PLATFORM_FEE_URL = "/clx-performance/payment/notify/userPayCancelDriverFreezeNotify";
+    /** 司机平台押金冻结完成回调地址 **/
+    public static final String NOTIFY_COMPLETE_PLATFORM_FEE_URL = "/clx-performance/payment/notify/userPayCompleteDriverFreezeNotify";
+
+
     @Autowired
     private final MslPaymentConfig mslPaymentConfig;
 
@@ -57,6 +82,12 @@ public class PaymentServiceImpl implements PaymentService {
     @Autowired
     ThirdPartRequestLogService thirdPartRequestLogService;
 
+    @Autowired
+    OrderPaymentDao orderPaymentDao;
+
+    @Autowired
+    UniqueOrderNumService uniqueOrderNumService;
+
     /**
      * 钱包直接划账给钱包
      *
@@ -102,7 +133,6 @@ public class PaymentServiceImpl implements PaymentService {
 
     /**
      * 钱包直接划账给钱包（违约）
-     *
      * @param payDTO
      * @return
      */
@@ -141,6 +171,240 @@ public class PaymentServiceImpl implements PaymentService {
         return notify;
     }
 
+    /**
+     * 创建支付流水记录
+     * @param orderPayment
+     */
+    public void saveOrderPayment( OrderPayment orderPayment){
+        orderPaymentDao.saveEntity(orderPayment);
+    }
+
+
+    /**
+     * 冻结司机平台押金
+     * @param
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result paymentPlatformFee(PayPlatformFeeParam payDTO) {
+        /** 创建记录 默认冻结 **/
+        OrderPayment orderPayment = new OrderPayment()
+                .setAmount(payDTO.getFigure())
+                .setOrderNo(payDTO.getTradeNo())
+                .setRelationNo(payOrderNoGenerate())
+                .setPaymentItem(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "")
+                .setStatus(PaymentStatusEnum.CREATE.getValue())
+                .setOperation(PayOperationStatusEnum.FREEZE.getValue());
+        saveOrderPayment(orderPayment);
+
+        /** 构建司机冻结单元  **/
+        PayUserDTO payUserDTO = buildDriverFreezeBatchDTO(payDTO, orderPayment);
+
+        log.info("发起司机押金冻结支付请求日志 {}", payUserDTO);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()
+                + HttpEnum.PERFORMANCE_PAY_CLX_DRIVER_FREEZE.getUrl(), JSON.toJSONString(payUserDTO));
+        log.info("支付司机押金冻结支付请求 返回日志 {}", notify);
+
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
+        }
+        return notify;
+    }
+
+    /**
+     * 调整司机平台押金
+     * @param
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result paymentChangePlatformFee(PayPlatformFeeParam param) {
+         //查询冻结记录
+        OrderPayment orderPaymentOptional =
+                orderPaymentDao.selectByOrderNoAndItemIdAndOperation(param.getTradeNo(),
+                PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "",
+                        PayOperationStatusEnum.FREEZE.getValue()).orNull();
+        if (null == orderPaymentOptional){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
+        }
+        /** 创建记录 新的调整记录 **/
+        OrderPayment orderPayment = new OrderPayment()
+                .setAmount(param.getFigure())
+                .setOrderNo(param.getTradeNo())
+                .setRelationNo(payOrderNoGenerate())
+                .setSerialNo(orderPaymentOptional.getSerialNo())
+                .setPaymentItem(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "")
+                .setStatus(PaymentStatusEnum.CREATE.getValue())
+                .setOperation(PayOperationStatusEnum.ADJUSTMENT.getValue());
+        saveOrderPayment(orderPayment);
+
+        /**  调整冻结记录  **/
+        FreezeBatchDTO freezeBatchDTO = buildChangeFreezeBatchDTO(orderPaymentOptional,orderPayment.getRelationNo() ,param.getFigure());
+
+        log.info("发起支付请求日志 {}", freezeBatchDTO);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost() +
+                HttpEnum.PERFORMANCE_PAY_CLX_ADJUST_DRIVER_FREEZE.getUrl(), JSON.toJSONString(freezeBatchDTO));
+        log.info("支付返回日志 {}", notify);
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
+        }
+        return notify;
+    }
+
+    @Override
+    public Result paymentCompletePlatformFee(PayPlatformFeeParam param) {
+        List<OrderPayment> orderPaymentList = checkOrderPaymentExit(param);
+        //如果没有冻结记录
+        List<OrderPayment> orderPaymentFreezeList = orderPaymentList.stream()
+                .filter(i -> i.getOperation().equals(PayOperationStatusEnum.FREEZE.getValue()))
+                .filter(i -> i.getStatus().equals(PaymentStatusEnum.SUCCESS.getValue()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(orderPaymentFreezeList)){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
+        }
+        //冻结记录是否已经处理
+        List<OrderPayment> orderPaymentUnFreezeList = orderPaymentList.stream()
+                .filter(i -> i.getOperation().equals(PayOperationStatusEnum.UNFREEZE.getValue()))
+                .filter(i -> i.getStatus().equals(PaymentStatusEnum.SUCCESS.getValue()))
+                .collect(Collectors.toList());
+
+        if (CollectionUtils.isNotEmpty(orderPaymentUnFreezeList)){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"冻结记录已处理") ;
+        }
+        OrderPayment orderPaymentOptional = orderPaymentFreezeList.get(0);
+        /** 创建记录 新的调整记录 **/
+        OrderPayment orderPayment = new OrderPayment()
+                .setAmount(param.getFigure())
+                .setOrderNo(param.getTradeNo())
+                .setRelationNo(orderPaymentOptional.getRelationNo())
+                .setSerialNo(orderPaymentOptional.getSerialNo())
+                .setPaymentItem(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "")
+                .setStatus(PaymentStatusEnum.CREATE.getValue())
+                .setOperation(PayOperationStatusEnum.UNFREEZE.getValue());
+        saveOrderPayment(orderPayment);
+
+        /**  调整冻结记录  **/
+        FreezeBatchDTO freezeBatchDTO = buildCompleteFreezeBatchDTO(orderPaymentOptional,
+                orderPayment.getRelationNo());
+
+        log.info("发起支付请求日志 {}", freezeBatchDTO);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost() +
+                HttpEnum.PERFORMANCE_PAY_CLX_ADJUST_DRIVER_FREEZE.getUrl(), JSON.toJSONString(freezeBatchDTO));
+        log.info("支付返回日志 {}", notify);
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
+        }
+        return notify;
+    }
+
+    public List<OrderPayment> checkOrderPaymentExit(PayPlatformFeeParam param){
+        //查询冻结记录
+        List<OrderPayment> orderPaymentList= orderPaymentDao.listByOrderNo(param.getTradeNo(),
+                PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "");
+        if (CollectionUtils.isEmpty(orderPaymentList)){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
+        }
+        return orderPaymentList;
+    }
+
+    @Override
+    public Result paymentCancelPlatformFee(PayPlatformFeeParam param) {
+        List<OrderPayment> orderPaymentList = checkOrderPaymentExit(param);
+        //如果没有冻结记录
+        List<OrderPayment> orderPaymentFreezeList = orderPaymentList.stream()
+                .filter(i -> i.getOperation().equals(PayOperationStatusEnum.FREEZE.getValue()))
+                .filter(i -> i.getStatus().equals(PaymentStatusEnum.SUCCESS.getValue()))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(orderPaymentFreezeList)){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
+        }
+        //冻结记录是否已经处理
+        List<OrderPayment> orderPaymentUnFreezeList = orderPaymentList.stream()
+                .filter(i -> i.getOperation().equals(PayOperationStatusEnum.UNFREEZE.getValue()))
+                .filter(i -> i.getStatus().equals(PaymentStatusEnum.SUCCESS.getValue()))
+                .collect(Collectors.toList());
+
+        if (CollectionUtils.isNotEmpty(orderPaymentUnFreezeList)){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"冻结记录已处理") ;
+        }
+        OrderPayment orderPaymentOptional = orderPaymentFreezeList.get(0);
+        /** 创建记录 新的调整记录 **/
+        OrderPayment orderPayment = new OrderPayment()
+                .setAmount(param.getFigure())
+                .setOrderNo(param.getTradeNo())
+                .setRelationNo(orderPaymentOptional.getRelationNo())
+                .setSerialNo(orderPaymentOptional.getSerialNo())
+                .setPaymentItem(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "")
+                .setStatus(PaymentStatusEnum.CREATE.getValue())
+                .setOperation(PayOperationStatusEnum.UNFREEZE.getValue());
+        saveOrderPayment(orderPayment);
+
+        /**  调整冻结记录  **/
+        FreezeBatchDTO freezeBatchDTO = buildCanCelFreezeBatchDTO(orderPaymentOptional,
+                orderPayment.getRelationNo());
+
+        log.info("发起支付请求日志 {}", freezeBatchDTO);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost() +
+                HttpEnum.PERFORMANCE_PAY_CLX_ADJUST_DRIVER_FREEZE.getUrl(), JSON.toJSONString(freezeBatchDTO));
+        log.info("支付返回日志 {}", notify);
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
+        }
+        return notify;
+    }
+
+    @Override
+    public void updateOrderPaymentFail(String orderNo, String msg,Integer operation, String paymentItem) {
+        //查询冻结记录
+        OrderPayment orderPaymentOptional =
+                orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
+        if (null == orderPaymentOptional){
+            log.error("数据不存在 {}, {}" ,orderNo,msg);
+        }
+        orderPaymentOptional.setStatus(PaymentStatusEnum.FAIL.getValue());
+        orderPaymentOptional.setReason(msg);
+        orderPaymentDao.updateEntityByKey(orderPaymentOptional);
+    }
+
+    @Override
+    public void updateOrderPaymentSuccess(String orderNo,Integer operation, String paymentItem) {
+        //查询冻结记录
+        OrderPayment orderPaymentOptional =
+                orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
+        if (null == orderPaymentOptional){
+            log.error("数据不存在 {}, {}" ,orderNo);
+        }
+        orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
+        orderPaymentDao.updateEntityByKey(orderPaymentOptional);
+    }
+
+    @Override
+    public void updateOrderPaymentSerialNoSuccess(String orderNo, String serialNo, Integer operation, String paymentItem) {
+        OrderPayment orderPaymentOptional =
+                orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
+        if (null == orderPaymentOptional){
+            log.error("数据不存在 {}, {}" ,orderNo);
+        }
+        orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
+        orderPaymentOptional.setSerialNo(serialNo);
+        orderPaymentDao.updateEntityByKey(orderPaymentOptional);
+    }
+
+
+
 
     /**
      * post请求
@@ -187,7 +451,150 @@ public class PaymentServiceImpl implements PaymentService {
     }
 
 
+    /**
+     * 创建支付流水号
+     */
+    private String payOrderNoGenerate() {
+        return "5" + uniqueOrderNumService.getUniqueOrderNum(
+                LocalDateTimeUtils.convertLocalDateTimeToString(LocalDateTime.now(), LocalDateTimeUtils.DATE_DAY));
+    }
 
 
+    /**
+     * 构建司机冻结押金支付单元
+     * @param payDTO
+     * @param orderPayment
+     * @return
+     */
+    public PayUserDTO   buildDriverFreezeBatchDTO(PayPlatformFeeParam payDTO,OrderPayment orderPayment){
+        /** 构建支付单元 **/
+        PayUnitDTO payUnitDTO = PayUnitDTO.builder()
+                .id(orderPayment.getRelationNo())
+                .from(payDTO.getFrom())
+                .to(mslPaymentConfig.getSystemWalletCode())
+                .figure(payDTO.getFigure())
+                .type(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode())
+                .timestamp(System.currentTimeMillis() / 1000)
+                .remark(PayRemarkEnum.toString(PayRemarkEnum.DRIVER_CREDIT.getValue())).build();
+        /** 生成签名**/
+        PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
+        /** 构建支付支付 ***/
+        PayUserDTO payUserDTO = PayUserDTO.builder()
+                .pwd(payDTO.getPwd())
+                .system(SystemCodeEnum.PERFORMANCE_SERVICE.getCode())
+                .userCode(payDTO.getFrom())
+                .orderNo(orderPayment.getRelationNo())
+                .uuid(UUID.randomUUID().toString().replaceAll("-", ""))
+                .notifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_PLATFORM_FEE_URL)
+                .payUnitDTO(payUnitDTO).build();
+        return payUserDTO;
+    }
+    /**
+     * 构建 司机平台服务费冻结实体
+     */
+    public FreezeBatchDTO buildChangeFreezeBatchDTO(OrderPayment orderPaymentOptional,String orderNo,Integer figure){
+        FreezeBatchDTO freezeBatchDTO = new FreezeBatchDTO();
+        List<FreezeUnitDTO> FreezeUnitList = new ArrayList<FreezeUnitDTO>();
+        FreezeUnitDTO freightPayUnitDTO = new FreezeUnitDTO();
+        /** 操作类型 1撤销 2完成 3修改*/
+        freightPayUnitDTO.setAction(PaymentActionEnum.Type.ADJUST.getCode());
+        /** 赔偿金额(单位分)0全部返回 */
+        freightPayUnitDTO.setFigure(Long.valueOf(figure));
+        /** 冻结序列号 （流水号）*/
+        freightPayUnitDTO.setFreezeNo(orderPaymentOptional.getSerialNo());
+        freightPayUnitDTO.setRemark(PayRemarkEnum.toString(PayRemarkEnum.UPDATE_DRIVER_FREEZE.getValue()));
+        freightPayUnitDTO.setTimestamp(System.currentTimeMillis() / 1000);
+        PayEncryptTools.sign(freightPayUnitDTO, PrivateKeyConfig.privateKeyByte);
+        FreezeUnitList.add(freightPayUnitDTO);
+
+        freezeBatchDTO.setFreezeUnitList(FreezeUnitList);
+        freezeBatchDTO.setOrderNo(orderNo);
+        freezeBatchDTO.setSystem(SystemCodeEnum.PERFORMANCE_SERVICE.getCode());
+        //回调地址
+        freezeBatchDTO.setNotifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_ADJUST_PLATFORM_FEE_URL);
+        freezeBatchDTO.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
+        log.info("平衡司机冻结保证金支付调去参数==" + freezeBatchDTO.toString());
+        return freezeBatchDTO;
+    }
+
+    /**
+     * 构建 司机平台服务费取消实体
+     */
+    public FreezeBatchDTO buildCanCelFreezeBatchDTO(OrderPayment orderPaymentOptional,String orderNo){
+        FreezeBatchDTO freezeBatchDTO = new FreezeBatchDTO();
+        List<FreezeUnitDTO> FreezeUnitList = new ArrayList<FreezeUnitDTO>();
+
+        FreezeUnitDTO payUnitDTO = new FreezeUnitDTO();
+        /** 操作类型 1撤销 2完成 3修改*/
+        payUnitDTO.setAction(PaymentActionEnum.Type.CANCEL.getCode());
+        /** 赔偿金额(单位分)0全部返回 */
+        payUnitDTO.setFigure(0L);
+        /** 冻结序列号 （流水号）*/
+        payUnitDTO.setFreezeNo(orderPaymentOptional.getSerialNo());
+        payUnitDTO.setFee(0L);
+        payUnitDTO.setRemark(PayRemarkEnum.toString(PayRemarkEnum.DRIVER_UNFREEZE.getValue()));
+        payUnitDTO.setTimestamp(System.currentTimeMillis() / 1000);
+        PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
+        FreezeUnitList.add(payUnitDTO);
+        freezeBatchDTO.setFreezeUnitList(FreezeUnitList);
+        freezeBatchDTO.setOrderNo(orderNo);
+        freezeBatchDTO.setSystem(SystemCodeEnum.PERFORMANCE_SERVICE.getCode());
+        //回调地址
+        freezeBatchDTO.setNotifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_CANCEL_PLATFORM_FEE_URL);
+        freezeBatchDTO.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
+        log.info("运单取消 退还司机保证金 ==" + freezeBatchDTO.toString());
+        return freezeBatchDTO;
+    }
 
+
+    /**
+     * 构建 司机平台服务费完成实体
+     */
+    public FreezeBatchDTO buildCompleteFreezeBatchDTO(OrderPayment orderPaymentOptional,String String){
+        FreezeBatchDTO freezeBatchDTO = new FreezeBatchDTO();
+        List<FreezeUnitDTO> FreezeUnitList = new ArrayList<FreezeUnitDTO>();
+
+        FreezeUnitDTO payUnitDTO = new FreezeUnitDTO();
+        /** 操作类型 1撤销 2完成 3修改*/
+        payUnitDTO.setAction(PaymentActionEnum.Type.COMPLETE.getCode());
+        /** 赔偿金额(单位分)0全部返回 */
+        payUnitDTO.setFigure(0L);
+        /** 冻结序列号 （流水号）*/
+        payUnitDTO.setFreezeNo(orderPaymentOptional.getSerialNo());
+        payUnitDTO.setFee(0L);
+        payUnitDTO.setRemark(PayRemarkEnum.toString(PayRemarkEnum.DRIVER_UNFREEZE.getValue()));
+        payUnitDTO.setTimestamp(System.currentTimeMillis() / 1000);
+        PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
+        FreezeUnitList.add(payUnitDTO);
+        freezeBatchDTO.setFreezeUnitList(FreezeUnitList);
+        freezeBatchDTO.setOrderNo(orderPaymentOptional.getRelationNo());
+        freezeBatchDTO.setSystem(SystemCodeEnum.PERFORMANCE_SERVICE.getCode());
+        //回调地址
+        freezeBatchDTO.setNotifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_COMPLETE_PLATFORM_FEE_URL);
+        freezeBatchDTO.setUuid(UUID.randomUUID().toString().replaceAll("-", ""));
+        log.info("运单 完成 支付 司机保证金 ==" + freezeBatchDTO.toString());
+        return freezeBatchDTO;
+    }
+
+    /***
+     * 获取用户的钱包
+     * @param userCode
+     * @return
+     */
+    @Override
+    public WalletResidueDTO getWalletAndCard(Integer userCode) {
+        WalletParam walletParam = new WalletParam();
+        walletParam.setUserCode(userCode);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()
+                + HttpEnum.PERFORMANCE_PAY_CLX_WALLET.getUrl(), JSON.toJSONString(walletParam));
+        log.info("获取司机钱包 {} 返回日志 {}",userCode, notify);
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
+        }
+
+        return JSON.parseObject(notify.getData().toString(), WalletResidueDTO.class);
+    }
 }

performance-web/src/main/java/com/clx/performance/service/impl/PlatformServiceFeeConfigServiceImpl.java

+package com.clx.performance.service.impl;
+
+import com.clx.performance.dao.PlatformServiceFeeConfigDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.clx.performance.param.pc.carrier.SavePlatformServiceFeeConfigParam;
+import com.clx.performance.service.PlatformServiceFeeConfigService;
+import com.clx.performance.struct.PlatformServiceFeeConfigStruct;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author yangqifa
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class PlatformServiceFeeConfigServiceImpl implements PlatformServiceFeeConfigService {
+
+    private final PlatformServiceFeeConfigDao platformServiceFeeConfigDao;
+
+    private final PlatformServiceFeeConfigStruct platformServiceFeeConfigStruct;
+
+    @Override
+    public CarrierPagePlatformServiceFeeConfigVO listPlatformServiceFeeConfig() {
+        PlatformServiceFeeConfig config = platformServiceFeeConfigDao.listPlatformServiceFeeConfig();
+        return platformServiceFeeConfigStruct.convertToDetail(config);
+    }
+
+    @Override
+    public CarrierPagePlatformServiceFeeConfigVO getPlatformServiceFeeConfigDetail(int id) {
+        PlatformServiceFeeConfig config = platformServiceFeeConfigDao.getEntityByKey(id).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        return platformServiceFeeConfigStruct.convertToDetail(config);
+    }
+
+    @Override
+    public void updatePlatformServiceFeeConfig(SavePlatformServiceFeeConfigParam param) {
+        PlatformServiceFeeConfig config = new PlatformServiceFeeConfig();
+        config.setId(param.getId());
+        config.setOrderQuotationType(param.getOrderQuotationType());
+        config.setDeposit(param.getDeposit());
+        config.setServiceFeeRate(param.getServiceFeeRate());
+        platformServiceFeeConfigDao.updatePlatformServiceFeeConfig(config);
+    }
+
+    @Override
+    public PlatformServiceFeeConfigFeignVO getConfig() {
+        return platformServiceFeeConfigStruct
+                .convertPlatformServiceFeeConfigFeignVO(platformServiceFeeConfigDao.listPlatformServiceFeeConfig());
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/TempServiceImpl.java

@@ -5,14 +5,17 @@ import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.enums.PayRemarkEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.settle.SettlementService;
+import com.msl.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
 import java.util.UUID;
 
 @Slf4j
@@ -40,19 +43,38 @@ public class TempServiceImpl implements TempService {
     }
 
     @Override
-    public void paymentTest(String fromUser, String toUser, String figure) {
-        PayParam noCheckPwd = PayParam.builder().from(
-                Integer.valueOf(fromUser))
-                .to(Integer.valueOf(toUser))
-                .figure(Integer.valueOf(figure))
-                .tradeNo(UUID.randomUUID().toString().replaceAll("-", ""))
-                .tradeId("12345")
-                .pwd("noCheckPwd")
-                .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
-                .build();
-
-
-        paymentService.paymentWallet(noCheckPwd);
+    public void paymentTest(String fromUser, String pwd, String tradeNo,int type) {
+//        PayParam noCheckPwd = PayParam.builder().from(
+//                Integer.valueOf(fromUser))
+//                .to(Integer.valueOf(toUser))
+//                .figure(Integer.valueOf(figure))
+//                .tradeNo(UUID.randomUUID().toString().replaceAll("-", ""))
+//                .tradeId("12345")
+//                .pwd("noCheckPwd")
+//                .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+//                .build();
+//
+//
+//        paymentService.paymentWallet(noCheckPwd);
+
+        PayPlatformFeeParam payPlatformFeeParam  =  new PayPlatformFeeParam();
+        payPlatformFeeParam.setFigure(678);
+        payPlatformFeeParam.setFrom(Integer.valueOf(fromUser));
+        payPlatformFeeParam.setPwd(pwd);
+        payPlatformFeeParam.setTradeNo(tradeNo);
+
+        if(Objects.equals(type,1)){
+            paymentService.paymentPlatformFee(payPlatformFeeParam);
+        }
+        if(Objects.equals(type,2)){
+            paymentService.paymentChangePlatformFee(payPlatformFeeParam);
+        }
+        if(Objects.equals(type,3)){
+            paymentService.paymentCompletePlatformFee(payPlatformFeeParam);
+        }
+        if(Objects.equals(type,4)){
+            paymentService.paymentCancelPlatformFee(payPlatformFeeParam);
+        }
     }
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/ordergoods/OrderGoodsPostServiceImpl.java

+package com.clx.performance.service.impl.ordergoods;
+
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.service.ordergoods.OrderGoodsPostService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class OrderGoodsPostServiceImpl implements OrderGoodsPostService {
+    @Override
+    public void orderGoodsAdd(OrderGoods orderGoods) {
+
+    }
+
+    @Override
+    public void orderGoodsAdd(List<OrderGoods> orderGoodsList) {
+
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/settle/OrderChildSyncTransportRecordServiceImpl.java

 package com.clx.performance.service.impl.settle;
 
 
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.settle.NetworkCaseOutRecordDao;
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.dto.PayStatusNotifyDTO;
 import com.clx.performance.enums.NetworkDriverAccountEnum;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
+import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementDriverService;
 import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
+import com.msl.common.result.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
 
 /**
  * @author kavin
@@ -36,6 +46,9 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
 
     private final SettlementDriverDetailService settlementDriverDetailService;
 
+    private final OrderChildDao orderChildDao;
+
+    private final  PaymentService paymentService;
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
@@ -44,6 +57,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         orderChildSyncTransportRecordDao.saveEntity(record);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateStatus(PayStatusNotifyDTO payStatusNotifyDTO) {
         String childNo = payStatusNotifyDTO.getChildNo();
@@ -54,5 +68,21 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         );
         SettlementDriverDetail driverDetail = settlementDriverDetailService.selectOneByChildNo(childNo);
         networkDriverRunningWaterRecordService.generateCaseOutSuccessRunningWaterRecord(driverDetail);
+
+        try{
+            //支付平台服务费
+            OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+            if (Objects.nonNull(orderChild.getPlatformServiceFee()) &&
+                    !Objects.equals(orderChild.getPlatformServiceFee().intValue(), 0)) {
+                PayPlatformFeeParam payPlatformFeeParam = PayPlatformFeeParam.builder()
+                        .figure(orderChild.getPlatformServiceFee().intValue())
+                        .tradeNo(childNo)
+                        .build();
+                Result result = paymentService.paymentCompletePlatformFee(payPlatformFeeParam);
+                log.info("运单完成 第三方回调 {}  ,{} " ,childNo,result);
+            }
+        }catch (Exception e){
+            log.error("支付平台服务费异常 {}",e);
+        }
     }
 }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverDetailServiceImpl.java

@@ -63,6 +63,19 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         // 结算金额
         settlementDriverDetail.setSettlementFreight(settlementFreightCalc(settlementDriverDetail.getFreight(), settlementDriverDetail.getLossFreight()));
 
+        settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+        settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+        settlementDriverDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
+        // 平台服务费： 司机结算金额*平台服务费费率
+        settlementDriverDetail.setPlatformServiceFeeRate(orderChild.getPlatformServiceFeeRate()==null
+                ? BigDecimal.ZERO
+                : orderChild.getPlatformServiceFeeRate());
+        settlementDriverDetail.setPlatformServiceFee(
+                settlementDriverDetail.getSettlementFreight()
+                        .multiply(settlementDriverDetail.getPlatformServiceFeeRate()
+                                .setScale(0, RoundingMode.HALF_UP)));
+
         settlementDriverDetailDao.saveEntity(settlementDriverDetail);
 
         return settlementDriverDetail.getId();

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -6,10 +6,7 @@ import com.clx.performance.config.MslPaymentConfig;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.dao.settle.SettlementDriverDao;
-import com.clx.performance.dao.settle.SettlementDriverDetailDao;
-import com.clx.performance.dao.settle.SettlementOwnerDao;
-import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dao.settle.*;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PayRemarkEnum;
@@ -20,11 +17,9 @@ import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.model.settle.SettlementDriver;
-import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.model.settle.SettlementOwner;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.model.settle.*;
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
@@ -94,6 +89,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildDao orderChildDao;
 
+    @Autowired
+    private SettlementPlatformServiceFeeDao settlementPlatformServiceFeeDao;
+
     @Autowired
     private OrderChildLogService orderChildLogService;
 
@@ -131,24 +129,46 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         if (Objects.equals(orderGoods.getSettlementAccountPeriod(),2)){  //月结
             log.info("月结初始化货主结算单");
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getBeginMonthDate();
-            settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(), settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
+            settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
+                    settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 月结初始化
-                settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime,ownerInfo);
+                settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime,
+                        SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode(), ownerInfo);
             }
             else {  // 月结更新
                 settlementPeriodMonthUpdate(settlementOwner, settlementOwnerDetail);
                 settlementNo = settlementOwner.getSettlementNo();
             }
         }
+        else if (Objects.equals(orderGoods.getSettlementAccountPeriod(),
+                SettlementOwnerEnum.SettlementPeriodType.DAILY.getCode())){  //日结
+            log.info("日结初始化货主结算单");
+            LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getDayStart();
+            settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodDaily(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
+                    settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
+            if (settlementOwner == null){   // 日结初始化
+                settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime,
+                        SettlementOwnerEnum.SettlementPeriodType.DAILY.getCode(), ownerInfo);
+            }
+            else {  // 日结更新
+                settlementPeriodMonthUpdate(settlementOwner, settlementOwnerDetail);
+                settlementNo = settlementOwner.getSettlementNo();
+            }
+        }
         else {
             log.info("拉运完成结初始化货主结算单");
 
-            settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(), settlementOwnerDetail.getInvoiceType()).orNull();
+            settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(),
+                    settlementOwnerDetail.getInvoicingCompanyId(),
+                    settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 拉运完成初始化
-                settlementNo = settlementPeriodImmediateInit(settlementOwnerDetail,ownerInfo);
+                settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, null,
+                        SettlementOwnerEnum.SettlementPeriodType.IMMEDIATE.getCode(),ownerInfo);
             }
             else {  // 拉运完成更新
-                settlementPeriodImmediateUpdate(settlementOwner, settlementOwnerDetail);
+                settlementPeriodMonthUpdate(settlementOwner, settlementOwnerDetail);
                 settlementNo = settlementOwner.getSettlementNo();
             }
         }
@@ -178,8 +198,30 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Transactional(rollbackFor = Exception.class)
     public void settlementDetailAdd(SettlementDetailAddMqParam mq) {
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getEntityByKey(mq.getSettlementOwnerDetailId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        //SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getEntityByKey(mq.getSettlementDriverDetailId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getEntityByKey(mq.getSettlementDriverDetailId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        OrderChild orderChild = orderChildDao.getByChildNo(settlementDriverDetail.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        SettlementPlatformServiceFee settlementPlatformServiceFee = new SettlementPlatformServiceFee();
+        settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo());
+        settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
+        settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName());
+        settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId());
+        settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress());
+        settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId());
+        settlementPlatformServiceFee.setReceiveAddress(orderChild.getReceiveAddress());
+        settlementPlatformServiceFee.setTruckNo(orderChild.getTruckNo());
+        settlementPlatformServiceFee.setSettlementFreight(settlementDriverDetail.getSettlementFreight());
+        settlementPlatformServiceFee.setInvoiceServiceFeeRate(settlementDriverDetail.getPlatformServiceFeeRate());
+        settlementPlatformServiceFee.setInvoiceServiceFee(settlementDriverDetail.getPlatformServiceFee());
+
+        // 平台服务费
+        orderChild.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
+
+        orderChildDao.updatePlatformServiceFee(orderChild);
+        settlementPlatformServiceFeeDao.saveEntity(settlementPlatformServiceFee);
+
+        // 更新网络标识
         settlementService.updateSettlementDetailInvoiceType(settlementOwnerDetail.getChildNo(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
     }
 
@@ -275,7 +317,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                         .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
                         .build();
             }
-
+            //支付司机运费
             Result result = null;
             String msg  = null;
             try{
@@ -284,6 +326,20 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementDriverNotify(detail.getChildNo(),0,e.getMessage());
                 msg = e.getMessage();
             }
+            //支付平台服务费
+            try{
+                OrderChild orderChild = orderChildDao.getByChildNo(detail.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+                if (Objects.nonNull(orderChild.getPlatformServiceFee()) &&
+                        !Objects.equals(orderChild.getPlatformServiceFee().intValue(), 0)) {
+                    PayPlatformFeeParam payPlatformFeeParam = PayPlatformFeeParam.builder()
+                            .figure(orderChild.getPlatformServiceFee().intValue())
+                            .tradeNo(detail.getChildNo())
+                            .build();
+                    result = paymentService.paymentCompletePlatformFee(payPlatformFeeParam);
+                }
+            }catch (Exception e){
+                log.error("支付平台服务费异常 {}",e);
+            }
             if(Objects.nonNull(result)){
                 settlementDriverNotify(detail.getChildNo(),0,result.getMsg());
             }
@@ -299,10 +355,14 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 月结初始化
      */
-    private String settlementPeriodMonthInit(SettlementOwnerDetail settlementOwnerDetail, LocalDateTime settlementPeriodTime,OwnerInfoFeignVO ownerInfo){
+    private String settlementPeriodMonthInit(SettlementOwnerDetail settlementOwnerDetail,
+                                             LocalDateTime settlementPeriodTime,
+                                             Integer settlementPeriodType,
+                                             OwnerInfoFeignVO ownerInfo){
 
 
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo())
+                .orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
         //获取所有detail
 
@@ -315,7 +375,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setOwnerName(settlementOwnerDetail.getOwnerName());
         settlementOwner.setOrderNo(settlementOwnerDetail.getOrderNo());
 
-        settlementOwner.setSettlementPeriodType(SettlementOwnerEnum.SettlementPeriodType.MONTH.getCode());
+        settlementOwner.setSettlementPeriodType(settlementPeriodType);
         settlementOwner.setSettlementPeriodTime(settlementPeriodTime);
 
         settlementOwner.setWeight(settlementOwnerDetail.getWeight());
@@ -344,10 +404,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setCompanyContactAddress(ownerInfo.getContactsAddress());
         settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
         //设置开票公司
-        settlementOwner.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
-        settlementOwner.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
-        settlementOwner.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
+        settlementOwner.setInvoicingCompanyId(settlementOwnerDetail.getInvoicingCompanyId());
+        settlementOwner.setInvoicingCompanyShorterName(settlementOwnerDetail.getInvoicingCompanyShorterName());
+        settlementOwner.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
         settlementOwner.setReportFlag(orderInfo.getReportFlag());
+        // 开票服务费
+        settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());
         settlementOwnerDao.saveEntity(settlementOwner);
 
         //保存结算单日志----创建结算单
@@ -371,6 +433,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
         settlementOwner.setLoanFreight(settlementOwnerDetail.getLoanFreight());
         settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
+        settlementOwner.setInvoiceServiceFee(settlementOwnerDetail.getInvoiceServiceFee());
 
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
 
@@ -383,103 +446,17 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwner.setPrepayFreight(settlementOwner.getPrepayFreight().add(item.getPrepayFreight()));
             settlementOwner.setSettlementFreight(settlementOwner.getSettlementFreight().add(item.getSettlementFreight()));
             settlementOwner.setInvoiceFreight(settlementOwner.getInvoiceFreight().add(item.getInvoiceFreight()));
+            settlementOwner.setInvoiceServiceFee(settlementOwner.getInvoiceServiceFee().add(item.getInvoiceServiceFee()));
         });
 
         settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
     }
 
-    /**
-     * 拉运完成结 初始化
-     */
-    private String settlementPeriodImmediateInit(SettlementOwnerDetail settlementOwnerDetail,OwnerInfoFeignVO ownerInfo){
-
-        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
-
-        SettlementOwner settlementOwner = new SettlementOwner();
-
-        String settlementNo = settlementNoGenerate();
-
-        settlementOwner.setSettlementNo(settlementNo);
-        settlementOwner.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
-        settlementOwner.setOwnerName(settlementOwnerDetail.getOwnerName());
-        settlementOwner.setOrderNo(settlementOwnerDetail.getOrderNo());
-
-        settlementOwner.setSettlementPeriodType(SettlementOwnerEnum.SettlementPeriodType.IMMEDIATE.getCode());
-
-        settlementOwner.setWeight(settlementOwnerDetail.getWeight());
-        settlementOwner.setFreight(settlementOwnerDetail.getFreight());
-        settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
-        settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
-        settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
-        settlementOwner.setLoanFreight(settlementOwnerDetail.getLoanFreight());
-
-        settlementOwner.setInvoiceType(settlementOwnerDetail.getInvoiceType());
-        settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
-
-        settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
-        settlementOwner.setStatus(SettlementOwnerEnum.Status.TO_BE_LOCKED.getCode());
-
-        settlementOwner.setCompanyName(ownerInfo.getCompanyName());
-        settlementOwner.setCompanyTaxCode(ownerInfo.getCompanyTaxCode());
-        settlementOwner.setCompanyAddress(ownerInfo.getCompanyAddress());
-        settlementOwner.setCompanyMobile(ownerInfo.getCompanyTelephone());
-        settlementOwner.setCompanyBankNo(ownerInfo.getCompanyBankAccount());
-        settlementOwner.setCompanyBankName(ownerInfo.getCompanyOpenBank());
-
-        settlementOwner.setCompanyContact(ownerInfo.getContactsName());
-        settlementOwner.setCompanyContactMobile(ownerInfo.getContactsTelephone());
-        settlementOwner.setCompanyContactAddress(ownerInfo.getContactsAddress());
-        settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
-        settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NOT_INVOICE.getCode());
-
-        //设置开票公司
-        settlementOwner.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
-        settlementOwner.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
-        settlementOwner.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
-        settlementOwner.setReportFlag(orderInfo.getReportFlag());
-        settlementOwnerDao.saveEntity(settlementOwner);
-
-        //保存结算单日志----创建结算单
-        settlementLogService.saveSettlementLog(settlementNo,
-                SettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),SettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
-                OrderChildLogEnum.CreateType.PLATFORM.getCode(),0L,"系统");
-
-        return settlementNo;
-    }
-
-    /**
-     * 拉运完成结 更新
-     */
-    private void settlementPeriodImmediateUpdate(SettlementOwner settlementOwner,SettlementOwnerDetail settlementOwnerDetail){
-
-        settlementOwner.setWeight(settlementOwnerDetail.getWeight());
-        settlementOwner.setFreight(settlementOwnerDetail.getFreight());
-        settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
-        settlementOwner.setLoanFreight(settlementOwnerDetail.getLoanFreight());
-        settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
-        settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
-        settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
-        settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
-
-        List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
-
-        details.forEach(item->{
-            settlementOwner.setWeight(settlementOwner.getWeight().add(item.getWeight()));
-            settlementOwner.setFreight(settlementOwner.getFreight().add(item.getFreight()));
-            settlementOwner.setLossWeight(settlementOwner.getLossWeight().add(item.getLossWeight()));
-            settlementOwner.setLossFreight(settlementOwner.getLossFreight().add(item.getLossFreight()));
-            settlementOwner.setPrepayFreight(settlementOwner.getPrepayFreight().add(item.getPrepayFreight()));
-            settlementOwner.setLoanFreight(settlementOwner.getLoanFreight().add(item.getLoanFreight()));
-            settlementOwner.setSettlementFreight(settlementOwner.getSettlementFreight().add(item.getSettlementFreight()));
-            settlementOwner.setInvoiceFreight(settlementOwner.getInvoiceFreight().add(item.getInvoiceFreight()));
-        });
-
-        settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
-    }
 
     /**
      * 创建结算单号
      */
+    @Override
     public String settlementNoGenerate(){
         return uniqueOrderNumService.getUniqueOrderNum(com.msl.common.utils.LocalDateTimeUtils.convertLocalDateTimeToString(LocalDateTime.now(), com.msl.common.utils.LocalDateTimeUtils.DATE_DAY));
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -102,6 +102,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
         settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
         settlementOwnerDetail.setReportFlag(orderChild.getReportFlag());
+
         settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);
         return settlementOwnerDetail.getId();
     }
@@ -202,18 +203,20 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(9, "货损单价", "lossPrice", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(13, "借款抵扣金额", "loanFreight", 5000));
-
-        fieldList.add(new ExcelField(14, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(15, "开票标识", "invoiceType", 5000));
-        fieldList.add(new ExcelField(16, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(17, "结算单号", "settlementNo", 15000));
-        fieldList.add(new ExcelField(18, "结算子单号", "settlementSubNo", 15000));
-        fieldList.add(new ExcelField(19, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(20, "是否已付尾款", "finalPaymentStatus", 5000));
-        fieldList.add(new ExcelField(21, "是否已开票", "invoiceStatus", 5000));
+        fieldList.add(new ExcelField(11, "开票费率", "invoiceServiceFeeRate", 5000));
+        fieldList.add(new ExcelField(12, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(13, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(14, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(15, "借款抵扣金额", "loanFreight", 5000));
+
+        fieldList.add(new ExcelField(16, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(17, "开票标识", "invoiceType", 5000));
+        fieldList.add(new ExcelField(18, "订单编号", "orderNo", 5000));
+        fieldList.add(new ExcelField(19, "结算单号", "settlementNo", 15000));
+        fieldList.add(new ExcelField(20, "结算子单号", "settlementSubNo", 15000));
+        fieldList.add(new ExcelField(21, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(22, "是否已付尾款", "finalPaymentStatus", 5000));
+        fieldList.add(new ExcelField(23, "是否已开票", "invoiceStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -235,9 +238,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+ "%"));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLoanFreight().movePointLeft(2)));
+
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceTypeMsg()));
             rowData.add(new ExcelData(dto.getOrderNo()));

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -427,10 +427,11 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
         fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
         fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(13, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(14, "状态", "status", 5000));
+        fieldList.add(new ExcelField(11, "开票服务费", "invoiceServiceFee", 5000));
+        fieldList.add(new ExcelField(12, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(13, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(14, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(15, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -450,6 +451,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getPrepayFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getLossWeight()));
             rowData.add(new ExcelData(dto.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getInvoiceFreight().movePointLeft(2)));
             rowData.add(new ExcelData(dto.getCreateTime()));

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementPlatformServiceFeeExportServiceImpl.java

+package com.clx.performance.service.impl.settle;
+
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.clx.performance.service.settle.SettlementPlatformServiceFeeExportService;
+import com.clx.performance.service.settle.SettlementPlatformServiceFeeService;
+import com.clx.performance.utils.excel.ExcelData;
+import com.clx.performance.utils.excel.ExcelField;
+import com.clx.performance.utils.excel.ExcelSheet;
+import com.clx.performance.utils.excel.ExcelUtil;
+import com.clx.performance.vo.pc.carrier.settle.SettlementPlatformServiceFeeVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class SettlementPlatformServiceFeeExportServiceImpl implements SettlementPlatformServiceFeeExportService {
+
+    @Autowired
+    private SettlementPlatformServiceFeeService settlementPlatformServiceFeeService;
+
+    @Override
+    public void exportPlatformServiceFee(PageCarrierSettlementPlatformServiceFeeParam param) {
+        param.setPage(1);
+        param.setPageSize(1000000);
+        List<SettlementPlatformServiceFeeVO> list = settlementPlatformServiceFeeService.pagePlatformServiceFee(param).getRecords();
+
+
+        // 组装表头
+        List<ExcelField> fieldList = new ArrayList<>();
+        fieldList.add(new ExcelField(0, "序号", "index", 2000));
+        fieldList.add(new ExcelField(1, "运单编号", "childNo", 5000));
+        fieldList.add(new ExcelField(2, "司机姓名", "driverName", 5000));
+        fieldList.add(new ExcelField(3, "手机号", "driverMobile", 5000));
+        fieldList.add(new ExcelField(4, "发货地址", "sendAddress", 5000));
+        fieldList.add(new ExcelField(5, "收货地址", "receiveAddress", 5000));
+        fieldList.add(new ExcelField(6, "车牌号", "truckNo", 10000));
+        
+        fieldList.add(new ExcelField(7, "结算金额", "settlementFreight", 10000));
+        fieldList.add(new ExcelField(8, "平台服务费率", "invoiceServiceFeeRate", 10000));
+        fieldList.add(new ExcelField(9, "平台服务费", "invoiceServiceFee", 10000));
+
+        fieldList.add(new ExcelField(10, "创建时间", "createTime", 5000));
+
+        // 组装数据
+        List<List<ExcelData>> dataList = new ArrayList<>();
+        for (int i=0; i<list.size(); i++){
+
+            SettlementPlatformServiceFeeVO dto = list.get(i);
+            List<ExcelData> rowData = new ArrayList<>();
+
+            rowData.add(new ExcelData(i+1));
+            rowData.add(new ExcelData(dto.getChildNo()));
+            rowData.add(new ExcelData(dto.getDriverName()));
+            rowData.add(new ExcelData(dto.getDriverMobile()));
+            rowData.add(new ExcelData(dto.getSendAddress()));
+            rowData.add(new ExcelData(dto.getReceiveAddress()));
+            rowData.add(new ExcelData(dto.getTruckNo()));
+
+            rowData.add(new ExcelData(dto.getSettlementFreight().movePointLeft(2).setScale(2, RoundingMode.HALF_UP).toString()));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFeeRate().toString()+"%"));
+            rowData.add(new ExcelData(dto.getInvoiceServiceFee().movePointLeft(2).setScale(2, RoundingMode.HALF_UP).toString()));
+
+            rowData.add(new ExcelData(dto.getCreateTime()));
+
+            dataList.add(rowData);
+        }
+
+        // 导出
+        ExcelUtil.export(new ExcelSheet("平台服务费统计", fieldList, dataList));
+    }
+
+}

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementPlatformServiceFeeServiceImpl.java

+package com.clx.performance.service.impl.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.settle.SettlementPlatformServiceFeeDao;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.clx.performance.service.settle.SettlementPlatformServiceFeeService;
+import com.clx.performance.struct.settle.SettlementPlatformServiceFeeStruct;
+import com.clx.performance.vo.pc.carrier.settle.SettlementPlatformServiceFeeVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SettlementPlatformServiceFeeServiceImpl implements SettlementPlatformServiceFeeService {
+    @Autowired
+    private SettlementPlatformServiceFeeDao settlementPlatformServiceFeeDao;
+
+    @Autowired
+    private SettlementPlatformServiceFeeStruct settlementPlatformServiceFeeStruct;
+
+    @Override
+    public IPage<SettlementPlatformServiceFeeVO> pagePlatformServiceFee(PageCarrierSettlementPlatformServiceFeeParam param) {
+
+        return settlementPlatformServiceFeeStruct.convertPage(settlementPlatformServiceFeeDao.pageByParam(param));
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -2,9 +2,12 @@ package com.clx.performance.service.impl.settle;
 
 import cn.hutool.json.JSONUtil;
 import com.clx.order.enums.OrderEnum;
+import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.component.IdGenerateSnowFlake;
+import com.clx.performance.config.SettlementConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OwnerAccountDao;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
@@ -17,7 +20,9 @@ import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.event.OwnerLoanThawEvent;
+import com.clx.performance.extranal.order.InvoicingCompanyService;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OwnerAccount;
 import com.clx.performance.model.OwnerRunningWaterRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
@@ -34,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Objects;
 
 @Slf4j
@@ -43,6 +49,8 @@ public class SettlementServiceImpl implements SettlementService {
     @Autowired
     private OrderChildDao orderChildDao;
     @Autowired
+    private OrderGoodsDao orderGoodsDao;
+    @Autowired
     private SettlementOwnerDetailDao settlementOwnerDetailDao;
     @Autowired
     private SettlementDriverDetailDao settlementDriverDetailDao;
@@ -59,50 +67,70 @@ public class SettlementServiceImpl implements SettlementService {
 
     @Autowired
     private ApplicationEventPublisher applicationEventPublisher;
-
+    @Autowired
+    private InvoicingCompanyService invoicingCompanyService;
+    @Autowired
+    private SettlementConfig settlementConfig;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateSettlementDetailInvoiceType(String childNo, Integer invoiceType) {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
+
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        // 开票金额
-        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+
         if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) <= 0) {
-            invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
             settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
         } else {
-            if(Objects.equals(orderChild.getReportFlag(), OrderEnum.ReportFlag.YES.getCode())){
-                log.info("运单号:{}，对应的开票公司上报标识为【是】",orderChild.getChildNo());
-                Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();
-                rabbitTemplate.send(
-                        RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message
-                );
-                return;
-            } else {
-                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-                settlementDriverDetail.setPrepayFreightFlag(SettlementDriverEnum.PrepayFreightFlag.NO_PAY.getCode());
-                settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-            }
+
+            // 发mq （同步网络货运）
+            Message message = MessageBuilder.withBody(JSONUtil.parse(orderChild).toString().getBytes()).build();
+            rabbitTemplate.send(
+                    RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_EXCHANGE, RabbitKeyConstants.ORDER_CHILD_SYNC_TRANSPORT_ROUTE_KEY, message
+            );
+            return;
         }
 
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
+            // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
+            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
+
+            InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
+                    settlementConfig.getInvoiceCompanyDefault().getCompanyGroupCode());
+            //设置开票公司信息
+            settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
+            settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
+            settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
+
+            settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
+            settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
+            settlementDriverDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
         } else {
             if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
+            // 如果开票标识为“网运单”时，开票费率取货单单所记录的开票费率
+            settlementOwnerDetail.setInvoiceServiceFeeRate(
+                    orderGoods.getInvoiceServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
         }
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
+        // 开票服务费
+        settlementOwnerDetail.setInvoiceServiceFee(invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        // 开票金额
+        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
+                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
+
         log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
@@ -193,15 +221,37 @@ public class SettlementServiceImpl implements SettlementService {
         }
     }
 
+    /**
+     * 开票服务费金额
+     */
+    private BigDecimal invoiceServiceFeeCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
+        return settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight())
+                .divide(BigDecimal.ONE.subtract(settlementOwnerDetail.getInvoiceServiceFeeRate()), 0, RoundingMode.HALF_UP)
+                .multiply(settlementOwnerDetail.getInvoiceServiceFeeRate()).setScale(0, RoundingMode.HALF_UP);
+    }
 
     /**
      * 开票金额
      */
-    private BigDecimal invoiceFreightCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
+    private BigDecimal invoiceFreightCalc(Integer settlementWay, BigDecimal invoiceServiceFeeRate, SettlementOwnerDetail settlementOwnerDetail) {
         if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，开票金额=实际净重*平台运费报价-货损金额。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
                     .subtract(settlementOwnerDetail.getLossFreight());
-        } else { //订单结算方式为“卸车净重”时，开票金额=实际净重*平台运费报价。
+        }
+        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            if (invoiceServiceFeeRate!=null){
+                //结算方式为“卸车净重（减货损）”，平台运费报价为“未税”时，开票金额=平台运费单价*实际净重-货损单价*货损吨数+开票服务费。
+                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
+                        .subtract(settlementOwnerDetail.getLossPrice())
+                        .add(settlementOwnerDetail.getInvoiceServiceFee());
+            }
+            else{
+                //结算方式为“卸车净重（减货损）”，平台运费报价为“含税”时   开票金额=平台运费单价*实际净重-货损单价*货损吨数
+                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
+                        .subtract(settlementOwnerDetail.getLossFreight());
+            }
+        }
+        else { //订单结算方式为“卸车净重”时，开票金额=实际净重*平台运费报价。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice());
         }
     }
@@ -213,7 +263,14 @@ public class SettlementServiceImpl implements SettlementService {
         if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
                     .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
-        } else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
+        }
+        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+            //结算方式为“卸车净重（减货损）“，结算金额=开票金额-预付运费金额-借款抵扣金额。
+            return settlementOwnerDetail.getInvoiceFreight()
+                    .subtract(settlementOwnerDetail.getPrepayFreight())
+                    .subtract(settlementOwnerDetail.getLoanFreight());
+
+        }else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice()).subtract(settlementOwnerDetail.getPrepayFreight());
         }
     }

performance-web/src/main/java/com/clx/performance/service/ordergoods/OrderGoodsPostService.java

+package com.clx.performance.service.ordergoods;
+
+import com.clx.performance.model.OrderGoods;
+
+import java.util.List;
+
+public interface OrderGoodsPostService {
+
+    void orderGoodsAdd(OrderGoods orderGoods);
+    void orderGoodsAdd(List<OrderGoods> orderGoodsList);
+}

performance-web/src/main/java/com/clx/performance/service/settle/SettlementPlatformServiceFeeExportService.java

+package com.clx.performance.service.settle;
+
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+
+public interface SettlementPlatformServiceFeeExportService {
+
+    void exportPlatformServiceFee(PageCarrierSettlementPlatformServiceFeeParam param);
+
+}

performance-web/src/main/java/com/clx/performance/service/settle/SettlementPlatformServiceFeeService.java

+package com.clx.performance.service.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import com.clx.performance.vo.pc.carrier.settle.SettlementPlatformServiceFeeVO;
+
+/**
+ * @author
+ * Date 2023-10-12
+ * Time 09:43
+ */
+public interface SettlementPlatformServiceFeeService {
+    IPage<SettlementPlatformServiceFeeVO> pagePlatformServiceFee(PageCarrierSettlementPlatformServiceFeeParam param);
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementPlatformServiceFeeSqlProvider.java

+package com.clx.performance.sqlProvider.settle;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.pc.owner.PageCarrierSettlementPlatformServiceFeeParam;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+import java.util.Objects;
+
+public class SettlementPlatformServiceFeeSqlProvider {
+
+    private static final String TABLE = "settlement_platform_service_fee";
+
+    public String pageByParam(@Param("page") Page page, @Param("param") PageCarrierSettlementPlatformServiceFeeParam param) {
+
+        return new SQL(){{
+
+            SELECT("*");
+            FROM(TABLE);
+
+            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getDriverUserName())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
+            if (Objects.nonNull(param.getDriverUserNo())) {WHERE("driver_user_no = #{param.driverUserNo}");}
+
+            if (Objects.nonNull(param.getBeginTime())) {WHERE("create_time >= #{param.beginTime}");}
+            if (Objects.nonNull(param.getEndTime())) {WHERE("create_time <= #{param.endTime}");}
+
+            ORDER_BY("id desc");
+        }}.toString();
+    }
+
+}

performance-web/src/main/java/com/clx/performance/strategy/impl/OwnGoodsOrderStrategy.java

@@ -17,6 +17,7 @@ import com.clx.performance.enums.PendingOrderWayStatusEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.TruckDemandEnum;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.service.ordergoods.OrderGoodsPostService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -66,6 +67,8 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
 
     private final IdGenerateSnowFlake idGenerateSnowFlake;
 
+    private final OrderGoodsPostService orderGoodsPostService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public LocalDateTime goodsOrderProcess(OrderGoodsParams orderGoodsParams, FeignOrderVO orderInfo, LocalDateTime now) {
@@ -175,6 +178,13 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
             //设置结算方式
             orderGoods.setSettlementWay(orderInfo.getSettlementWay());
+
+            // 平台服务费
+            orderGoods.setPlatformFreightQuotationTaxType(orderInfoFeign.getPlatformFreightQuotationTaxType());
+            orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
+            orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
+            orderGoods.setDeposit(orderInfoFeign.getDeposit());
+
             List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
             if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "全部自由车辆列表数据为空");
@@ -199,6 +209,9 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
         }
         orderGoodsDao.saveBatchEntity(orderGoodsList);
 
+        // 货单新增后置逻辑
+        orderGoodsPostService.orderGoodsAdd(orderGoodsList);
+
         UpdateOrderInfoResidueWeightParam param = new UpdateOrderInfoResidueWeightParam();
         param.setOrderId(orderInfo.getId());
         param.setUpdateType("1");

performance-web/src/main/java/com/clx/performance/strategy/impl/PartGoodsOrderStrategy.java

@@ -13,6 +13,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.service.ordergoods.OrderGoodsPostService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -60,6 +61,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
     private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
     private final IdGenerateSnowFlake idGenerateSnowFlake;
+    private final OrderGoodsPostService orderGoodsPostService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -179,6 +181,13 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
             orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
             //设置结算方式
             orderGoods.setSettlementWay(orderInfo.getSettlementWay());
+
+            // 平台服务费
+            orderGoods.setPlatformFreightQuotationTaxType(orderInfoFeign.getPlatformFreightQuotationTaxType());
+            orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
+            orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
+            orderGoods.setDeposit(orderInfoFeign.getDeposit());
+
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());
@@ -191,6 +200,10 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
             orderGoodsList.add(orderGoods);
         }
         orderGoodsDao.saveBatchEntity(orderGoodsList);
+
+        // 货单新增后置逻辑
+        orderGoodsPostService.orderGoodsAdd(orderGoodsList);
+
         BigDecimal residueWeight = new BigDecimal(orderInfo.getResidueWeight());
         if (platSum.compareTo(BigDecimal.ZERO) != 0 && ownSum.compareTo(BigDecimal.ZERO) != 0) {
             BigDecimal residuePlatSum = new BigDecimal(orderInfo.getPlatformResidueCarryWeight());

performance-web/src/main/java/com/clx/performance/strategy/impl/PlatformGoodsOrderStrategy.java

@@ -13,6 +13,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.service.ordergoods.OrderGoodsPostService;
 import com.clx.performance.strategy.GoodsOrderStrategy;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
@@ -62,6 +63,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
 
     private final IdGenerateSnowFlake idGenerateSnowFlake;
 
+    private final OrderGoodsPostService orderGoodsPostService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -174,6 +176,12 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
             //设置结算方式
             orderGoods.setSettlementWay(orderInfo.getSettlementWay());
 
+            // 平台服务费
+            orderGoods.setPlatformFreightQuotationTaxType(orderInfoFeign.getPlatformFreightQuotationTaxType());
+            orderGoods.setInvoiceServiceFeeRate(orderInfoFeign.getPlatformFreightQuotationTaxRate());
+            orderGoods.setPlatformServiceFeeRate(orderInfoFeign.getPlatformServiceFeeRate());
+            orderGoods.setDeposit(orderInfoFeign.getDeposit());
+
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());
@@ -185,6 +193,10 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
             orderGoodsList.add(orderGoods);
         }
         orderGoodsDao.saveBatchEntity(orderGoodsList);
+
+        // 货单新增后置逻辑
+        orderGoodsPostService.orderGoodsAdd(orderGoodsList);
+
         UpdateOrderInfoResidueWeightParam param = new UpdateOrderInfoResidueWeightParam();
         param.setOrderId(orderInfo.getId());
         param.setUpdateType("1");

performance-web/src/main/java/com/clx/performance/struct/PlatformServiceFeeConfigStruct.java

+package com.clx.performance.struct;
+
+import com.clx.performance.enums.PlatformServiceFeeConfigEnum;
+import com.clx.performance.model.PlatformServiceFeeConfig;
+import com.clx.performance.vo.feign.PlatformServiceFeeConfigFeignVO;
+import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {PlatformServiceFeeConfigEnum.class, Objects.class, DateUtils.class})
+public interface PlatformServiceFeeConfigStruct {
+    @Mapping(target = "orderQuotationTypeMsg", expression = "java(Objects.isNull(config.getOrderQuotationType()) ? null : PlatformServiceFeeConfigEnum.getMsgByCode(config.getOrderQuotationType()))")
+    CarrierPagePlatformServiceFeeConfigVO convertToDetail(PlatformServiceFeeConfig config);
+
+    PlatformServiceFeeConfigFeignVO convertPlatformServiceFeeConfigFeignVO(PlatformServiceFeeConfig config);
+
+}

performance-web/src/main/java/com/clx/performance/struct/settle/SettlementPlatformServiceFeeStruct.java

+package com.clx.performance.struct.settle;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.settle.SettlementPlatformServiceFee;
+import com.clx.performance.vo.pc.carrier.settle.SettlementPlatformServiceFeeVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface SettlementPlatformServiceFeeStruct {
+
+    SettlementPlatformServiceFeeVO convert(SettlementPlatformServiceFee item);
+
+    Page<SettlementPlatformServiceFeeVO> convertPage(IPage<SettlementPlatformServiceFee> page);
+
+}

performance-web/src/main/java/com/clx/performance/utils/excel/ExcelData.java

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 
@@ -32,8 +33,14 @@ public class ExcelData {
         this(value,null);
     }
     public ExcelData(String value, String defaultValue) {
-        this.value = value;
-        this.dataType = DataType.STRING.value;
+        if (!StringUtils.isBlank(value)) {
+            this.value = value;
+            this.dataType = DataType.STRING.value;
+        }
+        else {
+            this.value = defaultValue;
+            this.dataType = DataType.STRING.value;
+        }
     }
 
     public ExcelData(Double value) {

performance-web/src/main/java/com/clx/performance/utils/excel/ExcelField.java

@@ -20,11 +20,13 @@ public class ExcelField {
     private Integer width;
     private Integer styleType;
     private Integer contentAlignment;
+    private Integer span;
 
     public ExcelField(String fieldName, String field, Integer width) {
         this.fieldName = fieldName;
         this.field = field;
         this.width = width;
+        this.span = 1;
     }
 
     public ExcelField(Integer column, String fieldName, String field, Integer width) {
@@ -32,5 +34,13 @@ public class ExcelField {
         this.fieldName = fieldName;
         this.field = field;
         this.width = width;
+        this.span = 1;
+    }
+    public ExcelField(Integer column, String fieldName, String field, Integer width, Integer span) {
+        this.column = column;
+        this.fieldName = fieldName;
+        this.field = field;
+        this.width = width;
+        this.span = span;
     }
 }

performance-web/src/main/java/com/clx/performance/utils/excel/ExcelSheet.java

 package com.clx.performance.utils.excel;
 
+import com.clx.performance.utils.excel.ExcelData;
+import com.clx.performance.utils.excel.ExcelField;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,6 +21,7 @@ public class ExcelSheet {
     private String time;
     private Integer timeStyleType;
     private List<ExcelField> fieldList;
+    private List<ExcelField> fieldSecondList;
     private List<List<ExcelData>> dataList;
 
     public ExcelSheet(String name, String title) {
@@ -32,11 +35,24 @@ public class ExcelSheet {
         this.fieldList = fieldList;
     }
 
+    public ExcelSheet(String name, List<ExcelField> fieldList, List<List<ExcelData>> dataList) {
+        this.name = name;
+        this.title = name;
+        this.fieldList = fieldList;
+        this.dataList = dataList;
+    }
     public ExcelSheet(String name, String title, List<ExcelField> fieldList, List<List<ExcelData>> dataList) {
         this.name = name;
         this.title = title;
         this.fieldList = fieldList;
         this.dataList = dataList;
     }
+    public ExcelSheet(String name, String title, List<ExcelField> fieldList, List<ExcelField> fieldSecondList, List<List<ExcelData>> dataList) {
+        this.name = name;
+        this.title = title;
+        this.fieldList = fieldList;
+        this.fieldSecondList = fieldSecondList;
+        this.dataList = dataList;
+    }
 
 }

performance-web/src/main/java/com/clx/performance/utils/excel/ExcelUtil.java

@@ -12,7 +12,12 @@ import org.apache.poi.xssf.streaming.SXSSFCell;
 import org.apache.poi.xssf.streaming.SXSSFRow;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -39,11 +44,30 @@ public class ExcelUtil {
 
     }
 
+    /**
+     * 导出
+     */
+    public static void export(ExcelSheet excelSheet) {
+
+        // 创建excel
+        SXSSFWorkbook workbook = create(excelSheet);
+
+        // 导出
+        HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
+        response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        try {
+            workbook.write(response.getOutputStream());
+        }catch (Exception e){
+            throw new RuntimeException("文件导出失败");
+        }
+    }
+
     /**
      * 创建excel
      */
     public static SXSSFWorkbook create(ExcelSheet excelSheet) {
         List<ExcelField> fieldList = excelSheet.getFieldList();
+        List<ExcelField> fieldSecondList = excelSheet.getFieldSecondList();
         List<List<ExcelData>> dataList = excelSheet.getDataList();
 
         SXSSFWorkbook workbook = new SXSSFWorkbook();
@@ -51,14 +75,39 @@ public class ExcelUtil {
         //创建sheet
         SXSSFSheet sheet = workbook.createSheet(excelSheet.getName());
 
-        int fieldSize = fieldList.size();
-        for (int i = 0; i < fieldSize; i++) {
-            sheet.setColumnWidth(i, fieldList.get(i).getWidth());
+
+        int dataFieldSize = 0;
+        for (int i = 0; i < fieldList.size(); i++) {
+            dataFieldSize += fieldList.get(i).getSpan();
+        }
+
+        // 设置列宽
+        for (int i = 0, columnIdx = 0; i < fieldList.size(); i++) {
+
+            Integer width = null;
+            if (fieldList.get(i).getWidth() != null){width = fieldList.get(i).getWidth()/fieldList.get(i).getSpan();}
+
+            for (int j = 0; j < fieldList.get(i).getSpan(); j++) {
+                if (width != null) {sheet.setColumnWidth(columnIdx, width);}
+                columnIdx++;
+            }
+        }
+        if (fieldSecondList != null) {
+            for (int i = 0, columnIdx = 0; i < fieldSecondList.size(); i++) {
+
+                Integer width = null;
+                if (fieldSecondList.get(i).getWidth() != null){width = fieldSecondList.get(i).getWidth()/fieldSecondList.get(i).getSpan();}
+
+                for (int j = 0; j < fieldSecondList.get(i).getSpan(); j++) {
+                    if (width != null) {sheet.setColumnWidth(columnIdx, width);}
+                    columnIdx++;
+                }
+            }
         }
 
         //添加标题
         int row = 0;
-        CellRangeAddress cellRangeAddress = new CellRangeAddress(row, row, 0, fieldSize - 1);
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(row, row, 0, dataFieldSize - 1);
         SXSSFRow rowTitle = sheet.createRow(row++);
         sheet.addMergedRegion(cellRangeAddress);
         rowTitle.setHeightInPoints(30);
@@ -69,7 +118,7 @@ public class ExcelUtil {
 
         //时间
         if (StringUtils.isNotBlank(excelSheet.getTime())) {
-            CellRangeAddress timeCellRangeAddress = new CellRangeAddress(row, row, 0, fieldSize - 1);
+            CellRangeAddress timeCellRangeAddress = new CellRangeAddress(row, row, 0, dataFieldSize - 1);
             SXSSFRow rowTime = sheet.createRow(row++);
             sheet.addMergedRegion(timeCellRangeAddress);
 
@@ -84,15 +133,49 @@ public class ExcelUtil {
         //添加表头
         CellStyle headCellStyle = getHeadStyle(workbook);
         SXSSFRow rowHead = sheet.createRow(row++);
-        for (int i = 0; i < fieldSize; i++) {
-            SXSSFCell headCell = rowHead.createCell(i);
-            headCell.setCellValue(fieldList.get(i).getFieldName());
+        for (int i = 0, columnIdx=0; i < fieldList.size(); i++) {
+            SXSSFCell headCell = rowHead.createCell(columnIdx);
+            if (fieldList.get(i).getFieldName() != null) {
+                headCell.setCellValue(fieldList.get(i).getFieldName());
+            }
+
+            if (fieldList.get(i).getSpan()>1) {
+                CellRangeAddress cellAddresses = new CellRangeAddress(row-1, row-1, columnIdx, columnIdx + fieldList.get(i).getSpan()-1);
+                sheet.addMergedRegion(cellAddresses);
+            }
+
             Integer styleType = fieldList.get(i).getStyleType();
             if (null != styleType) {
                 headCell.setCellStyle(getCellStyle(workbook, styleType));
             } else {
                 headCell.setCellStyle(headCellStyle);
             }
+            columnIdx += fieldList.get(i).getSpan();
+        }
+
+        //添加二级表头
+        if (fieldSecondList != null) {
+            CellStyle headCellStyleSecond = getHeadStyle(workbook);
+            SXSSFRow rowHeadSecond = sheet.createRow(row++);
+            for (int i = 0, columnIdx = 0; i < fieldSecondList.size(); i++) {
+                SXSSFCell headCell = rowHeadSecond.createCell(columnIdx);
+                if (fieldSecondList.get(i).getFieldName()!=null) {
+                    headCell.setCellValue(fieldSecondList.get(i).getFieldName());
+                }
+
+                if (fieldSecondList.get(i).getSpan() > 1){
+                    CellRangeAddress cellAddresses = new CellRangeAddress(row-1, row-1, columnIdx, columnIdx + fieldSecondList.get(i).getSpan()-1);
+                    sheet.addMergedRegion(cellAddresses);
+                }
+
+                Integer styleType = fieldSecondList.get(i).getStyleType();
+                if (null != styleType) {
+                    headCell.setCellStyle(getCellStyle(workbook, styleType));
+                } else {
+                    headCell.setCellStyle(headCellStyleSecond);
+                }
+                columnIdx += fieldSecondList.get(i).getSpan();
+            }
         }
 
         //内容
@@ -100,7 +183,7 @@ public class ExcelUtil {
         int dataSize = dataList.size();
         for (int i = 0; i < dataSize; i++) {
             rowData = sheet.createRow(row++);
-            for (int j = 0; j < fieldSize; j++) {
+            for (int j = 0; j < dataFieldSize; j++) {
                 SXSSFCell dataCell = rowData.createCell(j);
                 ExcelData excelData = dataList.get(i).get(j);
                 setCellValue(dataCell, excelData);