add 组合支付

yiqi-common/src/main/java/com/yiqi/common/enums/OrderNoHeaderType.java

@@ -5,26 +5,14 @@ package com.yiqi.common.enums;
  * @date 2024/1/4
  */
 public enum  OrderNoHeaderType implements CodeEnum{
-    /**
-     *
-     * public final static String cloth_wash_code_header = "WA";
-     *     public final static String activity_order_header = "AC";
-     *     public final static String cloth_order_header = "CL";
-     *     public final static String purchase_order_header = "PU";
-     *     public final static String goods_order_header = "GO";
-     *     public final static String recharge_order_header = "RE";
-     *     public final static String delivery_order_header = "DE";
-     *     public final static String refund_order_header = "RF";
-     *
-     */
 
-    cloth_wash_code_header("WA", "衣服条码"),
-    activity_order_header ("AC", "活动订单"),
-    cloth_order_header("CL", "洗衣订单"),
-    purchase_order_header("PU","进货订单"),
-    goods_order_header("GO","商品订单"),
-    recharge_order_header("RE","充值订单"),
-    delivery_order_header("DE","配送订单"),
+    cloth_wash_code_header("1", "衣服条码"),
+    activity_order_header ("A", "活动订单"),
+    cloth_order_header("C", "洗衣订单"),
+    purchase_order_header("P","进货订单"),
+    goods_order_header("G","商品订单"),
+    recharge_order_header("R","充值订单"),
+    delivery_order_header("D","配送订单"),
     ;
 
     private final String code;

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderRechargeServiceImpl.java

@@ -475,18 +475,6 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
             String payType = PayCodeUtils.getPayTypeByCode(createDTO.getAuthCode());
             orderRecharge.setPayType(payType);
         }
-
-        if (createDTO.getPayType().equals(PayType.COMBINE.getCode())) {
-            //组合支付
-            String payType = PayCodeUtils.getPayTypeByCode(createDTO.getAuthCode());
-            if (payType.equals(PayType.WECHAT.getCode())) {
-                orderRecharge.setWxPayAmount(CurrencyUtil.sub(createDTO.getPayAmount(), createDTO.getCashPayAmount()));
-            }
-            if (payType.equals(PayType.ALIPAY.getCode())) {
-                orderRecharge.setAliPayAmount(CurrencyUtil.sub(createDTO.getPayAmount(), createDTO.getCashPayAmount()));
-            }
-        }
-
         orderRecharge.setOrderStatus(OrderRechargeStatus.NO_PAY.getCode());
         orderRecharge.setPayStatus(PayStatus.WAITING_TO_PAY.getCode());
 
@@ -515,7 +503,7 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
             orderRecharge.setGivePointAmount(rechargeType.getGivePointAmount());
         }
         // 5. 设置支付渠道金额
-        initializePayChannelAmount(orderRecharge);
+        initializePayChannelAmount(orderRecharge, createDTO);
         orderRecharge.setDelFlag(DeleteStatus.OK.getCode());
         orderRecharge.buildCreateData();
         save(orderRecharge);
@@ -525,7 +513,7 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
     /**
      * 初始化支付渠道金额
      */
-    private void initializePayChannelAmount(OrderRecharge orderRecharge) {
+    private void initializePayChannelAmount(OrderRecharge orderRecharge, OrderRechargeCreateDTO createDTO) {
         orderRecharge.setCashPayAmount(BigDecimal.ZERO);
         orderRecharge.setAliPayAmount(BigDecimal.ZERO);
         orderRecharge.setWxPayAmount(BigDecimal.ZERO);
@@ -539,6 +527,17 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
             case CASH:
                 orderRecharge.setCashPayAmount(orderRecharge.getPayAmount());
                 break;
+            case COMBINE:
+                //组合支付
+                orderRecharge.setCashPayAmount(createDTO.getCashPayAmount());
+                String payType = PayCodeUtils.getPayTypeByCode(createDTO.getAuthCode());
+                if (payType.equals(PayType.WECHAT.getCode())) {
+                    orderRecharge.setWxPayAmount(CurrencyUtil.sub(createDTO.getPayAmount(), createDTO.getCashPayAmount()));
+                }
+                if (payType.equals(PayType.ALIPAY.getCode())) {
+                    orderRecharge.setAliPayAmount(CurrencyUtil.sub(createDTO.getPayAmount(), createDTO.getCashPayAmount()));
+                }
+                break;
         }
     }