Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/performance/constant/ActionConstants.java

+package com.clx.performance.constant;
+
+public class ActionConstants {
+
+    public static final String CLX_PAYMENT_PAY = "clx.payment.pay";
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+public enum CancelOrderEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+        NOT_CHILD(1, "违约无运单"),
+        NOT_TRANSPORTED(2, "取消未拉运吨数"),
+        NOT_ARRIVE(3, "取消未到达货源地"),
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Type> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
+        }
+    }
+
+
+}

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

@@ -33,6 +33,7 @@ public enum OrderChildEnum {
         DRIVER_CANCEL(110, "司机取消"),
         PLATFORM_CANCEL(111, "承运取消"),
         OWNER_CANCEL(112, "货主取消"),
+        ARTIFICIAL_CANCEL(113, "客服取消"),
 
 //
 //        OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆

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

@@ -4,9 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 public enum OrderGoodsTruckBindEnum {
     ;
@@ -15,11 +13,12 @@ public enum OrderGoodsTruckBindEnum {
     @AllArgsConstructor
     public enum Status {
 
-        SUCCESS(1, "正常"),
+        NORMAL(1, "正常"),
 
         CANCEL(2, "取消"),
         GET(3, "已接单"),
-        EXPIRE(4, "已失效")
+        EXPIRE(4, "已失效"),
+        SUCCESS(5, "结束")
 
         ;
 

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

@@ -55,7 +55,27 @@ public enum OwnerAccountEnum {
         ;
         private final Integer code;
         private final String msg;
+        public String getMsg() {
+            return this.msg;
+        }
 
+        public Integer getCode() {
+            return this.code;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum OrderChildTypeStatus {
+        ORDINARY(1, "普通单"),
+        NETWORK(2, "网运单"),
+        ;
+        private final Integer code;
+        private final String msg;
+
+        public Integer getCode() {
+            return this.code;
+        }
     }
 
     @Getter

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

+package com.clx.performance.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ThirdRequestStatusEnum {
+
+    HAVING(0, "请求中"),
+    SUCCESS(1, "成功"),
+    FAIL(2, "失败"),
+    ;
+
+    private final int code;
+    private final String mark;
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ThirdRequestTypeEnum {
+
+    SEND(1, "发送请求"),
+    RECEIVE(2, "接收请求"),
+    ;
+
+    private final int code;
+    private final String msg;
+}

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

@@ -6,6 +6,7 @@ import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -84,4 +85,7 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
     Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
+
+    @GetMapping(value = {"clx-performance/feign/owner/accountInfo"})
+    Result<OwnerAccountAllVO> accountInfo(@RequestParam Long userNo);
 }

performance-api/src/main/java/com/clx/performance/param/pay/NotifyString.java

+package com.clx.performance.param.pay;
+
+import com.msl.common.enums.ResultEnum;
+
+
+/**
+ * 
+ * @author xujianke
+ * @date 2017年6月01日
+ * @description
+ */
+public class NotifyString extends PayResult<String> {
+	/** 支付操作 参考<MessageTypeEnum> */
+	private Integer action;
+	/** 交易单号 */
+	private String orderNo;
+	/** 支付请求唯一ID */
+	private String uuid;
+	/** 出错时的交易单元编号 */
+	private String errorNo;
+	
+	public NotifyString(){
+		super();
+	}
+	public NotifyString(PayResult<String> ret){
+		this.setCode(ret.getCode());
+		this.setMsg(ret.getMsg());
+		this.setData(ret.getData());
+	}
+	public NotifyString(ResultEnum e) {
+		super(e);
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getUuid() {
+		return uuid;
+	}
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public String getErrorNo() {
+		return errorNo;
+	}
+	public void setErrorNo(String errorNo) {
+		this.errorNo = errorNo;
+	}
+	@Override
+	public String toString() {
+		return "NotifyString [action=" + action + ", orderNo=" + orderNo + ", uuid=" + uuid
+				+ ", errorNo=" + errorNo + ", toString()=" + super.toString() + "]";
+	}
+
+
+}

performance-api/src/main/java/com/clx/performance/param/pay/PayResult.java

+package com.clx.performance.param.pay;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.msl.common.enums.ResultEnum;
+
+/**
+ * 
+ * 类： Result
+ * 描述：接口返回结果类
+ * @author wangjf
+ * 时间：2017年3月23日下午3:46:50
+ * 版本：v1.0
+ * 修改人：wangjf
+ */
+public class PayResult<T> {
+	
+	private Integer code; // 返回结果代码，0为成功
+	/**
+	 * 返回结果代码
+	 * 0为成功 ，其他代码请参照代码文档
+	 * @return
+	 */
+	public Integer getCode() {
+		return code;
+	}
+
+	private Long total;//总共记录数
+
+	private Integer pageNum;//总共页数
+
+	/**
+	 * 0代表成功，其他代码请参考《返回值说明文档》 
+	 * 请务必按规定填写！
+	 * @param code 结果代码
+	 */
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	/**
+	 * 错误消息，接口中的错误处理，请务必填写错误消息<br/>
+	 * 当成功时消息应为“success”
+	 * @param msg 错误消息
+	 */
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+	private String msg;
+	private T data;
+	/**
+	 * 默认code = 0,<br/>
+	 * msg = "success"
+	 */
+	public PayResult() {
+		this.code = 0;
+		this.msg = "success";
+	}
+	/**
+	 * 默认code = 0, 
+	 * msg = "success",<br/>
+	 * 当成功返回结果时，可使用此方法，直接将返回结果填写即可
+	 * @param data ，返回结果
+	 */
+	public PayResult(T data) {
+		this.code = 0;
+		this.msg = "success";
+		this.data = data;
+	}
+
+	/**
+	 * 查询列表返回成功
+	 * @param data
+	 * @param pageNum
+	 * @param total
+	 */
+	public PayResult(T data, Integer pageNum, Long total) {
+		this.code = 0;
+		this.msg = "success";
+		this.data = data;
+		this.pageNum = pageNum;
+		this.total = total;
+	}
+
+	/**
+	 * 产生错误时，需要在枚举中拼接自定义返回的内容
+	 * @param e
+	 * @param msg
+	 */
+	public PayResult(ResultEnum e, String msg) {
+		this.code = e.getCode();
+		this.msg = String.format(e.getMsg(), msg);
+	}
+
+	/**
+	 * 产生错误时，可以使用此构造方法，在new时直接填写错误代码及消息即可
+	 * @param code
+	 * @param msg
+	 */
+	public PayResult(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+	public PayResult(Integer code, String msg, T data) {
+		this.code = code;
+		this.msg = msg;
+		this.data = data;
+	}
+	@JsonIgnore
+	public void setResultEnum(ResultEnum e){
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+	}
+	
+	public PayResult(ResultEnum e) {
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+	}
+
+	public PayResult(T data, ResultEnum e) {
+		this.code = e.getCode();
+		this.msg = e.getMsg();
+		this.data = data;
+	}
+
+	public Long getTotal() {
+		return total;
+	}
+
+	public void setTotal(Long total) {
+		this.total = total;
+	}
+
+	public Integer getPageNum() {
+		return pageNum;
+	}
+
+	public void setPageNum(Integer pageNum) {
+		this.pageNum = pageNum;
+	}
+
+	@Override
+	public String toString() {
+		return "Result [code=" + code + ", msg=" + msg + ", data=" + data + "]";
+	}
+
+	/**
+	 * 是否成功
+	 * @return
+	 */
+	public boolean succeed() {
+		return code != null && code == 0;
+	}
+}

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

 package com.clx.performance.param.pc;
 
+import com.msl.common.convertor.type.MoneyInConvert;
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -48,6 +50,7 @@ public class OrderGoodsEditParams {
     private Integer needTruckNum;
 
     @ApiModelProperty("挂单运费")
+    @MoneyInConvert
     private BigDecimal pendingOrderFreight;
 
     @ApiModelProperty("创建人用户编号")

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

@@ -7,6 +7,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -32,6 +34,8 @@ public class BreakContractDriverRecordAddParam {
 
     @ApiModelProperty("违约金")
     @NotNull(message = "违约金不能为空")
+    @Max(value = 999_999_999L, message = "金额不能超过999999999元")
+    @Min(value = 0L, message = "金额不能小于0元")
     @MoneyInConvert
     private BigDecimal figure;
 

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

@@ -7,6 +7,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -32,6 +34,8 @@ public class BreakContractOwnerRecordAddParam {
 
     @ApiModelProperty("违约金")
     @NotNull(message = "违约金不能为空")
+    @Max(value = 999_999_999L, message = "金额不能超过999999999元")
+    @Min(value = 0L, message = "金额不能小于0元")
     @MoneyInConvert
     private BigDecimal figure;
 

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

@@ -16,5 +16,5 @@ public class ThawAccountParam {
     private String orderNo;
 
     // 1: 普通单  2：网运单
-    private String orderType;
+    private Integer orderType;
 }

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

+package com.clx.performance.param.pc.payment;
+
+import lombok.*;
+
+import java.util.List;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class FreezeUnitDTO {
+	/** 冻结序列号 */
+	private String freezeNo;
+	/** 操作金额(单位分) */
+	private Long figure;
+	/** 平台信息费用(单位分) */
+	private Long fee;
+	/** 平台信息费收费方式 1from 2to 3all 默认是2 */
+	private Integer feeType;
+	/** 返还费用 */
+	private Long returnFee;
+	/** 操作类型 1撤销 2完成 3修改*/
+	private Integer action;
+	/** 时间戳(单位毫秒) **/
+	private Long timestamp;
+	/** 签名使用业务系统私钥签名 不参与签名 **/
+	private String signature;
+	/** 备注 不参与签名 可空 */
+	private String remark;
+	/** 消费卡列表 */
+	private List<PayCardDTO> cardList;
+	/** 分账列表 */
+	private List<PayChildDTO> childList;
+	/** 流程标志 1线上2线下 */
+	private String flag;
+	/** 补充标记,结合枚举使用(PatchMarkEnum),确定实际业务含义  */
+	private Integer patchMark;
+	/** 优惠卷id */
+	private Integer userCouponId;
+}

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

+package com.clx.performance.param.pc.payment;
+
+import lombok.*;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PayCardDTO {
+	/** VIP 消费卡ID*/
+	private Integer cardId;
+	/** 金额 */
+	private Integer figure;
+}

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

+package com.clx.performance.param.pc.payment;
+
+import lombok.*;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class PayChildDTO {
+	/** 支付给谁 用户钱包编号 支付给系统时为10000 **/
+	private Integer to;
+	/** 交易金额(单位分) 必须为正数 **/
+	private Integer figure;
+	/** 备注 不参与签名 可空 */
+	private String remark;
+}

performance-api/src/main/java/com/clx/performance/param/pc/payment/PayParam.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 PayParam {
+	@NotBlank(message = "支付人不能为空")
+	@ApiModelProperty(value = "支付来源", example = "2234", dataType = "int")
+	Integer from;
+	@NotBlank(message = "支付密码不能为空")
+	@ApiModelProperty(value = "支付方密码", example = "2356", dataType = "String")
+	String pwd;
+	@NotBlank(message = "收款钱包不能为空")
+	@ApiModelProperty(value = "支付去向", example = "2234", dataType = "int")
+	Integer to;
+	@NotBlank(message = "金额不能为空")
+	@ApiModelProperty(value = "金额", example = "2356", dataType = "int")
+	Integer figure;
+	@NotBlank(message = "交易单号不能为空")
+	@ApiModelProperty(value = "交易单号", example = "2356", dataType = "String")
+	String tradeNo;
+	@NotBlank(message = "交易单id不能为空")
+	@ApiModelProperty(value = "交易单id", example = "23", dataType = "int")
+	Integer tradeId;
+	@NotBlank(message = "交易备注不能为空")
+	@ApiModelProperty(value = "交易备注", example = "23", dataType = "int")
+	String remark;
+
+
+}

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

+package com.clx.performance.param.pc.payment;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Accessors(chain = true)
+public class PayUnitDTO {
+	/** 支付单元唯一标识*/
+	private String id;
+	/** 谁支付 用户钱包编号 */
+	private Integer from;
+	/** 支付给谁 用户钱包编号 支付给系统时为10000 **/
+	private Integer to;
+	/** 交易金额(单位分) 必须为正数 **/
+	private Integer figure;
+	/** 支付类型  参考 <PayUnitTypeEnum> **/
+	private Integer type;
+	/** 时间戳(单位毫秒) **/
+	private Long timestamp;
+	/** 签名使用业务系统私钥签名 不参与签名 **/
+	private String signature;
+	/** 备注 不参与签名 可空 */
+	private String remark;
+	/** 关联名称 不参与签名 可空 */
+	private String relationName;
+	/** 优惠卷id */
+	private Integer userCouponId;
+	/** 订单编码 批量发送 单独处理的订单号 */
+	private String orderNo;
+}

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

+package com.clx.performance.param.pc.payment;
+
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Accessors(chain = true)
+public class PayUserDTO {
+	/**用户钱包编号 用户发起的操作必填 */
+	private Integer userCode;
+	/** 交易密码 用户发起的操作必填 */
+	private String pwd;
+	/** 支付单元 */
+	PayUnitDTO payUnitDTO;
+	/** 平台服务续费 **/
+	private Integer fee = 0;
+	/** 平台服务续费的去向 **/
+	private Integer feeToUserCode = 10000;
+
+	/** 业务系统编码  参考<SystemCodeEnum> */
+	private Integer system;
+	/** 支付结果通知回调地址 */
+	private String notifyUrl;
+	/** 操作唯一标识 UUID */
+	private String uuid;
+	/** 关联单号 */
+	private String orderNo;
+}

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

@@ -105,5 +105,7 @@ public class OrderGoodsAPPVO {
     @ApiModelProperty("创建时间")
     private String createTime;
 
+    @ApiModelProperty("车牌号")
+    private String truckNo;
 
 }
\ No newline at end of file

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

 package com.clx.performance.vo.pc;
 
+import com.msl.common.convertor.field.Converted;
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,9 +13,12 @@ public class OrderGoodsEditVO {
 
     @ApiModelProperty("订单编号")
     private String orderNo;
+    @ApiModelProperty("拉运结束时间")
+    private String transportEndTime;
     @ApiModelProperty("拉运吨数")
     private BigDecimal transportWeight;
     @ApiModelProperty("有效运费")
+    @MoneyOutConvert
     private BigDecimal validFreightPrice;
     @ApiModelProperty("用车需求： 1平台车辆 2部分平台车辆 3自有车辆")
     private Integer truckDemand;
@@ -38,5 +43,7 @@ public class OrderGoodsEditVO {
     @ApiModelProperty("1:可以全部编辑 0：不能全部编辑")
     private boolean editAllFlag;
 
+    @ApiModelProperty("货单数据")
+    @Converted(isDynamic = false)
     private OrderGoodsVO orderGoodsVO;
 }

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.field.Converted;
+import lombok.Data;
+
+@Data
+public class OwnerAccountAllVO {
+
+    @Converted(isDynamic = true)
+    private OwnerAccountVO marginAccount;
+
+    @Converted(isDynamic = true)
+    private OwnerAccountVO prepaidFreightAccount;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/BreakContractOwnerRuleVO.java

@@ -66,8 +66,10 @@ public class BreakContractOwnerRuleVO {
     @ToString
     @NoArgsConstructor
     public static class OrderAmountReduceRule {
-        @ApiModelProperty(value = "总运费*X%", example = "1.23")
-        private BigDecimal ratio;
+        @ApiModelProperty(value = "挂单前：总运费*X%", example = "1.23")
+        private BigDecimal beforeRatio;
+        @ApiModelProperty(value = "挂单后：总运费*X%", example = "1.23")
+        private BigDecimal afterRatio;
     }
 
     @Getter

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

@@ -3,6 +3,8 @@ package com.clx.performance.component;
 import cn.hutool.core.util.StrUtil;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
+import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.msl.common.base.Optional;
 import lombok.AllArgsConstructor;
@@ -23,6 +25,8 @@ public class GoodsOrderTruckRecordComponent {
 
     private final OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
 
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
 
     public void saveTruckRecord(String orderGoodsNo, List<String> truckList) {
         redisTemplate.opsForSet().add(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo, truckList.toArray(new String[]{}));
@@ -33,7 +37,7 @@ public class GoodsOrderTruckRecordComponent {
     public void deleteTruckRecord(String orderGoodsNo) {
         redisTemplate.delete(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
         //redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo,);
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_RECORD, orderGoodsNo);
+        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_RECORD, RedisConstants.ORDER_GOODS_TRUCK_RECORD + orderGoodsNo);
     }
 
     //删除货单下的指定车牌号
@@ -62,4 +66,11 @@ public class GoodsOrderTruckRecordComponent {
         return truckList;
 
     }
+
+    //释放车辆
+    public void releaseDriverCard(String orderGoodsNo, String truckNo) {
+        log.info("执行释放车辆,货单号：{},车牌号：{}", orderGoodsNo, truckNo);
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(), truckNo);
+        this.deleteTruckRecord(orderGoodsNo, truckNo);
+    }
 }

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

@@ -15,6 +15,7 @@ import com.clx.performance.enums.TruckDemandEnum;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.base.Optional;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -53,6 +54,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final DriverService driverService;
 
+    private final BreakContractDriverRecordService breakContractDriverRecordService;
+
     //根据货单最晚接单时间处理
     public void expireProduceByLastOrderTime(LocalDateTime localDateTime, String orderGoodsNo) {
         redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
@@ -60,12 +63,12 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     //删除货单最晚接单时间处理
     public void deleteRedisRecordForLastOrderTime(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo);
+        redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo);
     }
 
     //删除货单最晚到达货源地时间处理
     public void deleteRedisRecordForLastArriveSendTime(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
+        redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
     }
 
     //根据货单最晚到达货源地时间处理
@@ -142,8 +145,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                         }
                     }
                     orderFeign.rollbackOrderWeight(param);
-                    //更新已完结,并设置剩余吨数为0
-                    orderGoodsDao.updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(orderGoods.getId(), OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+                    //更新已完结
+                    orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());
 
                     log.info("删除redis ORDER_GOODS_STATUS_LAZY id: {}", orderGoodsId.getValue());
                 }
@@ -183,7 +186,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
             log.info("货单-最晚到达货源地时间-定时器查询redis条数：{}", orderGoodsIds.size());
 
             for (ZSetOperations.TypedTuple<String> orderGoodsId : orderGoodsIds) {
-                log.info("货单" + orderGoodsId + "过了最晚到达货源地时间");
+                log.info("货单" + orderGoodsId.getValue() + "过了最晚到达货源地时间");
                 String orderGoodsNo = orderGoodsId.getValue();
                 log.info("处理当前货单编号:{}", orderGoodsNo);
                 Optional<OrderGoods> optional = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo);
@@ -204,11 +207,13 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     ids.add(orderChild.getId());
                     //释放车辆
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                    breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, 0L, "系统");
 
                 }
-
-
-                orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), ids);
+                log.info("取消运单ID集合：{}", ids);
+                if (CollectionUtil.isNotEmpty(ids)) {
+                    orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消", ids);
+                }
 
                 RollbackOrderWeightParam param = new RollbackOrderWeightParam();
                 param.setOrderNo(orderGoods.getOrderNo());

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

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+@Getter
+@Setter
+public class MslPaymentConfig {
+
+    @Value("${msl.payment.host}")
+    private String host;
+    @Value("${msl.payment.notifyhost}")
+    private String notifyhost;
+}

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

 package com.clx.performance.config;
 
 import com.clx.performance.constant.RabbitKeyConstants;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
-import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.*;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -93,32 +91,32 @@ public class RabbitBeanConfig {
 
 
     /**
-     * 货单挂单队列
-     * @return
-     */
-    @Bean
-    public Queue orderGoodsOnQueue() {
-        Map<String, Object> params = new HashMap<>(6);
-        params.put("x-dead-letter-exchange", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE);
-        params.put("x-dead-letter-routing-key", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
-        return new Queue(RabbitKeyConstants.ORDER_GOODS_ON_QUEUE, true, false, false, params);
-    }
-
-    /**
-     * 货单挂单中交换机
-     **/
-    @Bean
-    public DirectExchange orderGoodsOnExchange() {
-        return new DirectExchange(RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE);
-    }
-
-    /**
-     * 货单挂单中绑定
-     */
-    @Bean
-    public Binding orderGoodsOnExchangeBind() {
-        return BindingBuilder.bind(orderGoodsOnQueue()).to(orderGoodsOnExchange()).with(RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY);
-    }
+//     * 货单挂单队列
+//     * @return
+//     */
+//    @Bean
+//    public Queue orderGoodsOnQueue() {
+//        Map<String, Object> params = new HashMap<>(6);
+//        params.put("x-dead-letter-exchange", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE);
+//        params.put("x-dead-letter-routing-key", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
+//        return new Queue(RabbitKeyConstants.ORDER_GOODS_ON_QUEUE, true, false, false, params);
+//    }
+//
+//    /**
+//     * 货单挂单中交换机
+//     **/
+//    @Bean
+//    public DirectExchange orderGoodsOnExchange() {
+//        return new DirectExchange(RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE);
+//    }
+//
+//    /**
+//     * 货单挂单中绑定
+//     */
+//    @Bean
+//    public Binding orderGoodsOnExchangeBind() {
+//        return BindingBuilder.bind(orderGoodsOnQueue()).to(orderGoodsOnExchange()).with(RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY);
+//    }
 
     /**
      * 死信队列：死信队列处理延迟消息货单挂单
@@ -133,19 +131,26 @@ public class RabbitBeanConfig {
      * 货单挂单中交换机：死信队列处理延迟消息
      **/
     @Bean
-    public DirectExchange orderGoodsOnDeadExchange() {
-        return new DirectExchange(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE);
+    public CustomExchange orderGoodsOnDeadExchange() {
+        Map<String, Object> arguments = new HashMap<>();
+        //设置路由模式 direct模式
+        arguments.put("x-delayed-type", "direct");
+        return new CustomExchange(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE,"x-delayed-message", true, false, arguments);
     }
 
     /**
      * 货单挂单中绑定:死信队列处理延迟消息
      */
+//    @Bean
+//    public Binding orderGoodsDeadExchangeBind() {
+//        return BindingBuilder.bind(orderGoodsOnDeadQueue()).to(orderGoodsOnDeadExchange()).with(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
+//    }
+    //绑定交换机,队列和routingKey
     @Bean
-    public Binding orderGoodsDeadExchangeBind() {
-        return BindingBuilder.bind(orderGoodsOnDeadQueue()).to(orderGoodsOnDeadExchange()).with(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
+    public Binding delayedQueueBindingDelayedExchange(@Qualifier("orderGoodsOnDeadQueue")Queue queue,@Qualifier("orderGoodsOnDeadExchange")CustomExchange customExchange) {
+        return BindingBuilder.bind(queue).to(customExchange).with(RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY).noargs();
     }
 
-
     /**
      * 订单取消队列
      * @return

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -2,20 +2,27 @@ package com.clx.performance.controller.app;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.OrderGoodsMapper;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.service.OrderGoodsService;
+import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @ClassName GoodsOrderController
  * @Description
@@ -28,14 +35,13 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/app/goodsOrder")
 @Validated
+@AllArgsConstructor
 @Api(tags = "APP-货单")
 public class AppGoodsOrderController {
 
-    @Autowired
-    OrderGoodsService orderGoodsService;
+    private final OrderGoodsService orderGoodsService;
 
-    @Autowired
-    OrderGoodsMapper orderGoodsMapper;
+    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
 
 
     @ApiOperation(value = "查看货单详情", notes = "<br>By:胡宇帆")
@@ -55,10 +61,9 @@ public class AppGoodsOrderController {
 
     }
 
-//    @ApiOperation(value = "专属货单", notes = "<br>By:胡宇帆")
-//    @PostMapping("/exclusiveOrderGoodsList")
-//    @UnitCovert(param = false)
-//    public Result<List<OrderGoodsVO>> exclusiveOrderGoodsList(@Validated @RequestBody OrderGoodsListParam orderGoodsListParam) {
-//        return Result.ok(orderGoodsService.openOrderPageGoodsList(orderGoodsListParam));
-//    }
+    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
+    @GetMapping("/getCancelOrderGoods")
+    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    }
 }

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

@@ -26,7 +26,7 @@ public class OrderCancelFeignController {
 
     private final OrderCancelService orderCancelService;
 
-    @ApiOperation(value = "货主端订单取消", notes = "<br>By:胡宇帆")
+    @ApiOperation(value = "承运单发起订单取消货主端进行确认", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
     public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
 //        OrderCancelParam cancelParam = new OrderCancelParam();
@@ -34,7 +34,7 @@ public class OrderCancelFeignController {
 //        cancelParam.setCancelType(3);
 //        cancelParam.setCreateByType(1);
 //        orderCancelService.platformCancelOrderPrePC(cancelParam);
-        orderCancelService.ownerCancelOrderPre(param.getOrderNo());
+        orderCancelService.ownerConfirmCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }
 }

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

@@ -4,16 +4,14 @@ import cn.hutool.json.JSONUtil;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.OwnerAccountService;
+import com.clx.performance.vo.pc.OwnerAccountAllVO;
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
@@ -40,4 +38,10 @@ public class OwnerAccountFeignController {
         ownerAccountService.ownerAccountThaw(param);
         return Result.ok();
     }
+
+    @ApiOperation(value = "查询用户预付运费和保证金账户", notes = "<br>By:胡宇帆")
+    @GetMapping("/accountInfo")
+    public Result<OwnerAccountAllVO> accountInfo(@RequestParam Long userNo) {
+        return Result.ok(ownerAccountService.accountInfo(userNo));
+    }
 }

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

+package com.clx.performance.controller.payment;
+
+import com.clx.performance.param.pay.NotifyString;
+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 java.util.Objects;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/payment/notify")
+@Validated
+@Api(tags = "承运端-支付回调")
+@AllArgsConstructor
+public class PayNotifyController {
+
+    @ApiOperation(value = "用户支付完成回调接口", notes = " <br>By:胡宁宁")
+    @RequestMapping(value = "/userPayNotify", method = RequestMethod.POST)
+    public Result<Object> userPayNotify(@RequestBody NotifyString notify) {
+        log.info("用户支付完成回调接口 传参 {}", notify);
+        if (Objects.isNull(notify) || Objects.isNull(notify.getCode()) || Objects.isNull(notify.getAction())) {
+            return new Result<>();
+        }
+        if (notify.getCode() != 0) {
+            // 支付失败处理
+            log.info("支付失败处理 唯一id {}", notify.getOrderNo());
+        } else {
+            // 支付支付成功处理
+            log.info(" 支付支付成功处理 唯一id {}", notify.getOrderNo());
+        }
+        Result<Object> ret = new Result<>();
+        return ret;
+    }
+
+}

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

@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.param.pc.OrderGoodsParams;
@@ -13,6 +14,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
+import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
@@ -20,6 +22,7 @@ import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -69,6 +72,9 @@ public class GoodsOrderController {
     @Autowired
     private GoodsOrderStrategyContext goodsOrderStrategyContext;
 
+    @Autowired
+    private OrderGoodsTruckBindService orderGoodsTruckBindService;
+
     @ApiOperation(value = "提交货单", notes = "<br>By:胡宇帆")
     @PostMapping("/saveGoodsOrder")
     @UnitCovert(result = false)
@@ -89,11 +95,11 @@ public class GoodsOrderController {
             goodsOrderStrategyContext.strategyContext.get(truckDemand).saveGoodsOrder(orderGoodsParams, orderInfo, now, rabbitTemplate);
 
         } catch (Exception e) {
-            log.error(ExceptionUtils.getStackTrace(e));
+            log.info(e.getMessage());
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
         } finally {
             try {
-                if (rLock != null && rLock.isLocked()) {
+                if (rLock != null && rLock.isLocked() && rLock.isHeldByCurrentThread()) {
                     rLock.unlock();
                 }
                 log.info("锁释放完成");
@@ -130,6 +136,7 @@ public class GoodsOrderController {
 
     @ApiOperation(value = "货单编辑查询", notes = "<br>By:胡宇帆")
     @GetMapping("/findOrderGoodsByBatchNumber")
+    @UnitCovert
     public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "id") Integer id){
         OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsById(id);
         return Result.ok(orderGoodsVO);
@@ -137,6 +144,7 @@ public class GoodsOrderController {
 
     @ApiOperation(value = "货单编辑提交", notes = "<br>By:刘海泉")
     @PostMapping("/updateEditOrderGoods")
+    @UnitCovert
     public Result<Object> updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {
         orderGoodsService.updateEditOrderGoods(param);
         return Result.ok();
@@ -188,4 +196,5 @@ public class GoodsOrderController {
         return Result.ok();
     }
 
+
 }

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

@@ -24,7 +24,6 @@ public class OrderCancelController {
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/platformCancelOrderPre")
     public Result<Object> platformCancelOrderPre(@RequestBody OrderCancelParam param) {
-        param.setCancelType(1);
         orderCancelService.platformCancelOrderPre(param);
         return Result.ok();
     }
@@ -32,7 +31,6 @@ public class OrderCancelController {
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
     public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
-        param.setCancelType(2);
         orderCancelService.ownerCancelOrderPre(param);
         return Result.ok();
     }

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

@@ -45,6 +45,7 @@ public class CarrierBreakContractOwnerRuleController {
         if (StringUtils.isBlank(param.getRule().get("A-b"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
         if (StringUtils.isBlank(param.getRule().get("A-c"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
         if (StringUtils.isBlank(param.getRule().get("A-d"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
+        if (StringUtils.isBlank(param.getRule().get("A-e"))){throw new ServiceSystemException(ResultCodeEnum.ILLEGAL_PARAMETER);};
 
         breakContractOwnerRuleService.saveRule(param);
 

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java

@@ -56,9 +56,9 @@ public class OwnerAccountController {
     @ApiOperation(value = "账户信息", notes = "<br>By:胡宇帆")
     @GetMapping("/accountInfo")
     @UnitCovert(param = false)
-    public Result<Map> accountInfo() {
+    public Result<OwnerAccountAllVO> accountInfo() {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        Map<String,OwnerAccountVO> result = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
+        OwnerAccountAllVO result = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
         return Result.ok(result);
     }
 

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

@@ -7,8 +7,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 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 javax.validation.constraints.NotBlank;
+
 
 /**
  * @Author: aiqingguo
@@ -51,4 +54,14 @@ public class TempController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "测试支付划账 (临时接口)", notes = "<br>By:胡宁宁")
+    @RequestMapping(value = "/paymentTest", method = RequestMethod.GET)
+    public Result<Void> paymentTest(@RequestParam("fromUser") @NotBlank(message = "扣款方") String fromUser,
+                                    @RequestParam("toUser") @NotBlank(message = "收款方") String toUser,
+                                    @RequestParam("figure") @NotBlank(message = "金额") String figure) {
+
+        tempService.paymentTest(fromUser,toUser,figure);
+
+        return Result.ok();
+    }
 }

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

@@ -95,8 +95,15 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
      */
     List<OrderChild> selectArriveSendOrderChild(String orderGoodsNo);
 
+    /**
+     * 查询到达货源地之后的运单
+     * @param orderGoodsNo
+     * @return
+     */
+    List<OrderChild> selectArriveSendOrderChildGe(String orderGoodsNo);
+
 
-    void batchUpdateOrderChildStatus(Integer status, List<Integer> ids);
+    void batchUpdateOrderChildStatus(Integer status, String remark, List<Integer> ids);
 
     List<OrderChild> selectOrderChildListByOrderGoodsNoAndStatusGE(String orderGoodsNo, Integer status);
 
@@ -104,8 +111,18 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     List<OrderChild> listOrderChildByOrderNoAndStatus(String orderNo,List<Integer> status);
 
+    /**
+     * 通过订单号查询在途运单
+     * @param orderNo
+     * @return
+     */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
+    /**
+     * 通过货单号查询在途运单
+     * @param orderGoodsNo
+     * @return
+     */
     List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo);
 
 }

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

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
@@ -38,6 +39,8 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus);
 
+    void updateOrderGoodsWeightResidueAndAlreadyAndStatus(Integer id, BigDecimal alreadyTransportWeight,BigDecimal residueTransportWeight,Integer orderGoodsStatus);
+
     IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListPageParam);
 
     IPage<OrderGoodsAPPVO> exclusiveOrderPageGoodsList(OrderGoodsListPageParam orderGoodsListPageParam, List<String> orderGoodsNoList);
@@ -71,11 +74,15 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     OrderGoodsVO findOrderGoodsById(Integer id);
 
-    List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos);
+    List<OrderGoods> selectListByOrderGoodsList(List<String> orderGoodsNo);
 
     Integer updateOrderGoods(OrderGoodsEditParams orderGoodsEditParams);
 
     boolean batchUpdateOrderGoodsStatus(Integer status, List<Integer> ids);
 
     boolean batchUpdateOrderGoodsWeight(BigDecimal residueWeight, List<Integer> ids);
+
+    List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo);
+
+    List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> list);
 }

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

@@ -33,6 +33,7 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList);
 
+    void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo);
 
     List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo);
 
