.

src/main/java/com/sckw/freight/model/dto/PayOrderDetail.java

@@ -23,7 +23,7 @@ public class PayOrderDetail implements Serializable {
     @Serial
     private static final long serialVersionUID = -114261812502553262L;
 
-    @JSONField(name = "uid")
+    @JSONField(name = "orderNo")
     @Schema(description = "充值单号")
     private String orderNo;
 
@@ -31,10 +31,6 @@ public class PayOrderDetail implements Serializable {
     @Schema(description = "用户id")
     private String uid;
 
-    @JSONField(name = "uid")
-    @Schema(description = "充值地址")
-    private String payUrl;
-
     @JSONField(name = "status")
     @Schema(description = "充值状态")
     private Integer status;

src/main/java/com/sckw/freight/service/JobService.java

@@ -88,22 +88,22 @@ public class JobService {
                             //根据充值订单状态 处理结算状态
                             if (details.getData().getStatus() == 1) {//已支付
                                 //发起预付
-                                payCenterService.advancePayApply(logisticsAndBuySellInfo.getBuyUid().toString(), ChannelEnum.XW,
-                                        logisticsAndBuySellInfo.getSellUid().toString(), MoneyChange.bigMoney(details.getData().getMoney()));
+                                payCenterService.advancePayApply(logisticsAndBuySellInfo.getBuyUid() , ChannelEnum.XW,
+                                        logisticsAndBuySellInfo.getSellUid() , MoneyChange.bigMoney(details.getData().getMoney()));
 
 
                                 // 1.记账
                                 List<PatchPay> list = new ArrayList<>();
                                 PatchPay patchPay = new PatchPay();
-                                patchPay.setUid(logisticsAndBuySellInfo.getSellUid().toString());
+                                patchPay.setUid(logisticsAndBuySellInfo.getSellUid() );
                                 patchPay.setMoney(MoneyChange.bigMoney(details.getData().getMoney()));
                                 list.add(patchPay);
                                 //清分
-                                payCenterService.payAgentPayV2(logisticsAndBuySellInfo.getBuyUid().toString(), logisticsAndBuySellInfo.getSellUid().toString(), ChannelEnum.XW,
+                                payCenterService.payAgentPayV2(logisticsAndBuySellInfo.getBuyUid() , logisticsAndBuySellInfo.getSellUid() , ChannelEnum.XW,
                                         MoneyChange.bigMoney(details.getData().getMoney()), list, settlementLogisticsInfo.getSlOrderNo(), "1");
 
                                 //提现
-                                payCenterService.withdrawTake(logisticsAndBuySellInfo.getSellUid().toString(), ChannelEnum.XW,
+                                payCenterService.withdrawTake(logisticsAndBuySellInfo.getSellUid() , ChannelEnum.XW,
                                         MoneyChange.bigMoney(details.getData().getMoney()),
                                         "");
 

src/main/java/com/sckw/freight/service/freight/impl/KwpLedgerLogisticsServiceImpl.java

@@ -30,7 +30,6 @@ import com.sckw.freight.util.R;
 import com.sckw.freight.util.SnowflakeIdUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -66,7 +65,7 @@ public class KwpLedgerLogisticsServiceImpl extends ServiceImpl<KwpLedgerLogistic
     KwpWalletRelationMapper kwpWalletRelationMapper;
     @Autowired
     PayCenterService payCenterService;
-    @Lazy
+    //@Lazy
     @Autowired
     IKwpSettlementLogisticsService iKwpSettlementLogisticsService;
 

src/main/resources/application-dev.yml

@@ -1,4 +1,6 @@
 spring:
+  main:
+    allow-circular-references: true
   datasource:
     dynamic:
       druid:

src/main/resources/application-test.yml

@@ -1,4 +1,7 @@
+
 spring:
+  main:
+    allow-circular-references: true
   datasource:
     dynamic:
       druid: