平台搬单提交

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -303,8 +303,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     private void initPayParams(LoginUser loginUser, PayOrderReqVO payOrderReqVO){
-        payOrderReqVO.setAccountId(loginUser.getDistributorId().toString());
-        payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
+        if(loginUser.getDistributorId()==null){
+            payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
+        }else {
+            payOrderReqVO.setAccountId(loginUser.getDistributorId().toString());
+            payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
+        }
     }
 
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/TradeOrderPayServiceImpl.java

@@ -121,6 +121,9 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
                     if(tradeOrder == null) {
                         Asserts.isTrue(false,"订单不存在");
                     }
+                    if(payOrderReqVO.getAccountId() == null && tradeOrder.getSourceId() != null) {
+                        payOrderReqVO.setAccountId(tradeOrder.getSourceId());
+                    }
                     if(ObjectUtil.equal(tradeOrder.getPayStatus(), PaymentStatusEnum.PAID.getStatus())){
                         //重复支付
                         return doRePayOrder(tradeOrder);