Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ErrorCodeConstants.java

@@ -147,6 +147,7 @@ public interface ErrorCodeConstants {
 
     // ========== 核销 ==========
     ErrorCode ORDER_NOT_EXIST = new ErrorCode(30_100, "订单不存在");
+    ErrorCode ORDER_ISINVOICE = new ErrorCode(30_100, "订单已开票不能修改");
     ErrorCode ORDER_NOT_VOYAGE_CHANGE = new ErrorCode(30_101, "航次不能修改");
     ErrorCode ORDER_NOT_VOYAGE = new ErrorCode(30_101, "航次不能为空");
     ErrorCode USE_DATE_RANGE_ERROR = new ErrorCode(30_102, "使用日期范围不正确");

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
@@ -1971,6 +1971,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO == null) {
             return CommonResult.error(ORDER_NOT_EXIST);
         }
+        if (tradeOrderDO.getIsInvoice() != null && tradeOrderDO.getIsInvoice() == 1) {
+            return CommonResult.error(ORDER_ISINVOICE);
+        }
         int auditType = 0;
         String orderNo = tradeOrderDO.getOrderNo();
         Long oldvoyageId = tradeOrderDO.getVoyageId();

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

@@ -242,7 +242,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
                             Asserts.isTrue(false, "补差价已支付，不要重复操作");
                         } else {
                             //2.创建定金支付交易单
-                            payOrderReqVO.setPayAmount(tradeOrder.getSupplementAmount());
+                            payOrderReqVO.setPayAmount(tradeOrder.getSupplementAmount().abs());
                             TradeOrderPayDO tradeOrderPayDO = buildOrderPay(tradeOrder, payOrderReqVO);
                             tradeOrderPayDO.setOrderType(PAY_ORDER_TYPE_BC);
                             payOrderReqVO.setStoreId(tradeOrder.getStoreId());
@@ -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)
@@ -988,7 +988,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
         TradeMchInfoDO tradeMchInfoDO = tradeOrderRepositoryService.getByMchId(mchId);
         Asserts.isTrue(tradeMchInfoDO != null, "未配置商户号信息{}", tradeMchInfoDO);
         //根据支付方式获取channelId
-        String name = tradeOrderPayDO.getOrderType() == PAY_ORDER_TYPE_DEPOSI ? SellMethodEnum.valueOf(tradeOrderPayDO.getSellMethod()).name() : PaySourceEnum.valueOf(tradeOrderPayDO.getSellMethod()).name();
+        String name = SellMethodEnum.valueOf(tradeOrderPayDO.getSellMethod()).name();
         String channelId = getChannelIdByPayType(tradeOrderPayDO.getOrderType(), name, PayTypeEnum.valueOf(tradeOrderPayDO.getPaymentType()), payOrderReqVO.getPayExtraType());
         if (tradeMchInfoDO != null) {
             tradeOrderPayDO.setMerchantNo(tradeMchInfoDO.getMchId());
@@ -1034,7 +1034,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
         TradeMchInfoDO tradeMchInfoDO = tradeOrderRepositoryService.getByMchId(mchId);
         Asserts.isTrue(tradeMchInfoDO != null, "未配置商户号信息{}", tradeMchInfoDO);
         //根据支付方式获取channelId
-        String name = tradeOrderPayDO.getOrderType() == PAY_ORDER_TYPE_TRADE ? SellMethodEnum.valueOf(tradeOrderPayDO.getSellMethod()).name() : PaySourceEnum.valueOf(tradeOrderPayDO.getSellMethod()).name();
+        String name = SellMethodEnum.valueOf(tradeOrderPayDO.getSellMethod()).name();
         String channelId = getChannelIdByPayType(tradeOrderPayDO.getOrderType(), name, PayTypeEnum.valueOf(tradeOrderPayDO.getPaymentType()), payOrderReqVO.getPayExtraType());
         if (tradeMchInfoDO != null) {
             tradeOrderPayDO.setMerchantNo(tradeMchInfoDO.getMchId());