补缴款

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

@@ -332,7 +332,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null && tradeOrderDO.getOrderStatus() == 6) {
             return CommonResult.success(orderId);
         }
-        return CommonResult.error(999, "待轮询");
+        return CommonResult.success( "待轮询");
     }
 
     @Override
@@ -341,7 +341,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null && tradeOrderDO.getDeposiStatus() == 2) {
             return CommonResult.success(orderId);
         }
-        return CommonResult.error(999, "待轮询");
+        return CommonResult.success("待轮询");
     }
 
     @Override
@@ -350,7 +350,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null && tradeOrderDO.getIsSupplementary() == 2) {
             return CommonResult.success(orderId);
         }
-        return CommonResult.error(999, "待轮询");
+        return CommonResult.success("待轮询");
     }
 
     @Override

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

@@ -803,7 +803,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
     @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_DEPOSI_PAY)
     public void updateDeposiOrderPaid(TradeOrderDO tradeOrderDO, TradeOrderPayDO tradeOrderPayDO) {
         Integer orderStatus = tradeOrderDO.getOrderStatus();
-        BigDecimal realPayAmount = (tradeOrderDO.getRealPayAmount()==null?BigDecimal.ZERO:tradeOrderDO.getRealPayAmount()).add(tradeOrderDO.getDeposi());
+        BigDecimal realPayAmount = (tradeOrderDO.getRealPayAmount()==null?BigDecimal.ZERO:tradeOrderDO.getRealPayAmount()).add(tradeOrderPayDO.getPayAmount());
         tradeOrderMapper.update(new LambdaUpdateWrapper<TradeOrderDO>()
                 .eq(TradeOrderDO::getId, tradeOrderDO.getId())
                 .set(TradeOrderDO::getRealPayAmount, realPayAmount)
@@ -817,7 +817,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
     @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_BC_PAY)
     public void updateBcOrderPaid(TradeOrderDO tradeOrderDO, TradeOrderPayDO tradeOrderPayDO) {
         Integer orderStatus = tradeOrderDO.getOrderStatus();
-        BigDecimal realPayAmount = (tradeOrderDO.getRealPayAmount()==null?BigDecimal.ZERO:tradeOrderDO.getRealPayAmount()).add(tradeOrderDO.getSupplementAmount());
+        BigDecimal realPayAmount = (tradeOrderDO.getRealPayAmount()==null?BigDecimal.ZERO:tradeOrderDO.getRealPayAmount()).add(tradeOrderPayDO.getPayAmount());
         tradeOrderMapper.update(new LambdaUpdateWrapper<TradeOrderDO>()
                 .eq(TradeOrderDO::getId, tradeOrderDO.getId())
                 .set(TradeOrderDO::getRealPayAmount, realPayAmount)