优化支付代码

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

@@ -117,12 +117,13 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
      * @return
      */
     protected DragonPayBaseRespDto buildCommonRespDto(DragonPayBaseReqDto dragonPayBaseReqDto,WepayPayRespDto respWepayDto){
+        String nonceStr = PayWepayUtils.getInstance().getNonceStr();
         DragonPayBaseRespDto respDto = new DragonPayBaseRespDto();
         respDto.setCode(dragonPayBaseReqDto.getCode());
         respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();
         payData.setAppId(respWepayDto.getAppid());
-        payData.setNonceStr(respWepayDto.getNonceStr());
+        payData.setNonceStr(nonceStr);
         payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
         payData.setSignType("MD5");
         Long second = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));

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

@@ -43,7 +43,7 @@ public class WepayStrategyAppImpl extends AbstractWepayStrategy {
         paramMap.put("appid", respDto.getAppid());
         paramMap.put("partnerid", respDto.getMchId());
         paramMap.put("prepayid", respDto.getPrepayId());
-        paramMap.put("package", "Sign=WXPay");
+        paramMap.put("package", payBaseRespDto.getPayData().getPackages());
         paramMap.put("noncestr", respDto.getNonceStr());
         paramMap.put("timestamp", payBaseRespDto.getPayData().getTimeStamp());
         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/WepayStrategyAppletImpl.java

@@ -39,12 +39,12 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, WepayPayRespDto respDto) {
         //设置签名
         SortedMap<String, Object> paramMap = new TreeMap<String, Object>();
-        paramMap.put("appid", respDto.getAppid());
+        paramMap.put("appId", respDto.getAppid());
         paramMap.put("package", payBaseRespDto.getPayData().getPackages());
-        paramMap.put("noncestr", respDto.getNonceStr());
-        paramMap.put("timestamp", payBaseRespDto.getPayData().getTimeStamp());
+        paramMap.put("nonceStr", respDto.getNonceStr());
+        paramMap.put("timeStamp", payBaseRespDto.getPayData().getTimeStamp());
+        paramMap.put("signType", payBaseRespDto.getPayData().getSignType());
         String sign = PayWepayUtils.getInstance().createSign(paramMap);
-        payBaseRespDto.getPayData().setSignType("MD5");
         payBaseRespDto.getPayData().setPaySign(sign);
         return payBaseRespDto;
     }

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

@@ -39,12 +39,12 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, WepayPayRespDto respDto) {
         //设置签名
         SortedMap<String, Object> paramMap = new TreeMap<String, Object>();
-        paramMap.put("appid", respDto.getAppid());
+        paramMap.put("appId", respDto.getAppid());
         paramMap.put("package", payBaseRespDto.getPayData().getPackages());
-        paramMap.put("noncestr", respDto.getNonceStr());
-        paramMap.put("timestamp", payBaseRespDto.getPayData().getTimeStamp());
+        paramMap.put("nonceStr", respDto.getNonceStr());
+        paramMap.put("timeStamp", payBaseRespDto.getPayData().getTimeStamp());
+        paramMap.put("signType", payBaseRespDto.getPayData().getSignType());
         String sign = PayWepayUtils.getInstance().createSign(paramMap);
-        payBaseRespDto.getPayData().setSignType("MD5");
         payBaseRespDto.getPayData().setPaySign(sign);
         return payBaseRespDto;
     }