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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -343,7 +343,7 @@ public class AdamLoginController {
             if (null == respJNode) {
                 return ResponseDto.success(null);
             }
-            openId = String.valueOf(respJNode.get("openid"));
+            openId = respJNode.get("openid").asText();
         } catch (Exception e) {
             log.error("WX.API调用异常", e);
         }
@@ -363,7 +363,7 @@ public class AdamLoginController {
             if (null == respJNode || !respJNode.get("errcode").isEmpty()) {
                 return ResponseDto.success(null);
             }
-            openId = String.valueOf(respJNode.get("openid"));
+            openId = respJNode.get("openid").asText();
         } catch (Exception e) {
             log.error("WX.API调用异常", e);
         }

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

@@ -5,10 +5,10 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
 import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
 import com.liquidnet.service.dragon.channel.wepay.strategy.WepayStrategyContext;
-import com.liquidnet.service.dragon.channel.wepay.util.WepayUtil;
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -46,7 +46,7 @@ public class PayChannelStrategyWepayImpl implements IPayChannelStrategy {
             InputStream inputStream = request.getInputStream();// 从request中取得输入流
             Map<String, String> notifyMap = new HashMap<String, String>();
             try {
-                notifyMap = WepayUtil.parseXml(inputStream);
+                notifyMap = PayWepayUtils.parseXml(inputStream);
                 log.info("dragonNotify-->wepay json : {}", JSON.toJSONString(notifyMap));
             } catch (Exception e) {
                 e.printStackTrace();

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

@@ -4,7 +4,6 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.IWepayStrategy;
-import com.liquidnet.service.dragon.channel.wepay.util.WepayUtil;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
@@ -44,10 +43,11 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
             //追加请求参数
             SortedMap<String, Object> parameters = appendRequestParam(commonParams);
             //生成签名
-            String sign = WepayUtil.getSign(parameters,parentKey);
+            String sign = PayWepayUtils.getInstance().createSign(parameters);
             parameters.put("sign", sign);
+
             //构造支付请求xml
-            String data = WepayUtil.mapToXml(parameters);
+            String data = PayWepayUtils.getInstance().getRequestXml(parameters);
 
             HttpPost httpost = new HttpPost(this.getRequestUrl());
             httpost.setEntity(new StringEntity(data, "UTF-8"));
@@ -87,6 +87,8 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         payData.setPaySign(respWepayDto.getSign());
         payData.setSignType("MD5");
         payData.setTimeStamp(Long.valueOf(DateUtil.now().getTime()).toString());
+        payData.setPartnerId(respWepayDto.getMchId());
+        payData.setPrepayId(respWepayDto.getPrepayId());
         respDto.setPayData(payData);
         return respDto;
     }
@@ -99,7 +101,6 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         String nonceStr = PayWepayUtils.getInstance().getNonceStr();
         SortedMap<String, Object> parameters = new TreeMap<>();
         parameters.put("mch_id", PayWepayUtils.getInstance().getMerchantId());
-        parameters.put("appid", PayWepayUtils.getInstance().getAppId());
         parameters.put("nonce_str", nonceStr);
         parameters.put("spbill_create_ip", dragonPayBaseReqDto.getClientIp());
         parameters.put("total_fee", dragonPayBaseReqDto.getPrice().multiply(BigDecimal.valueOf(100L)).intValue());

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

@@ -4,6 +4,7 @@ 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.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,7 @@ public class WepayStrategyAppImpl extends AbstractWepayStrategy {
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         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

@@ -4,6 +4,7 @@ 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.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -30,6 +31,7 @@ public class WepayStrategyAppletImpl extends AbstractWepayStrategy{
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "JSAPI");
         requestMap.put("openid", requestMap.get("openId"));
+        requestMap.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
         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

@@ -4,6 +4,7 @@ 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.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -30,6 +31,7 @@ public class WepayStrategyJsImpl extends AbstractWepayStrategy{
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "JSAPI");
         requestMap.put("openid", requestMap.get("openId"));
+        requestMap.put("appid", PayWepayUtils.getInstance().getJS_APP_ID());
         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

@@ -4,6 +4,7 @@ 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.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,7 @@ public class WepayStrategyWapImpl extends AbstractWepayStrategy{
     @Override
     SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap) {
         requestMap.put("trade_type", "MWEB");
+        requestMap.put("appid", PayWepayUtils.getInstance().getWAP_APP_ID());
         return requestMap;
     }
 

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -72,8 +72,10 @@ public class PayController {
                @RequestParam(value = "expireTime",required = true)  String expireTime){
         //为什么在js和applet中才需要判断open_id?
         if(payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())){
-            if(StringUtil.isEmpty(openId)){
-                return ResponseDto.failure("微信支付openId不能为空!");
+            if(deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode())||deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
+                if (StringUtil.isEmpty(openId)) {
+                    return ResponseDto.failure("微信支付openId不能为空!");
+                }
             }
         }
         DragonPayBaseReqDto dragonPayBaseReqDto = new DragonPayBaseReqDto();
@@ -95,6 +97,7 @@ public class PayController {
         dragonPayBaseReqDto.setExpireTime(expireTime);
         return dragonOrdersService.dragonPay(dragonPayBaseReqDto);
     }
+
     @PostMapping("/checkOrder")
     @ApiOperation("订单查询")
     @ApiResponse(code = 200, message = "接口返回对象参数")

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/PayWepayUtils.java

@@ -2,13 +2,14 @@ package com.liquidnet.service.dragon.utils;
 
 import com.alipay.api.internal.util.file.IOUtils;
 import com.liquidnet.commons.lang.util.MD5Utils;
-import com.liquidnet.service.dragon.channel.wepay.resp.WePayRefundReturnDto;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContexts;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.dom4j.DocumentException;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
@@ -24,9 +25,13 @@ public class PayWepayUtils {
     private static PayWepayUtils instance = new PayWepayUtils();
 
     private final String merchantId = "1551961491";
-    private final String appId = "wx3498304dda39c5a1";
     private final String parentKey = "itIuO65O9yKmemOu3S8g1S4orqvCGwXK";
 
+    private final String APP_ID="wx86f9777acf2cb585";
+    private final String WEB_APP_ID="wx3498304dda39c5a1";
+    private final String JS_APP_ID="wx3498304dda39c5a1";
+    private final String WAP_APP_ID="wx3498304dda39c5a1";
+    private final String APPLET_APP_ID="wx4732efeaa2b08086";
 
     public PayWepayUtils() {
     }
@@ -36,8 +41,24 @@ public class PayWepayUtils {
     }
 
 
-    public String getAppId() {
-        return appId;
+    public String getAPP_ID() {
+        return APP_ID;
+    }
+
+    public String getAPPLET_APP_ID() {
+        return APPLET_APP_ID;
+    }
+
+    public String getJS_APP_ID() {
+        return JS_APP_ID;
+    }
+
+    public String getWEB_APP_ID() {
+        return WEB_APP_ID;
+    }
+
+    public String getWAP_APP_ID() {
+        return WAP_APP_ID;
     }
 
     public String getMerchantId() {
@@ -87,7 +108,7 @@ public class PayWepayUtils {
         return sb.toString();
     }
 
-    public String createSign(SortedMap<Object, Object> parameters) {
+    public String createSign(SortedMap<String, Object> parameters) {
         StringBuffer sb = new StringBuffer();
         Set es = parameters.entrySet();//所有参与传参的参数按照accsii排序（升序）
         Iterator it = es.iterator();
@@ -104,7 +125,7 @@ public class PayWepayUtils {
         return MD5Utils.md5(sb.toString()).toUpperCase();
     }
 
-    public String getRequestXml(SortedMap<Object, Object> parameters) {
+    public String getRequestXml(SortedMap<String, Object> parameters) {
         StringBuffer sb = new StringBuffer();
         sb.append("<xml>");
         Set es = parameters.entrySet();
@@ -142,4 +163,26 @@ public class PayWepayUtils {
             return "";
         }
     }
+
+    @SuppressWarnings("unchecked")
+    public static Map<String, String> parseXml(InputStream inputStream) throws Exception {
+
+        if (inputStream == null) {
+            return null;
+        }
+
+        Map<String, String> map = new HashMap<String, String>();// 将解析结果存储在HashMap中
+        SAXReader reader = new SAXReader();// 读取输入流
+        Document document = reader.read(inputStream);
+        Element root = document.getRootElement();// 得到xml根元素
+        List<Element> elementList = root.elements();// 得到根元素的所有子节点
+        for (Element e : elementList) { // 遍历所有子节点
+            map.put(e.getName(), e.getText());
+        }
+
+        inputStream.close(); // 释放资源
+        inputStream = null;
+
+        return map;
+    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

 package com.liquidnet.service.order.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
 import com.liquidnet.common.mq.constant.MQConst;
@@ -554,7 +555,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
         currentTime = System.currentTimeMillis();
         String returnData = HttpUtil.post(payUrl, httpData);
-        log.debug("NOTIFY_URL = " + synUrl);
+        log.debug("httpData = " + JSON.toJSONString(httpData));
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);