@@ -44,4 +45,10 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
     List<OrderGoodsTruckBind>  judgeTruckIsBindDxOrder(Set<String> set);
 
     void deleteByIds(List<Integer> ids);
+
+    List<OrderGoodsTruckBind> selectCancelRecord(String orderGoodsNo, List<String> truckList);
+
+    List<OrderGoodsTruckBind> getCancelOrderGoods(List<String> truckList, String beginTime, String endTime);
+
+    void deleteByOrderGoods(String orderGoodsNo);
 }

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

+package com.clx.performance.dao;
+
+
+import com.clx.performance.mapper.ThirdPartRequestLogMapper;
+import com.clx.performance.model.ThirdPartRequestLog;
+import com.msl.common.dao.BaseDao;
+
+import java.util.List;
+
+public interface ThirdPartRequestLogDao extends BaseDao<ThirdPartRequestLogMapper, ThirdPartRequestLog, Integer> {
+
+    /**
+     * 查询发送请求失败的数据
+     *
+     * @param time
+     * @return
+     */
+    List<ThirdPartRequestLog> listThirdPartRequestLogError(String time);
+
+    /**
+     * 修改重试次数
+     *
+     * @param logId
+     * @param retryTimes
+     */
+    void updateLogRetryTimes(Integer logId, Integer retryTimes);
+}

performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractDriverRecordDao.java

@@ -11,6 +11,8 @@ import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractDriverRecord
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.time.LocalDateTime;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -20,7 +22,7 @@ public interface BreakContractDriverRecordDao extends BaseDao<BreakContractDrive
 
     boolean updateSettlementNo(BreakContractDriverRecord item);
 
-    Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo);
+    Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo, LocalDateTime time);
 
     IPage<BreakContractDriverRecordVO> pageByParam(PageBreakContractDriverRecordParam param);
     IPage<DriverBreakContractDriverRecordVO> driverPageByParam(DriverPageBreakContractDriverRecordParam param);

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

@@ -303,8 +303,17 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public void batchUpdateOrderChildStatus(Integer status, List<Integer> ids) {
-        baseMapper.updateOrderGoodsSetResidueWeight(status, ids);
+    public List<OrderChild> selectArriveSendOrderChildGe(String orderGoodsNo) {
+        //查询大于 40 未到达货源地的运单
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
+                .ge(OrderChild::getStatus, OrderChildEnum.Status.ARRIVE_SEND.getCode())
+                .le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
+        );
+    }
+
+    @Override
+    public void batchUpdateOrderChildStatus(Integer status, String remark, List<Integer> ids) {
+        baseMapper.updateOrderGoodsSetResidueWeight(status,remark, ids);
     }
 
     @Override
