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

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonPayBaseReqDto.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * @date 2021/7/9 10:56
  */
 @Data
-public class DragonPayBaseReqDto implements Serializable{
+public class DragonPayBaseReqDto implements Serializable, Cloneable{
     private static final long serialVersionUID = -7273522103593077618L;
     private String payType;
     private String deviceFrom;
@@ -39,4 +39,14 @@ public class DragonPayBaseReqDto implements Serializable{
     public String toString(){
         return JSON.toJSONString(this);
     }
+
+    private static final DragonPayBaseReqDto obj = new DragonPayBaseReqDto();
+
+    public static DragonPayBaseReqDto getNew() {
+        try {
+            return (DragonPayBaseReqDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new DragonPayBaseReqDto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/biz/AlipayBiz.java

@@ -34,51 +34,10 @@ import java.util.*;
 @Component
 public class AlipayBiz{
     /**
-     * 支付宝支付
+     * tradeWapPay
      * @param alipayTradePayReq
      * @return
      */
-    public static Map<String, Object> tradeWapPay_yace(AlipayTradePayReq alipayTradePayReq) {
-        log.info("AlipayBiz.tradeWapPay-->> req : {}",alipayTradePayReq.toString());
-        String timeExpress = "5m";// 支付超时，线下扫码交易定义为5分钟
-
-        AlipayClient alipayClient = PayAlipayUtils.getInstance().getHttpClient();
-
-        SortedMap<String, Object> paramMap = new TreeMap<>();
-        paramMap.put("product_code", alipayTradePayReq.getProductCode());
-        paramMap.put("total_amount", alipayTradePayReq.getTotalAmount().toString());
-        paramMap.put("subject", alipayTradePayReq.getSubject());
-        paramMap.put("body", alipayTradePayReq.getBody());
-        paramMap.put("out_trade_no", alipayTradePayReq.getOutTradeNo());
-        paramMap.put("timeout_express", timeExpress);
-
-
-        AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
-        request.setNotifyUrl(alipayTradePayReq.getNotifyUrl());
-//        request.setTimestamp(DateUtil.now());
-        log.info("bizContent :{}", JSONObject.toJSONString(paramMap));
-        request.setBizContent(JSONObject.toJSONString(paramMap));
-        try {
-            long startTime = System.currentTimeMillis();
-            AlipayTradeWapPayResponse response = new AlipayTradeWapPayResponse();
-            response.setBody("alipay_sdk=alipay-sdk-java-dynamicVersionNo&app_id=2019082866535131&biz_content=%7B%22body%22%3A%22pay+%E5%8E%8B%E6%B5%8B-%E6%B5%8B%E8%AF%95%E7%A5%A8-07%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%22%2C%22out_trade_no%22%3A%22PAY2021072022223316428316%22%2C%22product_code%22%3A%22QUICK_WAP_PAY%22%2C%22subject%22%3A%2207%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%E6%B5%8B%E8%AF%95%E7%A5%A8-pay+%E5%8E%8B%E6%B5%8B%22%2C%22timeout_express%22%3A%225m%22%2C%22total_amount%22%3A%220.01%22%7D&charset=utf-8&format=json&method=alipay.trade.wap.pay&notify_url=https%3A%2F%2Fdragon.zhengzai.tv%2Fdragon%2Fnotify%2Falipay%2Fwap&sign=MDiFk1Ut6keiE7mKiNzMg2eY01%2BbjcQFfjqBamPyAEAnTsLTh2u6xIiz5mWFVE%2B71qK95oetdQ%2B%2FMXOhc8fniHuef3JDRFkqjeJ0HPIIofndHHYKZYPsTkAnq6Axr3zrhvE%2BpzlWNxJS2Ci4cFFAkPPnTnHfT6tjIVbFE3HSnaWYWnWLfXkH%2Bn7QnxWsQAylq7gkAn67sCIXGNkI%2BZbhVLQnXkXJ5b88q3l%2B4Xaf9G5APsGPje7NKQ%2BuxgL%2BcAE7%2BVatfXQfB4%2BJ%2FW1xsOaS2fS545PpaD%2FI5R75vqBliMi0ed8UjAD7LUoZ8X8ZuxZY9zoyZDyhC9ssyek5%2FRpjpw%3D%3D&sign_type=RSA2&timestamp=2021-07-20+22%3A22%3A33&version=1.0");
-            response.setSubCode("ACQ.TRADE_HAS_SUCCESS");
-            log.info("alipay-alipayClient.sdkExecut->耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
-//            {"body":"alipay_sdk=alipay-sdk-java-dynamicVersionNo&app_id=2019082866535131&biz_content=%7B%22body%22%3A%22pay+%E5%8E%8B%E6%B5%8B-%E6%B5%8B%E8%AF%95%E7%A5%A8-07%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%22%2C%22out_trade_no%22%3A%22PAY2021072022223316428316%22%2C%22product_code%22%3A%22QUICK_WAP_PAY%22%2C%22subject%22%3A%2207%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%E6%B5%8B%E8%AF%95%E7%A5%A8-pay+%E5%8E%8B%E6%B5%8B%22%2C%22timeout_express%22%3A%225m%22%2C%22total_amount%22%3A%220.01%22%7D&charset=utf-8&format=json&method=alipay.trade.wap.pay&notify_url=https%3A%2F%2Fdragon.zhengzai.tv%2Fdragon%2Fnotify%2Falipay%2Fwap&sign=MDiFk1Ut6keiE7mKiNzMg2eY01%2BbjcQFfjqBamPyAEAnTsLTh2u6xIiz5mWFVE%2B71qK95oetdQ%2B%2FMXOhc8fniHuef3JDRFkqjeJ0HPIIofndHHYKZYPsTkAnq6Axr3zrhvE%2BpzlWNxJS2Ci4cFFAkPPnTnHfT6tjIVbFE3HSnaWYWnWLfXkH%2Bn7QnxWsQAylq7gkAn67sCIXGNkI%2BZbhVLQnXkXJ5b88q3l%2B4Xaf9G5APsGPje7NKQ%2BuxgL%2BcAE7%2BVatfXQfB4%2BJ%2FW1xsOaS2fS545PpaD%2FI5R75vqBliMi0ed8UjAD7LUoZ8X8ZuxZY9zoyZDyhC9ssyek5%2FRpjpw%3D%3D&sign_type=RSA2&timestamp=2021-07-20+22%3A22%3A33&version=1.0","success":true}
-//            JSONObject responseJSON = JSONObject.parseObject(JSONObject.toJSONString(response));
-            Map<String,Object> responseJSON = JsonUtils.OM().convertValue(response,Map.class);
-            log.info("AlipayUtil-->tradeWapPay-->支付宝返回结果:{}", JsonUtils.toJson(response));
-            return responseJSON;
-        } catch (Exception e) {
-            log.error("支付宝支付异常:{}", e);
-            JSONObject resultJSON = new JSONObject();
-            resultJSON.put("outTradeNo", alipayTradePayReq.getOutTradeNo());
-            resultJSON.put("totalAmount", alipayTradePayReq.getTotalAmount().toString());
-            resultJSON.put("errorCode", "9999");
-            return resultJSON;
-        }
-    }
-
     public static Map<String, Object> tradeWapPay(AlipayTradePayReq alipayTradePayReq) {
         log.info("AlipayBiz.tradeWapPay-->> req : {}",alipayTradePayReq.toString());
         String timeExpress = "5m";// 支付超时，线下扫码交易定义为5分钟
@@ -102,13 +61,16 @@ public class AlipayBiz{
         try {
             long startTime = System.currentTimeMillis();
             AlipayTradeWapPayResponse response = alipayClient.sdkExecute(request);
+//            AlipayTradeWapPayResponse response = new AlipayTradeWapPayResponse();
+//            response.setBody("alipay_sdk=alipay-sdk-java-dynamicVersionNo&app_id=2019082866535131&biz_content=%7B%22body%22%3A%22pay+%E5%8E%8B%E6%B5%8B-%E6%B5%8B%E8%AF%95%E7%A5%A8-07%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%22%2C%22out_trade_no%22%3A%22PAY2021072022223316428316%22%2C%22product_code%22%3A%22QUICK_WAP_PAY%22%2C%22subject%22%3A%2207%E6%9C%8801%E6%97%A5%7E08%E6%9C%8831%E6%97%A5%E6%B5%8B%E8%AF%95%E7%A5%A8-pay+%E5%8E%8B%E6%B5%8B%22%2C%22timeout_express%22%3A%225m%22%2C%22total_amount%22%3A%220.01%22%7D&charset=utf-8&format=json&method=alipay.trade.wap.pay&notify_url=https%3A%2F%2Fdragon.zhengzai.tv%2Fdragon%2Fnotify%2Falipay%2Fwap&sign=MDiFk1Ut6keiE7mKiNzMg2eY01%2BbjcQFfjqBamPyAEAnTsLTh2u6xIiz5mWFVE%2B71qK95oetdQ%2B%2FMXOhc8fniHuef3JDRFkqjeJ0HPIIofndHHYKZYPsTkAnq6Axr3zrhvE%2BpzlWNxJS2Ci4cFFAkPPnTnHfT6tjIVbFE3HSnaWYWnWLfXkH%2Bn7QnxWsQAylq7gkAn67sCIXGNkI%2BZbhVLQnXkXJ5b88q3l%2B4Xaf9G5APsGPje7NKQ%2BuxgL%2BcAE7%2BVatfXQfB4%2BJ%2FW1xsOaS2fS545PpaD%2FI5R75vqBliMi0ed8UjAD7LUoZ8X8ZuxZY9zoyZDyhC9ssyek5%2FRpjpw%3D%3D&sign_type=RSA2&timestamp=2021-07-20+22%3A22%3A33&version=1.0");
+//            response.setSubCode("ACQ.TRADE_HAS_SUCCESS");
             log.info("alipay-alipayClient.sdkExecut->耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
 
 //            JSONObject responseJSON = JSONObject.parseObject(JSONObject.toJSONString(response));
             Map<String,Object> responseJSON = JsonUtils.OM().convertValue(response,Map.class);
             log.info("AlipayUtil-->tradeWapPay-->支付宝返回结果:{}", JsonUtils.toJson(response));
             return responseJSON;
-        } catch (AlipayApiException e) {
+        } catch (Exception e) {
             log.error("支付宝支付异常:{}", e);
             JSONObject resultJSON = ObjectUtil.cloneJsonObjectObj();
             resultJSON.put("outTradeNo", alipayTradePayReq.getOutTradeNo());

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/req/AlipayTradePayReq.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.alipay.req;
 import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -15,7 +16,8 @@ import java.math.BigDecimal;
  * @date 2021/7/9 17:50
  */
 @Data
-public class AlipayTradePayReq {
+public class AlipayTradePayReq implements Serializable, Cloneable{
+    private static final long serialVersionUID = -5827961038383330701L;
     private String productCode;
     private BigDecimal totalAmount;
     private String subject;
@@ -28,4 +30,13 @@ public class AlipayTradePayReq {
     public String toString(){
         return JSON.toJSONString(this);
     }
+    private static final AlipayTradePayReq obj = new AlipayTradePayReq();
+
+    public static AlipayTradePayReq getNew() {
+        try {
+            return (AlipayTradePayReq) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AlipayTradePayReq();
+        }
+    }
 }

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

@@ -39,7 +39,7 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         //设置productCode
         setProductCode();
 
-        AlipayTradePayReq alipayTradePayReq = new AlipayTradePayReq();
+        AlipayTradePayReq alipayTradePayReq = AlipayTradePayReq.getNew();
         alipayTradePayReq.setProductCode(this.productCode);
         alipayTradePayReq.setTotalAmount(dragonPayBaseReqDto.getPrice());
         alipayTradePayReq.setSubject(dragonPayBaseReqDto.getName());

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

@@ -83,7 +83,7 @@ public class PayController {
                 }
             }
         }
-        DragonPayBaseReqDto dragonPayBaseReqDto = new DragonPayBaseReqDto();
+        DragonPayBaseReqDto dragonPayBaseReqDto = DragonPayBaseReqDto.getNew();
         dragonPayBaseReqDto.setPayType(payType);
         dragonPayBaseReqDto.setDeviceFrom(deviceFrom);
         dragonPayBaseReqDto.setOpenId(openId);