Merge remote-tracking branch 'remotes/origin/feature/1.9.29_蜜雪中台订单区分支付方式'

# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

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

@@ -20,6 +20,7 @@ public class ConfirmOrderRequest extends BaseConfig {
     private Integer orderType;
 
     private String payChannelName;
+    private String payChannel;
 
     private String payVoucher;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -296,8 +296,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
 //        request.setActualPayAmount(request.getActualPayAmount());
         request.setOperator(confirmOrderRequest.getOperator());
-        QueryOrderByIdResponse orderByIdResponse=new QueryOrderByIdResponse();
-        BaseResponse<GetMemberExtendInfoResponse> extendInfo=new BaseResponse();
+        if (StringUtils.isNotBlank(confirmOrderRequest.getPayChannel())) {
+            request.setPayChannel(confirmOrderRequest.getPayChannel());
+            request.setPayChannelName(confirmOrderRequest.getPayChannelName());
+        }
+        QueryOrderByIdResponse orderByIdResponse = new QueryOrderByIdResponse();
+        BaseResponse<GetMemberExtendInfoResponse> extendInfo = new BaseResponse();
         try {
             QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(), 0, confirmOrderRequest.getTrackingNo());
             orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
@@ -305,7 +309,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             GetMemberExtendInfoRequest extendInfoRequest = new GetMemberExtendInfoRequest();
             extendInfoRequest.setMemberId(orderByIdResponse.getData().getUserId());
             extendInfoRequest.setPartnerId(orderByIdResponse.getData().getCompanyId());
-            extendInfo = memberCenterService.getMemberExtendInfo(extendInfoRequest,confirmOrderRequest.getTrackingNo());
+            extendInfo = memberCenterService.getMemberExtendInfo(extendInfoRequest, confirmOrderRequest.getTrackingNo());
             OrderExtInfoDto extInfoDTO = JSONObject.parseObject(orderByIdResponse.getData().getExtInfo(),OrderExtInfoDto.class);
             extInfoDTO.setMemberLevel(extendInfo.getData().getMemberGrade()!=null?extendInfo.getData().getMemberGrade().getRuleName():"");
             extInfoDTO.setPaidMember(CollectionUtils.isNotEmpty(extendInfo.getData().getMemberPaids()));

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

@@ -896,12 +896,16 @@ public class OrderAdapter {
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
-            if(ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel()) ){
+            if (ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel())) {
                 responseVo.setOrderPayType("储值卡支付");
-            }else {
+            } else if (ordersBean.getPayChannel() != null && PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                responseVo.setOrderPayType("支付宝支付");
+            } else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                responseVo.setOrderPayType("微信支付");
+            } else {
                 responseVo.setOrderPayType("微信支付");
             }
-            if(OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())){
+            if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
                 responseVo.setOrderPayType("支付宝支付");
             }
             //取餐码用日订单序号代替- v1.5.4变更为四位随机数

order-application-service/src/main/java/cn/freemud/enums/PayChannel.java

@@ -14,7 +14,9 @@ package cn.freemud.enums;
 
 public enum PayChannel {
 
-    SVC("10102", "svc卡支付");
+    SVC("10102", "svc卡支付"),
+    ALIPAY("10300", "支付宝"),
+    WXPAY("10211", "微信");
 
     private String code;
     private String desc;

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

@@ -122,6 +122,9 @@ public class AppOrderServiceImpl implements AppOrderService {
         OrderExtInfoDto extInfo = JSONObject.parseObject(productOrderBean.getExtInfo(), OrderExtInfoDto.class);
         extInfo.setAppid(createPrepayVo.getPayAppId());
         extInfo.setOpenid(createPrepayVo.getOpenId());
+        if (StringUtils.isNotBlank(createPrepayVo.getPayCode())) {
+            extInfo.setPayCode(createPrepayVo.getPayCode());
+        }
         String faceCode = "";
         String cardCode = "";
         String transId = createPrepayVo.getOrderCode() + redisService.increment(RedisUtil.getPaymentTransIdSequenceKey(createPrepayVo.getOrderCode()), 1, TimeUnit.DAYS);

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

@@ -352,6 +352,7 @@ public class OrderServiceImpl implements Orderservice {
         String sessionId = "";
         String openid = "";
         String ruleId = "";
+        String payCode = "";
         if (StringUtils.isNotBlank(extInfo)) {
             orderExtInfoDto = gson.fromJson(extInfo, OrderExtInfoDto.class);
             if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getOpenid())) {
@@ -360,6 +361,10 @@ public class OrderServiceImpl implements Orderservice {
                 sessionId = orderExtInfoDto.getSessionId();
                 ruleId = orderExtInfoDto.getRuleId();
             }
+            if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getPayCode())
+                    && Arrays.asList(PayChannel.ALIPAY.getCode(), PayChannel.WXPAY.getCode()).contains(orderExtInfoDto.getPayCode())) {
+                payCode = orderExtInfoDto.getPayCode();
+            }
         }
         // 如果订单状态不是未支付，返回信息
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
@@ -380,8 +385,12 @@ public class OrderServiceImpl implements Orderservice {
         var1.setPayTransId(message.getOut_trade_no());
         var1.setOperator(orderBean.getUserName());
         var1.setEndTransId(message.getEndTransId());
-        if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){
-            var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+        if (StringUtils.isNotBlank(payCode)) {
+            var1.setPayChannel(payCode);
+            var1.setPayChannelName(PayChannel.getByCode(payCode).getDesc());
+        }
+        if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
+            var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -14,6 +14,7 @@ package com.freemud.application.sdk.api.ordercenter.request;
 
 import lombok.Data;
 
+
 @Data
 public class OrderExtInfoDto {
 
@@ -140,4 +141,9 @@ public class OrderExtInfoDto {
      * 打开小程序的场景值。
      */
     private String scene;
+
+    /**
+     * 支付渠道编号(参考支付组payment_platform)
+     */
+    private String payCode;
 }