@@ -363,13 +372,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     @Override
     public List<OrderChild> selectInTransitOrderChild(String orderNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo, orderNo)
-                .lt(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNLOAD.getCode())
         );
     }
 
     @Override
     public List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
-                .lt(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNLOAD.getCode())
         );    }
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
@@ -78,6 +79,11 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         baseMapper.updateOrderGoodsWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
     }
 
+    @Override
+    public void updateOrderGoodsWeightResidueAndAlreadyAndStatus(Integer id, BigDecimal alreadyTransportWeight,BigDecimal residueTransportWeight,Integer orderGoodsStatus) {
+        baseMapper.updateOrderGoodsWeightResidueAndAlreadyAndStatus(id, alreadyTransportWeight, residueTransportWeight, orderGoodsStatus);
+    }
+
     @Override
     public IPage<OrderGoodsAPPVO> openOrderPageGoodsList(OrderGoodsListPageParam param) {
         Page<OrderGoodsAPPVO> page = Page.of(param.getPage(), param.getPageSize());
@@ -159,8 +165,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     @Override
     public boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status) {
         return update(lUdWrapper().eq(OrderGoods :: getGoodsId,orderGoodsId)
-                .set(OrderGoods :: getOrderGoodsStatus, status)
-                .set(OrderGoods::getResidueTransportWeight, BigDecimal.ZERO))
+                .set(OrderGoods :: getOrderGoodsStatus, status))
                 ;
     }
 
@@ -185,8 +190,8 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public List<OrderGoods> selectListByOrderGoodsList(List<String> orderNos) {
-        return baseMapper.selectList(lQrWrapper().in(OrderGoods::getOrderGoodsNo, orderNos));
+    public List<OrderGoods> selectListByOrderGoodsList(List<String> orderGoodsNo) {
+        return baseMapper.selectList(lQrWrapper().in(OrderGoods::getOrderGoodsNo, orderGoodsNo));
     }
 
     @Override
@@ -208,5 +213,20 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         );
     }
 
+    @Override
+    public List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoods::getOrderNo, orderNo)
+                .ne(OrderGoods::getOrderGoodsStatus, OrderGoodsStatusEnum.Status.SUCCESS.getCode())
+                .ne(OrderGoods::getOrderGoodsStatus, OrderGoodsStatusEnum.Status.CANCEL.getCode())
+                .ne(OrderGoods::getOrderGoodsStatus, OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+
+        );
+    }
+
+    @Override
+    public List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> param) {
+        return baseMapper.getCancelOrderGoods(param);
+    }
+
 
 }

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

 package com.clx.performance.dao.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -73,7 +74,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
         return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
     }
 
@@ -90,17 +91,23 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         update(lUdWrapper()
                 .set(OrderGoodsTruckBind::getStatus, code)
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .in(OrderGoodsTruckBind::getTruckNo, truckList)
-                .or()
+                .notIn(CollectionUtil.isNotEmpty(truckList), OrderGoodsTruckBind::getTruckNo, truckList)
+        );
+    }
+
+    @Override
+    public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, String truckNo) {
+        update(lUdWrapper()
+                .set(OrderGoodsTruckBind::getStatus, code)
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .eq(OrderGoodsTruckBind::getTruckNo, truckNo)
         );
     }
 
     @Override
     public List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .or()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
@@ -111,7 +118,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public void updateOrderGoodsBindStatusExpire(String orderGoodsNo) {
         update(lUdWrapper()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
-                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .set(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.EXPIRE.getCode())
         );
     }
@@ -124,7 +131,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         if(StringUtils.isNotBlank(truckNo)){
             query.eq(OrderGoodsTruckBind::getTruckNo, truckNo);
         }
-        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
+        query.in(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
         query.orderByDesc(OrderGoodsTruckBind :: getCreateTime);
         return baseMapper.selectList(query);
     }
@@ -133,7 +140,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public List<OrderGoodsTruckBind> judgeTruckIsBindDxOrder(Set<String> set) {
         LambdaQueryWrapper<OrderGoodsTruckBind> query = new LambdaQueryWrapper<>();
         query.in(OrderGoodsTruckBind::getTruckNo, set);
-        query.in(OrderGoodsTruckBind :: getStatus,OrderGoodsTruckBindEnum.Status.SUCCESS.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
+        query.in(OrderGoodsTruckBind :: getStatus,OrderGoodsTruckBindEnum.Status.NORMAL.getCode(),OrderGoodsTruckBindEnum.Status.GET.getCode());
         return baseMapper.selectList(query);
     }
 
@@ -141,4 +148,25 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     public void deleteByIds(List<Integer> ids) {
         baseMapper.deleteBatchIds(ids);
     }
+
+    @Override
+    public List<OrderGoodsTruckBind> selectCancelRecord(String orderGoodsNo, List<String> truckList) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .in(CollectionUtil.isNotEmpty(truckList), OrderGoodsTruckBind::getTruckNo, truckList)
+        );
+    }
+
+    @Override
+    public List<OrderGoodsTruckBind> getCancelOrderGoods(List<String> truckList, String beginTime, String endTime) {
+        return baseMapper.selectList(lQrWrapper().in(OrderGoodsTruckBind::getTruckNo, truckList)
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.CANCEL.getCode())
+                .le(OrderGoodsTruckBind::getCreateTime, endTime)
+                .ge(OrderGoodsTruckBind::getCreateTime, beginTime)
+        );
+    }
+
+    @Override
+    public void deleteByOrderGoods(String orderGoodsNo) {
+        baseMapper.delete(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo));
+    }
 }

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

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.SeniorLogisticsManagerDao;
+import com.clx.performance.dao.ThirdPartRequestLogDao;
+import com.clx.performance.enums.ThirdRequestStatusEnum;
+import com.clx.performance.enums.ThirdRequestTypeEnum;
+import com.clx.performance.mapper.SeniorLogisticsManagerMapper;
+import com.clx.performance.mapper.ThirdPartRequestLogMapper;
+import com.clx.performance.model.SeniorLogisticsManager;
+import com.clx.performance.model.ThirdPartRequestLog;
+import com.msl.common.base.Optional;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author kavin
+ * Date 2023-09-17
+ * Time 16:45
+ */
+@Repository
+public class ThirdPartRequestLogDaoImpl extends BaseDaoImpl<ThirdPartRequestLogMapper, ThirdPartRequestLog, Integer> implements ThirdPartRequestLogDao {
+
+    /**
+     * 查询发送请求失败的数据
+     *
+     * @param time
+     * @return
+     */
+    @Override
+    public List<ThirdPartRequestLog> listThirdPartRequestLogError(String time) {
+        return Optional.ofBlank(time)
+                .map(t -> lQrWrapper()
+                        .eq(ThirdPartRequestLog::getRequestType, ThirdRequestTypeEnum.SEND.getCode())
+                        .le(ThirdPartRequestLog::getRetryTimes, 5)
+                        .in(ThirdPartRequestLog::getStatus, ThirdRequestStatusEnum.HAVING.getCode())
+                        .le(ThirdPartRequestLog::getCreateTime, t))
+                .map(super::list)
+                .orElseGet(Collections::emptyList);
+    }
+
+    /**
+     * 修改重试次数
+     *
+     * @param logId
+     * @param retryTimes
+     */
+    @Override
+    public void updateLogRetryTimes(Integer logId, Integer retryTimes) {
+        super.update(lUdWrapper().eq(ThirdPartRequestLog::getId, logId)
+                .set(ThirdPartRequestLog::getRetryTimes, retryTimes));
+    }
+
+}
\ No newline at end of file

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

@@ -14,6 +14,8 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -31,11 +33,12 @@ public class BreakContractDriverRecordDaoImpl extends BaseDaoImpl<BreakContractD
     }
 
     @Override
