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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -354,8 +354,9 @@ public class PerformanceVoUtils {
                     ticketRelations.setUpdatedAt(updatedAt);
                     if (ticketItem.getStatus() == -2) {
                         KylinTicketPartnerVo item = kylinTicketPartnerVoList.get(0);
-                        tickets.setAdvanceMinuteMember(ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", item.getTicketsId())).getAdvanceMinuteMember());
+                        tickets.setAdvanceMinuteMember(5);
                         ticketStatus.setIsMember(item.getIsMember());
+                        ticketStatus.setMemberLimitCount(1);
                         ticketRelations.setCreatedAt(LocalDateTime.now());
                         tickets.setCreatedAt(LocalDateTime.now());
 

liquidnet-bus-do/liquidnet-service-dragon-do/src/main/java/com/liquidnet/service/dragon/dto/DragonOrdersDto.java

@@ -24,6 +24,11 @@ public class DragonOrdersDto implements Serializable, Cloneable {
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
 
+    /**
+     * order_id
+     */
+    private String orderId;
+
     /**
      * status
      */
@@ -69,6 +74,11 @@ public class DragonOrdersDto implements Serializable, Cloneable {
      */
     private String notifyUrl;
 
+    /**
+     * 通知状态(0初始化 1通知成功 2 通知失败 3通知超时)
+     */
+    private Integer notifyStatus;
+
     /**
      * payment_type
      */

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/biz/DragonServiceCommonBiz.java

 package com.liquidnet.service.dragon.biz;
 
-import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.dragon.bo.PayNotifyReqBo;
@@ -9,7 +8,6 @@ import com.liquidnet.service.dragon.dto.DragonOrdersDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.dto.PayNotifyDto;
-import com.liquidnet.service.dragon.entity.DragonOrders;
 import com.liquidnet.service.dragon.utils.DataUtils;
 import com.liquidnet.service.dragon.utils.MqHandleUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -36,13 +34,13 @@ public class DragonServiceCommonBiz {
     @Autowired
     private DataUtils dataUtils;
 
-    public DragonOrders buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
+    public DragonOrdersDto buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
         //构造订单
-        DragonOrders orders = DragonOrders.getNew();
+        DragonOrdersDto orders = DragonOrdersDto.getNew();
 //        orders.setMid();
         orders.setOrderId(IDGenerator.nextTimeId());
         orders.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode()));
-        orders.setCode(respDto.getCode());
+        orders.setCode(dragonPayBaseReqDto.getCode());
         orders.setType(dragonPayBaseReqDto.getType());
         orders.setPrice(dragonPayBaseReqDto.getPrice());
         orders.setName(dragonPayBaseReqDto.getName());
@@ -58,11 +56,10 @@ public class DragonServiceCommonBiz {
         orders.setCreatedAt(LocalDateTime.now());
 //        orders.setUpdatedAt();
 
-        DragonOrdersDto ordersDto = DragonOrdersDto.getNew();
-        BeanUtil.copy(orders,ordersDto);
+
         long startTime = System.currentTimeMillis();
         //放到redis缓存中
-        dataUtils.createPayOrder(orders.getCode(),ordersDto);
+        dataUtils.createPayOrder(orders.getCode(),orders);
         log.info("redis-createPayOrder->耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
         // 持久化到数据库
         startTime = System.currentTimeMillis();

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

@@ -62,13 +62,27 @@ public class AlipayBiz{
             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));
+//            Map<String,Object> responseJSON = JsonUtils.OM().convertValue(response,Map.class);
+            startTime = System.currentTimeMillis();
+            Map<String,Object> responseJSON = ObjectUtil.cloneHashMapStringAndObj();
+            log.info("AlipayUtil-->tradeWapPay-->cloneHashMapStringAndObj 耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
+
+            responseJSON.put("code",response.getCode());
+            responseJSON.put("msg",response.getMsg());
+            responseJSON.put("subCode",response.getSubCode());
+            responseJSON.put("subMsg",response.getSubMsg());
+            responseJSON.put("body",response.getBody());
+            responseJSON.put("merchantOrderNo",response.getMerchantOrderNo());
+            responseJSON.put("outTradeNo",response.getOutTradeNo());
+            responseJSON.put("sellerId",response.getSellerId());
+            responseJSON.put("totalAmount",response.getTotalAmount());
+            responseJSON.put("tradeNo",response.getTradeNo());
+            startTime = System.currentTimeMillis();
+//            log.info("AlipayUtil-->tradeWapPay-->支付宝返回结果:{}", JsonUtils.toJson(response));
+            log.info("AlipayUtil-->tradeWapPay-->支付宝返回结果 耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
             return responseJSON;
         } catch (Exception e) {
             log.error("支付宝支付异常:{}", e);

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

@@ -51,6 +51,7 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         alipayTradePayReq.setTimeExpire(timeExpire);
         alipayTradePayReq.setNotifyUrl(this.getNotifyUrl());
         alipayTradePayReq.setTimestamp(dragonPayBaseReqDto.getCreateDate());
+
         //调用支付
         long startTime = System.currentTimeMillis();
         Map<String, Object> result = this.executePay(alipayTradePayReq);
@@ -61,7 +62,8 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         respDto = this.buildResponseDto(respDto,result);
 
         //支付订单持久化
-        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respDto);
+        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,null);
+
         return ResponseDto.success(respDto);
     }
 

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

@@ -20,6 +20,7 @@ public class ObjectUtil {
     private static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
     private static final LinkedList<String> linkedListStr = new LinkedList<String>();
     private static final HashMap<String, String> hashMapStringAndString = new HashMap<>();
+    private static final HashMap<String, Object> hashMapStringAndObj = new HashMap<>();
     private static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
     private static final JSONObject jsonObjectObj = new JSONObject();
 
@@ -35,6 +36,10 @@ public class ObjectUtil {
         return (HashMap<String, String>) hashMapStringAndString.clone();
     }
 
+    public static HashMap<String, Object> cloneHashMapStringAndObj() {
+        return (HashMap<String, Object>) hashMapStringAndObj.clone();
+    }
+
     public static AlipayTradeWapPayRequest cloneAlipayTradeWapPayRequest() {
         return alipayTradeWapPayRequest;
     }