优化支付代码

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -63,7 +63,7 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
             //构造请求参数
             SortedMap<String, Object> commonParams = this.buildRequestParamMap(dragonPayBaseReqDto);
             //追加请求参数
-            SortedMap<String, Object> parameters = appendRequestParam(commonParams);
+            SortedMap<String, Object> parameters = this.appendRequestParam(commonParams,dragonPayBaseReqDto);
             //生成签名
             String sign = PayWepayUtils.getInstance().createSign(parameters);
             parameters.put("sign", sign);
@@ -151,7 +151,6 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         String timeExpire = DateUtil.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(dragonPayBaseReqDto.getCreateDate()).plusMinutes(Long.parseLong(dragonPayBaseReqDto.getExpireTime())),DateUtil.Formatter.yyyyMMddHHmmssTrim);
         parameters.put("time_expire", timeExpire);
         parameters.put("notify_url", this.getNotifyUrl());
-        parameters.put("openid", dragonPayBaseReqDto.getOpenId()==null?"":dragonPayBaseReqDto.getOpenId()); //只有trade_type="JSAPI"时必须传
         return parameters;
     };
 
@@ -160,7 +159,7 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
      * @param requestMap
      * @return
      */
-    abstract SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap);
+    abstract SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap,DragonPayBaseReqDto dragonPayBaseReqDto);
 
     /**
      * 构造返回参数

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyAppImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.wepay.strategy.impl;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWepayHandler;
 import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +30,7 @@ public class WepayStrategyAppImpl extends AbstractWepayStrategy {
     private String notifyUrl;
 
     @Override
-    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
+    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap,DragonPayBaseReqDto dragonPayBaseReqDto) {
         requestMap.put("trade_type", "APP");
         requestMap.put("appid", PayWepayUtils.getInstance().getAPP_ID());
         return requestMap;

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyAppletImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.wepay.strategy.impl;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWepayHandler;
 import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -29,9 +30,10 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
     private String notifyUrl;
 
     @Override
-    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
+    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap, DragonPayBaseReqDto dragonPayBaseReqDto) {
         requestMap.put("trade_type", "JSAPI");
         requestMap.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
+        requestMap.put("openid", dragonPayBaseReqDto.getOpenId()); //只有trade_type="JSAPI"时必须传
         return requestMap;
     }
 

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyJsImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.wepay.strategy.impl;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWepayHandler;
 import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -29,9 +30,10 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
     private String notifyUrl;
 
     @Override
-    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
+    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap, DragonPayBaseReqDto dragonPayBaseReqDto) {
         requestMap.put("trade_type", "JSAPI");
         requestMap.put("appid", PayWepayUtils.getInstance().getJS_APP_ID());
+        requestMap.put("openid", dragonPayBaseReqDto.getOpenId()); //只有trade_type="JSAPI"时必须传
         return requestMap;
     }
 

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/WepayStrategyWapImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.wepay.strategy.impl;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.annotation.StrategyWepayHandler;
 import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +29,7 @@ public class WepayStrategyWapImpl extends AbstractWepayStrategy{
     private String notifyUrl;
 
     @Override
-    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
+    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap, DragonPayBaseReqDto dragonPayBaseReqDto) {
         requestMap.put("trade_type", "MWEB");
         requestMap.put("appid", PayWepayUtils.getInstance().getWAP_APP_ID());
         return requestMap;