-    public Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo) {
+    public Optional<BreakContractDriverRecord> selectLastLimitTimeByDriverUserNo(Long driverUserNo, LocalDateTime time) {
         return Optional.of(driverUserNo)
                 .map(item -> lQrWrapper()
                         .eq(BreakContractDriverRecord::getDriverUserNo, item)
                         .isNotNull(BreakContractDriverRecord::getLimitTime)
+                        .ge(BreakContractDriverRecord::getLimitTime, time)
                         .orderByDesc(BreakContractDriverRecord::getLimitTime)
                         .last("limit 1")
                 )

performance-web/src/main/java/com/clx/performance/encryption/oldmsl/PayEncryptTools.java

+package com.clx.performance.encryption.oldmsl;
+
+
+import com.clx.performance.param.pc.payment.FreezeUnitDTO;
+import com.clx.performance.param.pc.payment.PayUnitDTO;
+
+import java.util.List;
+
+/**
+ * 
+ * @author xujianke
+ * @date 2017年4月18日
+ * @description
+ */
+public class PayEncryptTools {
+	/**
+	 * 生成签名,签名结果直接赋值到PayUnitDTO签名字段
+	 * @param
+	 * @param privateKeyBytes
+	 * @return 签名是否成功
+	 */
+	public static boolean sign(PayUnitDTO payDTO, byte[] privateKeyBytes){
+		if(payDTO == null ){//参数错误
+			return false;
+		}
+		byte[] data=makeByte(payDTO);
+		String sign = RSACoder.sign(data, privateKeyBytes);
+		if(sign == null){//签名失败
+			return false;
+		}
+		payDTO.setSignature(sign);
+		return true;
+	}
+	
+	/**
+	 * 生成签名,签名结果直接赋值到FreezeUnitDTO签名字段
+	 * @param freezeDTO
+	 * @param privateKeyBytes
+	 * @return 签名是否成功
+	 */
+	public static boolean sign(FreezeUnitDTO freezeDTO, byte[] privateKeyBytes){
+		if(freezeDTO == null ){//参数错误
+			return false;
+		}
+		byte[] data=makeByte(freezeDTO);
+		String sign = RSACoder.sign(data, privateKeyBytes);
+		if(sign == null){//签名失败
+			return false;
+		}
+		freezeDTO.setSignature(sign);
+		return true;
+	}
+	/**
+	 * 验证签名
+	 * @param payDTO
+	 * @param publicKeyBytes
+	 * @return
+	 */
+	public static boolean verify(PayUnitDTO payDTO, byte[] publicKeyBytes){
+		if(payDTO == null || payDTO.getSignature() == null){
+			//参数错误
+			return false;
+		}
+		byte[] data=makeByte(payDTO);
+		return RSACoder.verify(data, publicKeyBytes, payDTO.getSignature());
+	}
+	/**
+	 * 验证签名
+	 * @param freezeDTO
+	 * @param publicKeyBytes
+	 * @return
+	 */
+	public static boolean verify(FreezeUnitDTO freezeDTO, byte[] publicKeyBytes){
+		if(freezeDTO == null || freezeDTO.getSignature() == null){
+			//参数错误
+			return false;
+		}
+		byte[] data=makeByte(freezeDTO);
+		return RSACoder.verify(data, publicKeyBytes, freezeDTO.getSignature());
+	}
+	/**
+	 * 组装需要签名的字符串
+	 * @param payDTO
+	 * @return 字符串的字节数组
+	 */
+	public static byte[] makeByte(PayUnitDTO payDTO){
+		StringBuilder sb = new StringBuilder();
+		sb.append(payDTO.getFigure());
+		sb.append(':').append(payDTO.getId());
+		sb.append(':').append(payDTO.getFrom());
+		sb.append(':').append(payDTO.getTimestamp());
+		sb.append(':').append(payDTO.getTo());
+		sb.append(':').append(payDTO.getType());
+		String text = sb.toString();
+		return text.getBytes();
+	}
+	/**
+	 * 组装需要签名的字符串
+	 * @param freezeDTO
+	 * @return 字符串的字节数组
+	 */
+	public static byte[] makeByte(FreezeUnitDTO freezeDTO){
+		StringBuilder sb = new StringBuilder();
+		sb.append(freezeDTO.getAction());
+		sb.append(':').append(freezeDTO.getFigure());
+		sb.append(':').append(freezeDTO.getFee());
+		sb.append(':').append(freezeDTO.getFeeType());
+		sb.append(':').append(freezeDTO.getFreezeNo());
+		sb.append(':').append(freezeDTO.getTimestamp());
+		if(freezeDTO.getReturnFee() != null){
+			sb.append(':').append(freezeDTO.getReturnFee());
+		}
+		String text = sb.toString();
+		return text.getBytes();
+	}
+	/**
+	 * 批量签名
+	 * @param privateKeyBytes
+	 * @return 成功签名的个数
+	 */
+	public static int signBatch(List<PayUnitDTO> list, byte[] privateKeyBytes){
+		int count = 0;
+		boolean b;
+		for(PayUnitDTO payDTO:list){
+			b = sign(payDTO, privateKeyBytes);
+			if(b){
+				count++;
+			}
+		}
+		return count;
+	}
+	/**
+	 * 批量验证签名
+	 * @param publicKeyBytes
+	 * @return
+	 */
+	public static int verifyBatch(List<PayUnitDTO> list, byte[] publicKeyBytes){
+		boolean ret = true;
+		int i;
+		PayUnitDTO payDTO;
+		for(i= 0; i<list.size();i++){
+			payDTO = list.get(i);
+			ret = verify(payDTO,publicKeyBytes);
+			if(!ret){
+				break;
+			}
+		}
+		return i;
+	}
+}

performance-web/src/main/java/com/clx/performance/encryption/oldmsl/PrivateKeyConfig.java

+package com.clx.performance.encryption.oldmsl;
+
+import org.bouncycastle.util.encoders.Base64;
+
+/**
+ * 加密使用的私钥配置类（等于商户的）
+ */
+public class PrivateKeyConfig {
+	
+	/** 非对称加密RSA私钥 私钥长度1024字节 单次最多加密53个字符 
+	 *  对应公钥为 SecretConfig.PAYMENT_PUBLIC_KEY
+	 * */
+	private static final String privateKey="MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOT9q9k4SE5s"
+			+ "RC1xOtbRzKCwPa2Zp0j9/IGGQ1DUQzhJ1dtMaOzUs66ddMTokoG7nzUyFk8+50QbSb8AQTd+CoGa47oM4P48W9n91"
+			+ "fAsA1QHpSv4cBrVRbkZv77/XCPZgibnGSoP3IdaMp/GTGwUVnNuUtszNglG8mRB/IFLWMNLAgMBAAECgYBc0eqHuU"
+			+ "Wt7DrShLRKAW7Fr8rAhKkHcFSbGBZPPEsnFN7H7rgVT76pyA9eBbvlNG07fdsHMkNCGyGQd4T3/nI5BH/xwgT7P4E"
+			+ "pYy8PnyrIj185CEY7VplgH4l9cHPMcY8pKCwJZjbHBUlgS6ZCA3+DRB7c+7MZZiV/DX2Ay3IBeQJBAPdlTO7i9ncr"
+			+ "QWMI7So6byt9OSHQz6Gxdml6YS51gQTFKTCMc8n45yAhr7D7XxhgHSDqkSCmkcWkLlKm15XXkvUCQQDs9ICzCWE+I"
+			+ "viGhVNu2XZQwMiMLQZoC1go+ZBo0mPoxt8YDWVBJ+PqJ4y1fkASKQTdphuoEtpqCx4mzGAL15U/AkA6BiVcJhlea+"
+			+ "PDIZXWgKwQTCd5Oeto5iF6rbxbVC31e3SksVx684jp7VyyqtJr+ib60GlHeinYbCB9PCp2N4B9AkEAtJLTbRzNzUN"
+			+ "rL2B1J3lzL7DqY+CADFPw2DDvOuJyHtdG9hZnPlL+3ddL5JeUjgJSYfMPCnNrnPph/OEspHmikwJAIcOTlQmik37h"
+			+ "BsaoRTEoJG4X5NrqGx5apjXwkIbf4jjfMP4TdyZBX73yjWKNbPdXLd7Aixoqam5CP0nUg3uWKg==";
+	public static final byte[] privateKeyByte = Base64.decode(privateKey);
+}

performance-web/src/main/java/com/clx/performance/encryption/oldmsl/SystemCodeEnum.java

+package com.clx.performance.encryption.oldmsl;
+/**
+ *  业务系统编码枚举类
+ * @author xujianke
+ * @date 2017年4月21日
+ * @description
+ */
+public enum SystemCodeEnum {
+	USER_SERVICE(1,"用户服务"),ORDER_SERVICE(2,"订单服务"),PAYMENT_SERVICE(3,"支付服务"),
+	MESSAGE_SERVICE(4,"消息服务"),MANAGE_SERVICE(5,"管理服务"),MERCHANT_SERVICE(6,"商户服务"),
+	TRADE_SERVICE(7,"交易平台服务"),AUCTION_SERVICE(8,"竞拍服务"),PERFORMANCE_SERVICE(9,"履约服务");
+	// 成员变量
+	private String msg;
+	private int code;
+
+	// 构造方法
+	private SystemCodeEnum(int code, String msg) {
+		this.msg = msg;
+		this.code = code;
+	}
+
+	// 普通方法
+	public static String getMsg(int code) {
+		for (SystemCodeEnum c : SystemCodeEnum.values()) {
+			if (c.getCode() == code) {
+				return c.msg;
+			}
+		}
+		return null;
+	}
+	
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+}

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum HttpEnum {
+
+    PERFORMANCE_PAY_CLX_PAYMENT(10000, "履约服务向老马上来发起钱包转账","/payment-service/performance/payUserWalletTransfer"),
+    ;
+
+    private final int code;
+    private final String mark;
+    private final String url;
+
+    public static HttpEnum getMsg(int code) {
+        for (HttpEnum httpEnum : HttpEnum.values()) {
+            if (httpEnum.getCode() == code) {
+                return httpEnum;
+            }
+        }
+        return null;
+    }
+}

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

+package com.clx.performance.enums;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Created by cuiwanzhe on 2017/6/2.
+ * 支付备注枚举
+ */
+public enum PayRemarkEnum {
+    OWNER_CREDIT(1, "货主冻结押金"),
+    DRIVER_CREDIT(2, "司机冻结押金"),
+    OWNER_FREIGHT(3, "货主冻结运费"),
+    OWNER_INSURANCE(4, "货主冻结保险"),
+    DRIVER_UNFREEZE(5, "司机解冻押金"),
+    INSURANCE_UNFREEZE(6, "解冻保险到系统账户"),
+    COMPENSATION_TO_DRIVER(7, "司机赔偿货主"),
+    FREIGHT_TO_OWNER(8, "货主支付运费给司机"),
+    UPDATE_FREIGHT(9, "修正运费"),
+    UPDATE_INSURANCE(10, "修正保险"),
+    OWNER_UNFREEZE(11, "解冻货主的押金"),
+    DRIVER_SALE(12, "冻结司机的消费"),
+    DRIVER_SALE_UNFREEZE(13, "司机支付货款给货主"),
+    //v78 解冻保险
+    UNFREEZE_INSURANCE(14, "解冻保险"),
+    ;
+
+    private static Map<Integer, String> map = new ConcurrentHashMap<>();
+    static {
+        for(PayRemarkEnum payRemarkEnum : PayRemarkEnum.values()){
+            map.put(payRemarkEnum.getValue(), payRemarkEnum.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 PayRemarkEnum(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-web/src/main/java/com/clx/performance/enums/PayUnitTypeEnum.java

+package com.clx.performance.enums;
+
+public enum PayUnitTypeEnum {
+	FREEZE(100,"冻结"),
+	FREEZE_OWNER_DEPOSIT(101,"冻结货主保证金"),FREEZE_FREIGHT(102,"冻结货主运费"),FREEZE_DRIVER_DEPOSIT(103,"冻结司机保证金"),
+	FREEZE_INSURANCE_FEE(104,"冻结货物担保"),FREEZE_PLATFORM_FEE(105,"冻结平台信息费"),FREEZE_WITHDRAW_DEPOSIT(106,"冻结提现金额"),
+	FREEZE_SALE(107,"冻结货款"),FREEZE_SETTLEMENT_FEE(108,"冻结提现手续费"),FREEZE_SETTLEMENT_MER(109, "冻结子钱包提现金额"),
+	FREEZE_SETTLEMENT_MER_FEE(110,"冻结提现手续费"),FREEZE_TRANSFER_WITHDRAW_DEPOSIT(111,"冻结转账提现金额"),FREEZE_TRANSFER_DEPOSIT(112,"转账收入"),
+	FREEZE_TRADE_DEPOSIT(113,"冻结交易平台保证金"),FREEZE_TRADE_PAYMENT_GOODS(114,"冻结交易平台货款"),
+	FREEZE_OIL_DRIVER_TO_MERCHANT(115,"冻结司机余额给商户用于加油"),FREEZE_AUCTION_DEPOSIT(116,"冻结竞拍保证金"),
+	FREEZE_GROUP_SIGN_UP_DEPOSIT(117,"集采集销的保证金冻结"),FREEZE_WALLET_CARD(118,"消费卡消费到钱包冻结"),FREEZE_MERCHANT_CARD(119,"消费卡消费到商户冻结"),
+	FREEZE_ORDER_CHILD(120, "冻结提现金额-运费自动提现"),
+	
+	UNFREEZE(200,"解冻"),
+	UNFREEZE_OWNER_DEPOSIT(201,"解冻货主保证金"),UNFREEZE_FREIGHT(202,"解冻货主运费"),UNFREEZE_DRIVER_DEPOSIT(203,"解冻司机保证金"),
+	UNFREEZE_INSURANCE_FEE(204,"解冻货物担保"),UNFREEZE_PLATFORM_FEE(205,"解冻平台信息费"),UNFREEZE_WITHDRAW_DEPOSIT(206,"解冻提现金额"),
+	UNFREEZE_SALE(207,"解冻货款"),UNFREEZE_SETTLEMENT_FEE(208,"解冻提现手续费"),UNFREEZE_SETTLEMENT_MER(209, "解冻子钱包提现金额"),
+	UNFREEZE_SETTLEMENT_MER_FEE(210,"解冻提现手续费"),UNFREEZE_TRANSFER_DEPOSIT(212,"解冻转账收入"),
+	UNFREEZE_TRADE_DEPOSIT(213,"解冻交易平台保证金"),UNFREEZE_TRADE_PAYMENT_GOODS(214,"解冻交易平台货款"),
+	UNFREEZE_OIL_DRIVER_TO_MERCHANT(215,"解冻司机余额给商户用于加油"),UNFREEZE_AUCTION_DEPOSIT(216,"解冻竞拍保证金"),
+	UNFREEZE_FREEZE_GROUP_SIGN_UP_DEPOSIT(217,"集采集销的保证金冻结解冻"),UNFREEZE_WALLET_CARD(218,"消费卡消费到钱包解冻"),UNFREEZE_MERCHANT_CARD(219,"消费卡消费到商户解冻"),
+
+	FREEZE_PAY(300,"从冻结支付"),
+	FREEZE_PAY_OWNER_DEPOSIT(301,"支付货主保证金"),FREEZE_PAY_FREIGHT(302,"支付货物运费"),
+	FREEZE_PAY_DRIVER_DEPOSIT(303,"支付司机保证金"),FREEZE_PAY_INSURANCE_FEE(304,"支付货物担保"),
+	FREEZE_PAY_PLATFORM_FEE(305,"支付平台信息费"),FREEZE_PAY_WITHDRAW_DEPOSIT(306,"支付提现金额"),
+	FREEZE_PAY_SALE(307,"支付货款"),FREEZE_PAY_SETTLEMENT_FEE(308,"支付提现手续费"),
+	FREEZE_PAY_SETTLEMENT_MER(309, "支付子钱包提现金额"),FREEZE_PAY_SETTLEMENT_MER_FEE(310, "支付子钱包手续费"),
+	FREEZE_PAY_TRANSFER_WITHDRAW_DEPOSIT(311,"支付余额转账提现金额"),FREEZE_PAY_TRANSFER_DEPOSIT(312,"支付转账收入"),
+	FREEZE_PAY_TRADE_DEPOSIT(313,"保证金冻结"),FREEZE_PAY_TRADE_PAYMENT_GOODS(314,"货款扣款"),
+	FREEZE_PAY_OIL_DRIVER_TO_MERCHANT(315,"消费"),FREEZE_PAY_AUCTION_DEPOSIT(316,"竞拍保证金冻结"),
+	FREEZE_PAY_GROUP_SIGN_UP_DEPOSIT(317,"集采集销的保证金冻结"),FREEZE_PAY_WALLET_CARD(318,"消费"),FREEZE_PAY_MERCHANT_CARD(319,"消费"),
+	FREEZE_PAY_ORDER_CHILD(320, "自动支付提现金额"),
+
+	FREEZE_MODIFY(400,"修正冻结资金"),
+	FREEZE_MODIFY_OWNER_DEPOSIT(401,"修正货主保证金"),FREEZE_MODIFY_FREIGHT(402,"修正货主运费"),
+	FREEZE_MODIFY_DRIVER_DEPOSIT(403,"修正司机保证金"),FREEZE_MODIFY_INSURANCE_FEE(404,"修正货物担保"),
+	FREEZE_MODIFY_PLATFORM_FEE(405,"修正平台信息费"),FREEZE_MODIFY_WITHDRAW_DEPOSIT(406,"修正提现金额"),
+	FREEZE_MODIFY_SALE(407,"修正货款"),FREEZE_MODIFY_SETTLEMENT_FEE(408,"修正提现手续费"),
+	FREEZE_MODIFY_SETTLEMENT_MER(409, "修正子钱包提现金额"),	FREEZE_MODIFY_SETTLEMENT_MER_FEE(410, "修正子钱包提现手续费"),
+	FREEZE_MODIFY_TRANSFER_DEPOSIT(412,"修正转账收入"),FREEZE_MODIFY_TRADE_PAYMENT_GOODS(414,"修正交易平台冻结货款"),
+	
+	RESIDUE_PAY(500,"余额支付"),RESIDUE_ACTIVITY_RETURN(502,"余额活动返现"),RESIDUE_ACTIVITY_RETURN_CARD(503,"余额活动返现到消费卡"),
+	/** 支付违约金 */
+	RESIDUE_PAY_DEFAULT(501,"支付违约金"),
+	
+	CARD_PAY(600,"消费卡支付到钱包"),CARD_PAY_WALLET(601,"消费卡支付到子钱包"),
+	SYSTEM_PAY(701, "系统支付到用户余额"),SYSTEM_PAY_CARD(702, "系统支付到用户消费卡"),SYSTEM_ACTIVITY_PAY(703, "系统活动返现到余额"),
+
+
+	;
+	// 成员变量
+	private String msg;
+	private int code;
+
+	// 构造方法
+	private PayUnitTypeEnum(int code, String msg) {
+		this.msg = msg;
+		this.code = code;
+	}
+
+	// 普通方法
+	public static String getMsg(int code) {
+		for (PayUnitTypeEnum c : PayUnitTypeEnum.values()) {
+			if (c.getCode() == code) {
+				return c.msg;
+			}
+		}
+		return null;
+	}
+	
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+}

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

@@ -7,6 +7,7 @@ import com.clx.performance.enums.RoleEnum;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,29 +20,17 @@ import java.util.Objects;
  */
 @Slf4j
 @Component
+@AllArgsConstructor
 public class OrderCancelHandler {
 
-    @Autowired
-    private OrderCancelService orderCancelService;
-
-    @Autowired
-    private BreakContractSettlementOwnerService breakContractSettlementOwnerService;
-
+    private final OrderCancelService orderCancelService;
 
 
     @RabbitListener(queues = RabbitKeyConstants.ORDER_CANCEL_QUEUE)
     public void onMessage(String message) {
         log.info("处理订单取消监听器执行,订单No为{}", message);
         OrderCancelParam param = JSONUtil.toBean(message, OrderCancelParam.class);
-        if (ObjectUtil.equals(param.getCancelType(), 1)) {
-            orderCancelService.orderCancelProcess(param);
-        } else {
-            orderCancelService.orderCancelProcess(param);
-        }
-//        //货主端取消订单进行违约计费
-//        if(Objects.equals(param.getCreateByType(), RoleEnum.Type.OWNER)){
-//            breakContractSettlementOwnerService.saveSettlementOwnerForCancelOrder(param.getOrderNo());
-//        }
+        orderCancelService.orderCancelProcess(param);
 
     }
 }

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

@@ -42,9 +42,14 @@ public class RabbitOrderGoodsStatusOnHandler {
             orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.PAYING.getCode());
 
             // 添加积分货单
-            integralMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo(),
-                    orderGoods.getSendAddressId(), orderGoods.getSendAddressShorter(),
-                    orderGoods.getReceiveAddressId(), orderGoods.getReceiveAddressShorter());
+            try {
+                integralMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo(),
+                        orderGoods.getSendAddressId(), orderGoods.getSendAddressShorter(),
+                        orderGoods.getReceiveAddressId(), orderGoods.getReceiveAddressShorter());
+            }catch (Exception e) {
+                e.printStackTrace();
+            }
+
 
         }
     }

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

@@ -47,5 +47,5 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     int countValidByOrderGoodsNo(String orderGoodsNo);
 
     @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateOrderChildStatus")
-    Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "ids") List<Integer> ids);
+    Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "remark") String remark, @Param(value = "ids") List<Integer> ids);
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.clx.performance.mapper;
 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.OrderGoodsTruckBind;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
