Merge branch 'feature/zxh/【【华莱士】储值对账功能优化】-20220913'

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

@@ -61,20 +61,20 @@ public class CombPayRequest {
     /**
      * 商家POS机编号（可以使用固定值,扫码付必传）
      */
-    private String station_id = "1";;
+    private String station_id = "1";
     private String appId;
     private String payCode;
     private String payTimeOutTime;
     private String ebCode;
     private String cardCode;
     private Boolean disable_service_goods_tag = false;
-    private String request_source ="V1";
-    private String ver ="10";
+    private String request_source = "V1";
+    private String ver = "10";
     private String storeName;
     private Long merchantDiscount;
 
     /**
-     * @see  com.freemud
+     * @see com.freemud
      * 下单所用小程序类型：1微信，2支付宝，3抖音")
      */
     private Integer applicationType;
@@ -87,4 +87,19 @@ public class CombPayRequest {
      * 支付类型编码 TWX:微信 TZFB:支付宝
      */
     private String payTypeCode;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 会员编号
+     */
+    private String memberId;
 }

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

@@ -61,19 +61,20 @@ public class MultiPayRequest {
     /**
      * 商家POS机编号（可以使用固定值,扫码付必传）
      */
-    private String station_id = "1";;
+    private String station_id = "1";
+    ;
     private String appId;
     private String payCode;
     private String payTimeOutTime;
     private String ebCode;
     private Boolean disable_service_goods_tag = false;
-    private String request_source ="V1";
-    private String ver ="10";
+    private String request_source = "V1";
+    private String ver = "10";
     private String storeName;
     private Long merchantDiscount;
 
     /**
-     * @see  com.freemud
+     * @see com.freemud
      * 下单所用小程序类型：1微信，2支付宝，3抖音")
      */
     private Integer applicationType;
@@ -89,4 +90,20 @@ public class MultiPayRequest {
      * 支付类型编码 TWX:微信 TZFB:支付宝
      */
     private String payTypeCode;
+
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 会员编号
+     */
+    private String memberId;
 }

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

@@ -44,4 +44,20 @@ public class FacePayRequestDto {
 
     private List<PayProductDto> products;
 
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 会员编号
+     */
+    private String memberId;
+
 }

order-application-service/src/main/java/cn/freemud/interceptor/FeignInterceptor.java

 package cn.freemud.interceptor;
 
 import cn.freemud.utils.AppLogUtil;
-import com.alibaba.fastjson.JSON;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.springframework.beans.factory.annotation.Value;
@@ -52,7 +51,7 @@ public class FeignInterceptor implements RequestInterceptor {
                 map.put(key, value);
             }
         }
-        AppLogUtil.printLog("clientIp for feign client info:" + JSON.toJSONString(map), "", "");
+//        AppLogUtil.printLog("clientIp for feign client info:" + JSON.toJSONString(map), "", "");
         return map;
     }
 

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

@@ -515,6 +515,9 @@ public class PayServiceImpl {
         request.setOperatorId("2");
         request.setVer("2");
         request.setMerchantDiscount(orderBean.getOriginalAmount().longValue() - orderBean.getAmount());
+        request.setOrderId(orderBean.getOid());
+        request.setMobile(orderBean.getPhone());
+        request.setMemberId(orderBean.getUserId());
         com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> responseBase = paymentNewClient.codePay(request);
         if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData() == null) {
             // 需要把2种特殊情况抛给用户
@@ -797,6 +800,9 @@ public class PayServiceImpl {
         request.setVer("2");
         request.setMerchantDiscount(orderBean.getOriginalAmount().longValue() - orderBean.getAmount());
         request.setApplicationType(orderAdapter.getPayApplicationType(orderBean.getOrderClient()));
+        request.setOrderId(orderBean.getOid());
+        request.setMobile(orderBean.getPhone());
+        request.setMemberId(orderBean.getUserId());
         SVCCardAmountRequestDto svcRequest = new SVCCardAmountRequestDto();
         svcRequest.setPartnerId(partnerId);
         svcRequest.setCardCodes(Arrays.asList(cardCode));