通过pay_code查询orderCode

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/PayPlatformVO.java

@@ -6,5 +6,6 @@ import lombok.Data;
 public class PayPlatformVO {
     private String ebcode;
     private Long amount;
+    private String orderClient;
 
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3523,7 +3523,7 @@ public class OrderAdapter {
      */
     public CombPayRequest convent2CombPayOrderRequest(PaymentRequest paymentRequest
             , CreatePrepayRequestDto createPrepayRequestDto
-            , String partnerPayOvertime) {
+            , String partnerPayOvertime,String orderClient) {
 
         CombPayRequest orderPayDto = new CombPayRequest();
         orderPayDto.setEbCode(paymentRequest.getPayCode());
@@ -3560,6 +3560,15 @@ public class OrderAdapter {
                 PayPlatformVO payPlatformVO = new PayPlatformVO();
                 payPlatformVO.setAmount(orderPayItemCreateReq.getPayAmount().longValue());
                 payPlatformVO.setEbcode(orderPayItemCreateReq.getPayEbCode());
+                if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.SVC.getEbcode())) {
+                    payPlatformVO.setOrderClient(orderPayItemCreateReq.getPayEbCode());
+                }
+                else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.WECHAT.getEbcode())) {
+                    payPlatformVO.setOrderClient(orderClient);
+                }
+                else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.ALIPAY.getEbcode())) {
+                    payPlatformVO.setOrderClient(orderClient);
+                }
                 platforms.add(payPlatformVO);
             }
         }

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

@@ -780,7 +780,6 @@ public class CheckOrder {
                 BigDecimal cashAmout = total.subtract(svcAmounts);
                 createOrderVo.setOrderPayItemCreateReqList(orderAdapter.setOrderPayItem(cashAmout,svcAmounts,Byte.parseByte(createOrderVo.getChannel())));
                 createOrderVo.setPayChannelType(PayChannelType.COMB.getIndex());
-
                 createOrderVo.setCashAmount(cashAmout);
                 createOrderVo.setSvcAmount(svcAmounts);
                 return true;

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

@@ -81,6 +81,7 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
@@ -261,6 +262,8 @@ public class OrderServiceImpl implements Orderservice {
 
     @Autowired
     private ComPayClient comPayClient;
+    @Autowired
+    private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -3201,7 +3204,14 @@ public class OrderServiceImpl implements Orderservice {
         CombPayRequest combPayRequest      = null;
         try {
 
-            combPayRequest = orderAdapter.convent2CombPayOrderRequest(paymentRequest,createPrepayRequestDto,partnerPayOvertime);
+
+            String orderClient = this.getPayCodeByChanel(createPrepayRequestDto);
+            if (StringUtils.isBlank(orderClient)) {
+                orderPayResponse = new OrderPayResponse();
+                orderPayResponse.setMsg("渠道码没有配置");
+                return orderPayResponse;
+            }
+            combPayRequest = orderAdapter.convent2CombPayOrderRequest(paymentRequest,createPrepayRequestDto,partnerPayOvertime,orderClient);
             responseBase = comPayClient.combPay(combPayRequest,combPayRequest.getPartner_id());
             if (!ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(responseBase.getCode())|| responseBase.getData().getPayPlatformResponseList().size()==0) {
                 log.info("混合支付返回信息错误,trackingNo:{} request:{} response:{}",trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(responseBase));
@@ -3247,4 +3257,28 @@ public class OrderServiceImpl implements Orderservice {
         }
         return orderPayResponse;
     }
+
+    /**
+     * 通过payCode ->clientCode
+     * @param createPrepayRequestDto
+     * @return
+     */
+    private String getPayCodeByChanel(CreatePrepayRequestDto createPrepayRequestDto) {
+        if (CollectionUtils.isEmpty(createPrepayRequestDto.getOrderPayItemCreateReqList())) return "";
+
+        OrderPayItemCreateReq payItem = createPrepayRequestDto.getOrderPayItemCreateReqList()
+                .stream()
+                .filter(d -> !d.getPayEbCode().equals(PayChannelType.SVC.getEbcode()))
+                .findFirst()
+                .orElse(null);
+
+        if (payItem == null) return "";
+        AssortmentOpenPlatformIappWxappStore wxAppStore = assortmentOpenPlatformIappWxappStoreManager.selectWxappStoreByWxAppIdAndStoreId(createPrepayRequestDto.getWxAppId()
+                , createPrepayRequestDto.getStoreId()
+                , payItem.getPayEbCode());
+        if (StringUtils.isNotBlank(wxAppStore.getClientCode())) {
+            return wxAppStore.getClientCode();
+        }
+        return "";
+    }
 }