@@ -42,6 +43,14 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
             " where id = #{id}")
     void updateOrderGoodsWeightAndStatus(@Param("id") Integer id, @Param("weight") BigDecimal orderChildWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);
 
+    @Update(" update order_goods set " +
+            " residue_transport_weight = residue_transport_weight-#{residueTransportWeight}," +
+            " already_transport_weight = already_transport_weight+#{alreadyTransportWeight}," +
+            "order_goods_status = #{orderGoodsStatus} " +
+            " where id = #{id}")
+    void updateOrderGoodsWeightResidueAndAlreadyAndStatus(@Param("id") Integer id, @Param("alreadyTransportWeight") BigDecimal alreadyTransportWeight, @Param("residueTransportWeight") BigDecimal residueTransportWeight,@Param("orderGoodsStatus") Integer orderGoodsStatus);
+
+
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "openOrderPageGoodsList")
     IPage<OrderGoodsAPPVO> openOrderPageGoodsList(Page<OrderGoodsAPPVO> page);
 
@@ -66,8 +75,11 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     OrderGoodsVO findOrderGoodsById(Integer id);
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods")
-    Integer updateOrderGoods(@Param(value = "param") OrderGoodsEditParams orderGoodsEditParams);
+    Integer updateOrderGoods(@Param(value = "params") OrderGoodsEditParams orderGoodsEditParams);
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus")
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
+
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getCancelOrderGoods")
+    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<OrderGoodsTruckBind> param);
 }

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

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.ThirdPartRequestLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ThirdPartRequestLogMapper extends BaseMapper<ThirdPartRequestLog> {
+
+}

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

