Merge remote-tracking branch 'origin/dev' into dev

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

@@ -23,6 +23,8 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -99,9 +101,9 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         payData.setAppId(respWepayDto.getAppid());
         payData.setNonceStr(respWepayDto.getNonceStr());
         payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
-        payData.setPaySign(respWepayDto.getSign());
         payData.setSignType("MD5");
-        payData.setTimeStamp(Long.valueOf(DateUtil.now().getTime()).toString());
+        Long second = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+        payData.setTimeStamp(second+"");
         payData.setPartnerId(respWepayDto.getMchId());
         payData.setPrepayId(respWepayDto.getPrepayId());
         respDto.setPayData(payData);

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -36,8 +37,17 @@ public class WepayStrategyAppImpl extends AbstractWepayStrategy {
 
     @Override
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, WepayPayRespDto respDto) {
-        payBaseRespDto.getPayData().setMwebUrl(respDto.getMwebUrl());
         payBaseRespDto.getPayData().setPackages("Sign=WXPay");
+        //设置签名
+        SortedMap<String, Object> paramMap = new TreeMap<String, Object>();
+        paramMap.put("appid", respDto.getAppid());
+        paramMap.put("partnerid", respDto.getMchId());
+        paramMap.put("prepayid", respDto.getPrepayId());
+        paramMap.put("package", "Sign=WXPay");
+        paramMap.put("noncestr", respDto.getNonceStr());
+        paramMap.put("timestamp", payBaseRespDto.getPayData().getTimeStamp());
+        String sign = PayWepayUtils.getInstance().createSign(paramMap);
+        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/WepayStrategyAppletImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -37,7 +38,15 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
 
     @Override
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, WepayPayRespDto respDto) {
-        payBaseRespDto.getPayData().setMwebUrl(respDto.getMwebUrl());
+        //设置签名
+        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("timestamp", payBaseRespDto.getPayData().getTimeStamp());
+        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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -37,7 +38,15 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
 
     @Override
     DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, WepayPayRespDto respDto) {
-        payBaseRespDto.getPayData().setMwebUrl(respDto.getMwebUrl());
+        //设置签名
+        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("timestamp", payBaseRespDto.getPayData().getTimeStamp());
+        String sign = PayWepayUtils.getInstance().createSign(paramMap);
+        payBaseRespDto.getPayData().setSignType("MD5");
+        payBaseRespDto.getPayData().setPaySign(sign);
         return payBaseRespDto;
     }