优化支付代码

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

@@ -151,7 +151,7 @@ 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()); //只有trade_type="JSAPI"时必须传
+        parameters.put("openid", dragonPayBaseReqDto.getOpenId()==null?"":dragonPayBaseReqDto.getOpenId()); //只有trade_type="JSAPI"时必须传
         return parameters;
     };
 

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

@@ -41,7 +41,7 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
         SortedMap<String, Object> paramMap = new TreeMap<String, Object>();
         paramMap.put("appId", respDto.getAppid());
         paramMap.put("package", payBaseRespDto.getPayData().getPackages());
-        paramMap.put("nonceStr", respDto.getNonceStr());
+        paramMap.put("nonceStr", payBaseRespDto.getPayData().getNonceStr());
         paramMap.put("timeStamp", payBaseRespDto.getPayData().getTimeStamp());
         paramMap.put("signType", payBaseRespDto.getPayData().getSignType());
         String sign = PayWepayUtils.getInstance().createSign(paramMap);

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

@@ -41,7 +41,7 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
         SortedMap<String, Object> paramMap = new TreeMap<String, Object>();
         paramMap.put("appId", respDto.getAppid());
         paramMap.put("package", payBaseRespDto.getPayData().getPackages());
-        paramMap.put("nonceStr", respDto.getNonceStr());
+        paramMap.put("nonceStr", payBaseRespDto.getPayData().getNonceStr());
         paramMap.put("timeStamp", payBaseRespDto.getPayData().getTimeStamp());
         paramMap.put("signType", payBaseRespDto.getPayData().getSignType());
         String sign = PayWepayUtils.getInstance().createSign(paramMap);