+package com.clx.performance.model;
+
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("third_part_request_log")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ThirdPartRequestLog implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "请求id")
+    private String requestId;
+
+    @ApiModelProperty(value = "应用编号")
+    private Long appNo;
+
+    @ApiModelProperty(value = "请求类型: 1-发送请求；2-接收请求")
+    private Integer requestType;
+
+    @ApiModelProperty(value = "操作类型")
+    private String action;
+
+    @ApiModelProperty(value = "请求地址")
+    private String url;
+
+    @ApiModelProperty(value = "请求参数（JSON格式）")
+    private String requestContent;
+
+    @ApiModelProperty(value = "返回数据（JSON格式）")
+    private String responseContent;
+
+    @ApiModelProperty(value = "返回状态码")
+    private Integer statusCode;
+
+    @ApiModelProperty(value = "状态: 0-请求中,1-成功,2-失败")
+    private Integer status;
+
+    @ApiModelProperty(value = "重试次数")
+    private Integer retryTimes;
+
+    @ApiModelProperty(value = "其他字段")
+    private String otherFields;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime modifiedTime;
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}

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

@@ -4,13 +4,13 @@ import com.clx.performance.param.pc.OrderCancelParam;
 
 public interface OrderCancelService {
 
-//    void platformCancelOrderPre(String orderNo);
-//
-//    void platformCancelOrder(String orderNo);
-//
-    void ownerCancelOrderPre(String orderNo);
-//
-    void ownerCancelOrder(String orderNo);
+    /**
+     * 承运端取消订单，货主同意调用此接口
+     * @param orderNo
+     */
+    void ownerConfirmCancelOrderPre(String orderNo);
+
+    void ownerConfirmCancelProcess(String orderNo);
 
     /**
      * 货主取消订单前置（只修改订单状态）
@@ -30,4 +30,10 @@ public interface OrderCancelService {
      */
     void orderCancelProcess(OrderCancelParam param);
 
+    /**
+     * 客服取消
+     * @param orderChildNo
+     */
+    void artificialCancelOrder(String orderChildNo);
+
 }

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

@@ -77,4 +77,5 @@ public interface OrderChildService {
      * @return
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
+
 }

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

@@ -29,7 +29,7 @@ public interface OrderGoodsService {
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 
-    void updateOrderGoodsReduceWeightAndStatus(Integer id, BigDecimal orderChildWeight, Integer orderGoodsStatus);
+    void updateOrderGoodsReduceWeightAndStatusAmountLoad(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus);
     void updateOrderGoodsReduceWeightAndStatus(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus);
 
     IPage<OrderGoodsAPPVO> indexOrderGoodsList(OrderGoodsListPageParam orderGoodsListParam);

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

 package com.clx.performance.service;
 
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
+
 import java.util.List;
 
 public interface OrderGoodsTruckBindService {
+
     List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
+
+    List<OrderGoodsAPPVO> getCancelOrderGoods(Long userNo);
+
+    void updateCancelTruckBind(String orderGoodsNo);
 }

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

@@ -9,6 +9,7 @@ import com.clx.performance.param.pc.*;
 import com.clx.performance.param.pc.owner.CreteAccountParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
+import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
@@ -25,7 +26,7 @@ public interface OwnerAccountService {
 
     IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
 
-    Map<String,OwnerAccountVO> accountInfo(Long ownerUserNo);
+    OwnerAccountAllVO accountInfo(Long ownerUserNo);
 
     Long accountTopUp(OwnerTopUpParam param);
 

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

+package com.clx.performance.service;
+
+
+import com.clx.performance.param.pc.payment.PayParam;
+import com.msl.common.result.Result;
+
+public interface PaymentService {
+
+    Result paymentWallet( PayParam noCheckPwd);
+}

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

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

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

+package com.clx.performance.service;
+
+import com.clx.performance.model.ThirdPartRequestLog;
+import com.msl.common.base.Optional;
+import com.msl.common.result.Result;
+
+public interface ThirdPartRequestLogService {
+
+    /**
+     * 保存第三方接口调用记录
+     *
+     * @param log
+     */
+    void save(ThirdPartRequestLog log);
+
+    /**
+     * 修改第三方接口返回值
+     *
+     * @param logId
+     * @param result
+     */
+    void updateResult(Integer logId, Result<?> result);
+
+    /**
+     * 修改重试次数
+     *
+     * @param logId
+     * @param retryTimes
+     */
+    void updateLogRetryTimes(Integer logId, Integer retryTimes);
+
+    /**
+     * 根据id 查询
+     */
+    Optional<ThirdPartRequestLog> getById(Integer id);
+}

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractSettlementOwnerService.java

@@ -8,6 +8,8 @@ import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractS
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
+import java.math.BigDecimal;
+
 /**
  * @author liruixin
  * Date 2023-10-24
@@ -38,7 +40,7 @@ public interface BreakContractSettlementOwnerService  {
 
     void saveSettlementOwnerForTonnageDown(OrderAdjustTonnageDownParam param);
 
-    void saveSettlementOwnerForCancelOrder(String orderNo);
+    void saveSettlementOwnerForCancelOrder(BigDecimal transportWeight, BigDecimal validFreightPrice, String orderNo, Integer cancelType);
 
     SettlementPlatformAccountVO getCarrierSettlementPlatformAccount(Integer id);
 

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

@@ -151,7 +151,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
             status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
         }
 
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, status);
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
     }
 
     /**

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

@@ -288,10 +288,19 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setTruckModel(driverTruckInfo.getModel());
 
         Integer overWeight = orderInfo.getOverWeight();
+
         if(Objects.equals(overWeight,OrderGoodsOverWeightEnum.NO.getCode())){
-            orderChild.setWeight(new BigDecimal(33));
-        }else{
-            orderChild.setWeight(new BigDecimal(50));
+            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(33)) < 0) {
+                orderChild.setWeight(orderGoods.getResidueTransportWeight());
+            } else {
+                orderChild.setWeight(new BigDecimal(33));
+            }
+        } else{
+            if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal(50)) < 0) {
+                orderChild.setWeight(orderGoods.getResidueTransportWeight());
+            } else {
+                orderChild.setWeight(new BigDecimal(50));
+            }
         }
         //orderChild.setWeight(orderChild.getTruckLoad());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
@@ -465,9 +474,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
         }
         // 装货超时
-        if (orderChild.getLoadDeadline().isBefore(LocalDateTime.now())) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIMEOUT);
-        }
+//        if (orderChild.getLoadDeadline().isBefore(LocalDateTime.now())) {
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIMEOUT);
+//        }
 
         // 距离验证
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(
@@ -648,6 +657,10 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         BigDecimal dif = param.getLoadNet().subtract(orderChild.getWeight());
 
+        if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+        }
+
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(param.getLoadNet());
@@ -788,6 +801,9 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 更新出车状态
         updateDriverOrderStatusUnload(orderChild.getDriverUserNo(), orderChild.getTruckId());
+
+        //释放车辆
+        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
     }
 
     private void updateReUnload(OrderChildUnloadParam param, OrderChild orderChild) {
@@ -1334,7 +1350,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
         }
 
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), orderChild.getWeight().negate(),
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, orderChild.getWeight().negate(),
                 status);
     }
 
@@ -1346,9 +1362,10 @@ public class OrderChildServiceImpl implements OrderChildService {
             return;
         }
 
+
         Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
 
-        orderGoodsService.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, status);
+        orderGoodsService.updateOrderGoodsReduceWeightAndStatusAmountLoad(orderGoods, dif, status);
     }
 
     /**
@@ -1405,7 +1422,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 司机接单限制
      */
     private void driverTakeOrderLimit(Long driverUserNo){
-        Optional<BreakContractDriverRecord> limitOptional = breakContractDriverRecordDao.selectLastLimitTimeByDriverUserNo(driverUserNo);
+        Optional<BreakContractDriverRecord> limitOptional = breakContractDriverRecordDao.selectLastLimitTimeByDriverUserNo(driverUserNo, LocalDateTime.now());
         if (limitOptional.isPresent()){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_DRIVER_TAKE_ORDER_TIME_LIMIT,
                     PerformanceResultEnum.ORDER_CHILD_DRIVER_TAKE_ORDER_TIME_LIMIT.getMsg()+LocalDateTimeUtils.convertLocalDateTimeToString(limitOptional.get().getLimitTime(), "yyyy-MM-dd HH:mm"));
@@ -1862,6 +1879,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildDao.selectInTransitOrderChild(orderNo);
     }
 
+
     /**
      * @return
      * @Author kavin

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

 package com.clx.performance.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.service.OrderGoodsTruckBindService;
+import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.user.feign.TruckFeign;
+import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
+import com.msl.common.exception.ServiceSystemException;
+import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
+@AllArgsConstructor
+@Slf4j
 public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindService {
 
-    @Autowired
-    private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
+    private final OrderGoodsTruckBindDao orderGoodsTruckBindDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
+    private final TruckFeign truckFeign;
+
+    private final OrderChildDao orderChildDao;
+
     @Override
     public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
         return orderGoodsTruckBindDao.getTrucksByOrderGoodsNo(orderGoodsNo);
     }
+
+    @Override
+    public List<OrderGoodsAPPVO> getCancelOrderGoods(Long userNo) {
+        Result<List<DriverTruckAppVo>> result = truckFeign.driverTruckList(userNo);
+        if (!result.succeed() || CollectionUtil.isEmpty(result.getData())) {
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+        List<String> truckList = result.getData().stream().map(DriverTruckAppVo::getTruckNo).collect(Collectors.toList());
+
+        LocalDateTime now = LocalDateTime.now();
+
+        List<OrderGoodsTruckBind> list = orderGoodsTruckBindDao.getCancelOrderGoods(truckList,
+                DateUtils.formatDateTime(now.plusDays(-3), "yyyy-MM-dd HH:mm:ss").get(),
+                DateUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss").get());
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+
+        return orderGoodsDao.getCancelOrderGoods(list);
+    }
+
+
+    @Override
+    public void updateCancelTruckBind(String orderGoodsNo) {
+        List<OrderChild> arriveSendOrderChild = orderChildDao.selectArriveSendOrderChildGe(orderGoodsNo);
+        List<String> truckList = null;
+        if (CollectionUtils.isNotEmpty(arriveSendOrderChild)) {
+            truckList = arriveSendOrderChild.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
+        }
+        orderGoodsTruckBindDao.updateOrderGoodsBindStatus(orderGoodsNo, OrderGoodsTruckBindEnum.Status.CANCEL.getCode(), truckList);
+
+//            List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectCancelRecord(orderGoodsNo, truckList);
+//            if (CollectionUtils.isNotEmpty(truckBindList)) {
+//                for (OrderGoodsTruckBind bind : truckBindList) {
+//                    goodsOrderTruckRecordComponent.deleteTruckRecord(orderGoodsNo, bind.getTruckNo());
+//                }
+//            }
+
+    }
 }

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

@@ -23,6 +23,7 @@ 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.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.clx.user.enums.driver.DriverTruckEnum;
@@ -85,14 +86,14 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     @Override
-    public Map<String, OwnerAccountVO> accountInfo(Long ownerUserNo) {
-        Map<String, OwnerAccountVO> result = new HashMap<>(2);
+    public OwnerAccountAllVO accountInfo(Long ownerUserNo) {
+        OwnerAccountAllVO result = new OwnerAccountAllVO();
         List<OwnerAccountVO> list = ownerAccountStruct.convertList(ownerAccountDao.accountInfo(ownerUserNo));
         for (OwnerAccountVO ownerAccountVO : list) {
             if (OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode().equals(ownerAccountVO.getAccountType())) {
-                result.put("marginAccount", ownerAccountVO);
+                result.setMarginAccount(ownerAccountVO);
             } else {
-                result.put("prepaidFreightAccount", ownerAccountVO);
+                result.setPrepaidFreightAccount(ownerAccountVO);
             }
         }
         return result;
@@ -782,7 +783,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerAccountThaw(ThawAccountParam param) {
         String orderNo = param.getOrderNo();
-        if (StringUtils.equals(param.getOrderType(), "1")) {
+        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
             List<OwnerRunningWaterRecord> list = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
             if (null == list || list.size() != 2) {
                 log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));

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

+package com.clx.performance.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.clx.performance.config.MslAppConfig;
+import com.clx.performance.config.MslPaymentConfig;
+import com.clx.performance.constant.ActionConstants;
+import com.clx.performance.dao.ThirdPartRequestLogDao;
+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.service.PaymentService;
+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.service.ThirdPartRequestLogService;
+import com.msl.common.dto.HttpDTO;
+import com.msl.common.enums.ResultCodeEnum;
+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 lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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 java.security.GeneralSecurityException;
+import java.util.UUID;
+
+import static com.clx.performance.enums.HttpEnum.PERFORMANCE_PAY_CLX_PAYMENT;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+public class PaymentServiceImpl implements PaymentService {
+
+    public static final String TRANSPORT_USER = "13403503399";
+    public static final String TRANSPORT_KEY = "9Y1N5AUP8N2TI359";
+    /** 转账回调地址 **/
+    public static final String NOTIFY_URL = "/clx-performance/payment/notify/userPayNotify";
+
+    @Autowired
+    private final MslPaymentConfig mslPaymentConfig;
+
+    @Autowired
+    ThirdPartRequestLogDao thirdPartRequestLogDao;
+
+    @Autowired
+    ThirdPartRequestLogService thirdPartRequestLogService;
+
+    /**
+     * 钱包直接划账给钱包
+     *
+     * @param payDTO
+     * @return
+     */
+    @Override
+    public Result paymentWallet(PayParam payDTO) {
+        /** 构建支付单元 **/
+        PayUnitDTO payUnitDTO = PayUnitDTO.builder()
+                .id(payDTO.getTradeId().toString())
+                .from(payDTO.getFrom())
+                .to(payDTO.getTo())
+                .figure(payDTO.getFigure())
+                .type(PayUnitTypeEnum.RESIDUE_PAY.getCode())
+                .timestamp(System.currentTimeMillis() / 1000)
+                .remark(payDTO.getRemark()).build();
+        /** 生成签名**/
+        PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
+
+        /** 构建支付支付 ***/
+        PayUserDTO payUserDTO = PayUserDTO.builder()
+                .pwd(payDTO.getPwd())
+                .system(SystemCodeEnum.PERFORMANCE_SERVICE.getCode())
+                .userCode(payDTO.getFrom())
+                .orderNo(payDTO.getTradeNo())
+                .uuid(UUID.randomUUID().toString().replaceAll("-", ""))
+                .notifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_URL)
+                .payUnitDTO(payUnitDTO).build();
+        log.info("发起支付请求日志 {}", payUserDTO);
+        Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO));
+        log.info("支付返回日志 {}", notify);
+        if (notify == null) {
+            //FEGIN返回null
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "支付服务返回异常");
+        }
+        return notify;
+    }
+
+
+    /**
+     * post请求
+     */
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public Result<?> postRequest(String requestUrl, String param) {
+        ThirdPartRequestLog log = ThirdPartRequestLog.builder()
+                .requestId(UUID.randomUUID().toString())
+                //应用编号 10000 默认诚联信
+                .appNo(Long.valueOf(10000))
+                .requestType(ThirdRequestTypeEnum.SEND.getCode())
+                .action(ActionConstants.CLX_PAYMENT_PAY)
+                .url(requestUrl)
+                .requestContent(param)
+                //状态: 0-请求中,1-成功,2-失败
+                .status(0)
+                .build();
+        thirdPartRequestLogDao.saveEntity(log);
+        return encryptPost(requestUrl, param, log.getId());
+    }
+
+    private Result<?> encryptPost(String url, String param, Integer httpLogId) {
+        try {
+            return HttpUtil.post(url, null,
+                    EncryptUtil.buildDTO(TRANSPORT_USER, param, TRANSPORT_KEY, System.currentTimeMillis()))
+                    .map(r -> JSON.parseObject(r, new TypeReference<HttpDTO>() {
+                    }))
+                    .peek(dto -> log.info("http请求返回------dto->{}", dto))
+                    .mapTry(dto -> EncryptUtil.decrypt(dto.getData(), TRANSPORT_KEY))
+                    .map(this::covertResult)
+                    .peek(result -> thirdPartRequestLogService.updateResult(httpLogId, result))
+                    .filter(Result::succeed)
+                    .orElseThrow();
+        } catch (GeneralSecurityException e) {
+            log.error("解密失败", e);
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "http 请求异常");
+        }
+    }
+
+    private <T> Result<?> covertResult(String result) {
+        return JSON.parseObject(result, Result.class);
+    }
+
+
+}

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

