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

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

@@ -7,7 +7,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum HttpEnum {
 
-    PERFORMANCE_PAY_CLX_PAYMENT(10000, "履约服务向老马上来发起钱包转账","/payment-service/payUserWalletTransfer"),
+    PERFORMANCE_PAY_CLX_PAYMENT(10000, "履约服务向老马上来发起钱包转账","/payment-service/performance/payUserWalletTransfer"),
     ;
 
     private final int code;

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

@@ -635,6 +635,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         result.setOwnCarryWeight(orderInfoFeign.getOwnCarryWeight());
         result.setOwnResidueCarryWeight(orderInfoFeign.getOwnResidueCarryWeight());
         result.setPlatformCarryWeight(orderInfoFeign.getPlatformCarryWeight());
+        result.setPlatformResidueCarryWeight(orderInfoFeign.getPlatformResidueCarryWeight());
+
         result.setDownFloatWeight(orderInfoFeign.getDownFloatWeight());
         result.setUpFloatWeight(orderInfoFeign.getUpFloatWeight());
         result.setStopFlag(orderInfoFeign.getStopFlag());

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

@@ -49,8 +49,8 @@ public class PaymentServiceImpl implements PaymentService {
     // 请求地址
     public static final String OLD_CLX_HOST = "https://api.clxkj.cn:8088";
     //回调地址
-    public static final String NOTIFY_HOST = "/msl-performance/payment/notify/userPayNotify";
-    public static final String NOTIFY_URL = "https://gateway.testclx.cn";
+    public static final String NOTIFY_HOST = "https://gateway.testclx.cn";
+    public static final String NOTIFY_URL = "/msl-performance/payment/notify/userPayNotify";
 
     @Override
     public Result paymentWallet(Integer fromUser, Integer toUser, Integer figure, String tradeNo, Integer id) {