预先设置 paychannelType

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java

@@ -23,7 +23,6 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
-import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
@@ -224,13 +223,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
 //        AssortOrderLogUtil.info("fisherman 请求基础服务,最终构建 04",config!=null?JSON.toJSONString(config):null);
         // fisherman 创建订单 extinfo 存储 信息,有数上报需要使用, 更新接口直接重新覆盖就行
         request.setExtInfo(this.getTempExtInfoMsg(config.getOpenId(),config.getBaseCreateOrderRequest().getAppId()));
-        if (request.getSettlementAmount() != null && request.getSettlementAmount()== 0L) {
-            // 0元支付,先进行设置  因为订单会先存一个 payChannl
-            PayChannelType channelType = PayChannelType.ZERO;
-            request.setPayChannelType(channelType.getIndex());
-            request.setPayChannel(channelType.getEbcode());
-            request.setPayChannelName(channelType.getName());
-        }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> order = orderSdkService.createOrder(request, config.getTrackingNo());
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(order);
         if (!RESPONSE_SUCCESS.equals(createOrderResponse.getErrcode())

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2772,6 +2772,9 @@ public class OrderServiceImpl implements Orderservice {
     public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                            OrderExtendedReq orderExtendedReq, OrderClientType orderClient, String appId,String openId) {
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
+        // 预先前置 设置 支付方式
+        this.preSetPayChannelType(baseCreateOrderRequest,createOrderVo);
+
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
         //保存门店渠道信息
@@ -2791,6 +2794,36 @@ public class OrderServiceImpl implements Orderservice {
         return orderBusinessService.createOrderFlow(createOrderRequest);
     }
 
+    private void preSetPayChannelType(BaseCreateOrderRequest request, CreateOrderVo createOrderVo) {
+        Long amount = request.getAmount();
+        String cardCode = createOrderVo.getCardCode();
+        CreateOrderVo.UnionPayCard unionPayCard = createOrderVo.getUnionPayCard();
+        if (amount > 0){
+            PayChannelType channelType = null;
+            // 风味卡支付
+            if (Objects.nonNull(unionPayCard)){
+                channelType = PayChannelType.USVCP;
+                this.setPrePayChannel(request,channelType);
+            }else if (StringUtils.isNotBlank(cardCode)) {
+                // 储值卡支付
+                channelType = PayChannelType.SVC;
+                this.setPrePayChannel(request,channelType);
+            }else {
+                // 现金支付-> 不管 前端有传递
+            }
+
+        }else if (amount == 0){
+            PayChannelType channelType = PayChannelType.ZERO;
+            this.setPrePayChannel(request,channelType);
+        }
+    }
+
+    private void setPrePayChannel(BaseCreateOrderRequest request, PayChannelType channelType){
+        request.setPayChannelType(channelType.getIndex());
+        request.setPayChannel(channelType.getEbcode());
+        request.setPayChannelName(channelType.getName());
+    }
+
     /**
      * 创建父子订单
      */