@@ -2,7 +2,10 @@ package com.clx.performance.service.impl;
 
 import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
 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.service.PaymentService;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.settle.SettlementService;
@@ -10,6 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+
 @Slf4j
 @Service
 public class TempServiceImpl implements TempService {
@@ -19,7 +24,8 @@ public class TempServiceImpl implements TempService {
 
     @Autowired
     private BreakContractSettlementDriverDao breakContractSettlementDriverDao;
-
+    @Autowired
+    private PaymentService paymentService;
     @Override
     public void updateInvoiceType(String childNo, Integer invoiceType) {
 
@@ -33,4 +39,20 @@ public class TempServiceImpl implements TempService {
         settlement.setSettleStatus(BreakContractSettlementDriverEnum.SettleStatus.YES.getCode());
     }
 
+    @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);
+    }
+
 }

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

+package com.clx.performance.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.clx.performance.dao.ThirdPartRequestLogDao;
+import com.clx.performance.enums.ThirdRequestStatusEnum;
+import com.clx.performance.model.ThirdPartRequestLog;
+import com.clx.performance.service.ThirdPartRequestLogService;
+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;
+
+@Service
+@Slf4j
+public class ThirdPartRequestLogServiceImpl implements ThirdPartRequestLogService {
+
+    @Autowired
+    ThirdPartRequestLogDao thirdPartRequestLogDao;
+    @Override
+    public void save(ThirdPartRequestLog log) {
+        thirdPartRequestLogDao.saveEntity(log);
+    }
+
+    @Override
+    public void updateResult(Integer logId, Result<?> result) {
+        thirdPartRequestLogDao.updateEntityByKey(new ThirdPartRequestLog()
+                .setId(logId)
+                .setResponseContent(JSON.toJSONString(result))
+                .setStatusCode(result.getCode())
+                .setStatus(result.succeed() ? ThirdRequestStatusEnum.SUCCESS.getCode() : ThirdRequestStatusEnum.FAIL.getCode()));
+    }
+
+    /**
+     * 修改重试次数
+     *
+     * @param logId
+     * @param retryTimes
+     */
+    @Override
+    public void updateLogRetryTimes(Integer logId, Integer retryTimes) {
+        thirdPartRequestLogDao.updateLogRetryTimes(logId, retryTimes);
+    }
+
+    /**
+     * 根据id 查询
+     *
+     * @param id
+     */
+    @Override
+    public Optional<ThirdPartRequestLog> getById(Integer id) {
+        return thirdPartRequestLogDao.getEntityByKey(id);
+    }
+}

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

@@ -246,7 +246,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 （运单取消）
      */
     private BigDecimal orderChildCancelFigureCalc(OrderChild orderChild, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getCancelTime(), orderChild.getPayTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getPayTime(), orderChild.getCancelTime());
         long baseTime = rule.getDriverCancelRule().getBaseTime().multiply(BigDecimal.valueOf(3600)).setScale(0, RoundingMode.HALF_UP).longValue();
 
         if (time < baseTime) {
@@ -254,7 +254,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         }
         else {
             BigDecimal money = rule.getDriverCancelRule().getBaseFigure();
-            money = money.add(BigDecimal.valueOf(time-baseTime).divide(BigDecimal.valueOf(1800), 0, RoundingMode.UP).multiply(rule.getDriverCancelRule().getBaseFigure()));
+            money = money.add(BigDecimal.valueOf(time-baseTime).divide(BigDecimal.valueOf(1800), 0, RoundingMode.UP).multiply(rule.getDriverCancelRule().getFigurePerHour()));
             return money.movePointRight(2);
         }
     }
@@ -263,9 +263,9 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 （到达货源地超时）
      */
     private BigDecimal arriveSendAddressFigureCalc(OrderChild orderChild, OrderGoods orderGoods, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getArriveSendTime(), orderGoods.getLastArriveSendTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderGoods.getLastArriveSendTime(), orderChild.getArriveSendTime());
 
-        BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 0, RoundingMode.HALF_UP).multiply(rule.getSendAddressRule().getFigurePerHour());
+        BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 2, RoundingMode.HALF_UP).multiply(rule.getSendAddressRule().getFigurePerHour()).setScale(2, RoundingMode.HALF_UP);
         return money.movePointRight(2);
     }
 
@@ -273,7 +273,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 (到达目的地超时)
      */
     private BigDecimal arriveReceiveAddressFigureCalc(OrderChild orderChild, OrderGoods orderGoods, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getArriveReceiveTime(), orderGoods.getLastArriveReceiveTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderGoods.getLastArriveReceiveTime(), orderChild.getArriveReceiveTime());
 
         BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 0, RoundingMode.UP).multiply(rule.getReceiveAddressRule().getFigurePerHour()).multiply(orderChild.getWeight()).setScale(2, RoundingMode.HALF_UP);
         return money.movePointRight(2);

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

@@ -55,10 +55,11 @@ public class BreakContractOwnerRuleServiceImpl  implements BreakContractOwnerRul
         autoRule.setOrderCancelRule(new BreakContractOwnerRuleVO.OrderCancelRule());
         autoRule.setOrderAmountReduceRule(new BreakContractOwnerRuleVO.OrderAmountReduceRule());
 
-        autoRule.getOrderAmountReduceRule().setRatio(new BigDecimal(param.getRule().get("A-a")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-b")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setAfterRatio(new BigDecimal(param.getRule().get("A-c")).movePointLeft(2));
-        autoRule.getOrderCancelRule().setAfterFigurePerHour(new BigDecimal(param.getRule().get("A-d")).movePointLeft(2));
+        autoRule.getOrderAmountReduceRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-a")).movePointLeft(2));
+        autoRule.getOrderAmountReduceRule().setAfterRatio(new BigDecimal(param.getRule().get("A-b")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setBeforeRatio(new BigDecimal(param.getRule().get("A-c")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setAfterRatio(new BigDecimal(param.getRule().get("A-d")).movePointLeft(2));
+        autoRule.getOrderCancelRule().setAfterFigurePerHour(new BigDecimal(param.getRule().get("A-e")).movePointLeft(2));
         rule.setAutoRuleJson(JSON.toJSONString(autoRule));
 
         breakContractOwnerRuleDao.saveEntity(rule);