Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'master' of…

Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -78,4 +78,13 @@ public class CombPayRequest {
      * 下单所用小程序类型：1微信，2支付宝，3抖音")
      */
     private Integer applicationType;
+
+    /**
+     * 小程序appid
+     */
+    private String subAppid;
+    /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    private String payTypeCode;
 }

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

@@ -80,4 +80,13 @@ public class MultiPayRequest {
 
     //储值卡支付列表
     private List<String> cardItems;
+
+    /**
+     * 小程序appid
+     */
+    private String subAppid;
+    /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    private String payTypeCode;
 }

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

@@ -3469,6 +3469,8 @@ public class OrderAdapter {
         orderPayDto.setOut_order_no(orderBean.getOid());
         orderPayDto.setCardCode(cardNo);
         orderPayDto.setApplicationType(getPayApplicationType(orderBean.getOrderClient()));
+        orderPayDto.setSubAppid(orderBean.getAppId());
+        orderPayDto.setPayTypeCode(convertPayTypeCode(orderBean.getOrderClient()));
         return orderPayDto;
 
     }
@@ -3861,6 +3863,24 @@ public class OrderAdapter {
     }
 
     /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    public String convertPayTypeCode(String orderClient) {
+        String payTypeCode = "";
+        switch (orderClient) {
+            case "2":
+                payTypeCode = "TWX";
+                break;
+            case "3":
+                payTypeCode = "TZFB";
+                break;
+            default:
+                break;
+        }
+        return payTypeCode;
+    }
+
+    /**
      * 礼品卡支付参数转化
      */
     public Integer getPayApplicationType(String orderClient) {
@@ -4089,6 +4109,8 @@ public class OrderAdapter {
         orderPayDto.setOut_order_no(orderBean.getOid());
         orderPayDto.setCardItems(cardCodes);//多卡支付
         orderPayDto.setApplicationType(getPayApplicationType(orderBean.getOrderClient()));
+        orderPayDto.setSubAppid(orderBean.getAppId());
+        orderPayDto.setPayTypeCode(convertPayTypeCode(orderBean.getOrderClient()));
         return orderPayDto;
 
     }

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

@@ -16,6 +16,7 @@ import cn.freemud.entities.vo.CreateOrderResponseVo;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
@@ -30,10 +31,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Component
 public class PointsMallOrderAdapter {
@@ -233,10 +231,31 @@ public class PointsMallOrderAdapter {
         }
         requestDto.setProducts(productBeans);
         requestDto.setBody(payProductName);
+
+        requestDto.setSubAppid(orderInfo.getAppId());
+        requestDto.setPayTypeCode(convertPayTypeCode(orderInfo.getOrderClient().toString()));
         return requestDto;
     }
 
     /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    public String convertPayTypeCode(String orderClient) {
+        String payTypeCode = "";
+        switch (orderClient) {
+            case "2":
+                payTypeCode = "TWX";
+                break;
+            case "3":
+                payTypeCode = "TZFB";
+                break;
+            default:
+                break;
+        }
+        return payTypeCode;
+    }
+
+    /**
      * 预支付接口获取类型
      *
      * @return

order-application-service/src/main/java/cn/freemud/entities/dto/pay/UnifiedOrderRequestDto.java

@@ -43,4 +43,13 @@ public class UnifiedOrderRequestDto {
     private String payTimeOutTime;
     private Long merchantDiscount;
 
+    /**
+     * 小程序appid
+     */
+    private String subAppid;
+    /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    private String payTypeCode;
+
 }

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

@@ -63,6 +63,7 @@ import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddress
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
@@ -1548,10 +1549,31 @@ public class CheckOrder {
         }
         requestDto.setProducts(productBeans);
         requestDto.setBody(payProductName);
+        requestDto.setSubAppid(orderInfo.getAppId());
+        //支付类型编码 TWX:微信 TZFB:支付宝
+        requestDto.setPayTypeCode(convertPayTypeCode(orderInfo.getOrderClient().toString()));
         return requestDto;
     }
 
     /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    public String convertPayTypeCode(String orderClient) {
+        String payTypeCode = "";
+        switch (orderClient) {
+            case "2":
+                payTypeCode = "TWX";
+                break;
+            case "3":
+                payTypeCode = "TZFB";
+                break;
+            default:
+                break;
+        }
+        return payTypeCode;
+    }
+
+    /**
      * 预支付接口获取类型
      * @return
      */

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

@@ -1285,7 +1285,8 @@ public class PayServiceImpl {
         }
         orderPayDto.setFoodOrderType(orderAdapter.getFoodOrderType(orderBean.getOrderType()));
 //        orderPayDto.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
-
+        orderPayDto.setSubAppid(orderBean.getAppId());
+        orderPayDto.setPayTypeCode(convertPayTypeCode(orderBean.getOrderClient()));
         return orderPayDto;
     }
 
@@ -1644,4 +1645,22 @@ public class PayServiceImpl {
         return orderPayResponse;
     }
 
+    /**
+     * 支付类型编码 TWX:微信 TZFB:支付宝
+     */
+    public String convertPayTypeCode(String orderClient) {
+        String payTypeCode = "";
+        switch (orderClient) {
+            case "2":
+                payTypeCode = "TWX";
+                break;
+            case "3":
+                payTypeCode = "TZFB";
+                break;
+            default:
+                break;
+        }
+        return payTypeCode;
+    }
+
 }