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

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

@@ -22,4 +22,5 @@ public class DragonPayOrderQueryRespDto {
     private String orderCode;
     private BigDecimal price;
     private String paymentType;
+    private String paymentAt;
 }

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

@@ -13,4 +13,5 @@ public class PayNotifyDto {
     private String orderCode;
     private BigDecimal price;
     private String paymentType;
+    private String paymentAt;
 }

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;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonServiceCommonBiz
+ * @Package com.liquidnet.service.dragon.biz
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/19 18:06
+ */
+@Slf4j
+@Component
+public class DragonServiceCommonBiz {
+    private MqHandleUtil mqHandleUtil;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    public DragonOrders buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
+        //构造订单
+        DragonOrders orders = new DragonOrders();
+//        orders.setMid();
+        orders.setOrderId(IDGenerator.nextTimeId());
+        orders.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode()));
+        orders.setCode(respDto.getCode());
+        orders.setType(dragonPayBaseReqDto.getType());
+        orders.setPrice(dragonPayBaseReqDto.getPrice());
+        orders.setName(dragonPayBaseReqDto.getName());
+        orders.setDetail(dragonPayBaseReqDto.getDetail());
+        orders.setOrderCode(dragonPayBaseReqDto.getOrderCode());
+        orders.setClientIp(dragonPayBaseReqDto.getClientIp());
+        orders.setNotifyUrl(dragonPayBaseReqDto.getNotifyUrl());
+        orders.setNotifyStatus(DragonConstant.PayNotifyStatusEnum.NOTIFY_INIT.getCode());
+        orders.setPaymentType((dragonPayBaseReqDto.getDeviceFrom()+dragonPayBaseReqDto.getPayType()).toUpperCase());
+//        orders.setPaymentId();
+        orders.setPaymentAt(LocalDateTime.now());
+//        orders.setFinishedAt();
+        orders.setCreatedAt(LocalDateTime.now());
+//        orders.setUpdatedAt();
+
+        DragonOrdersDto ordersDto = new DragonOrdersDto();
+        BeanUtil.copy(orders,ordersDto);
+        //放到redis缓存中
+        dataUtils.createPayOrder(orders.getCode(),ordersDto);
+        // 持久化到数据库
+        boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                SqlMapping.get("dragon_orders.insert"),
+                new Object[]{orders.getOrderId(),orders.getStatus(), orders.getCode(), orders.getType()
+                        , orders.getPrice(), orders.getName(), orders.getDetail()
+                        , orders.getOrderCode(), orders.getClientIp()
+                        , orders.getNotifyUrl(), orders.getNotifyStatus(),orders.getPaymentType(),
+                        orders.getPaymentId(), orders.getPaymentAt()
+                        , orders.getFinishedAt(), orders.getCreatedAt()
+                        , orders.getUpdatedAt(),orders.getDeletedAt()}
+                ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
+        );
+        return orders;
+    }
+
+    /**
+     * 更新支付状态
+     * @param code
+     * @param paymentId
+     * @return
+     */
+    public boolean updateOrderStatus(String code,Integer status,String paymentId){
+        try {
+            LocalDateTime finishedAt = LocalDateTime.now();
+            LocalDateTime updateAt = LocalDateTime.now();
+            //t.status = ?  ,t.payment_id = ?,t.finished_at = ?,t.updated_at =? where t.code = ?
+            boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                    SqlMapping.get("dragon_orders.updateOrderStatus"),
+                    new Object[]{status,paymentId,finishedAt, updateAt,code}
+                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
+            );
+            if(insertResult) return true;
+        } catch (Exception e) {
+            log.error("dragon:updateDragonOrderStatus:error msg:{}",e);
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 更新支付通知状态
+     * @param code
+     * @return
+     */
+    public boolean updateNotifyStatus(String code,Integer status){
+        try {
+            LocalDateTime updateAt = LocalDateTime.now();
+            //update dragon_orders t set t.notify_status = ? ,t.updated_at =? where t.code = ?
+            boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                    SqlMapping.get("dragon_orders.updateNotifyStatus"),
+                    new Object[]{status,updateAt,code}
+                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
+            );
+            if(insertResult) return true;
+        } catch (Exception e) {
+            log.error("dragon:updateNotifyStatus:error msg:{}",e);
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 三方异步通知入库
+     * @param paymentType
+     * @param content
+     */
+    public void createDragonOrderLogs(String code,String paymentType,String content){
+        try {
+            String orderId = IDGenerator.nextTimeId();
+            LocalDateTime createAt = LocalDateTime.now();
+            LocalDateTime updateAt = null;
+            LocalDateTime deleteAt = null;
+            boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                    SqlMapping.get("dragon_order_logs.insert"),
+                    new Object[]{code,paymentType,content, createAt, updateAt,deleteAt}
+                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_NOTIFY_KEY.getCode()
+            );
+        } catch (Exception e) {
+            log.error("dragon:createOrderLog:error msg:{}",e);
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 商户异步通知入库
+     * @param payNotifyReqBo
+     * @param notifyParam
+     */
+    public void createDragonPayNotify(PayNotifyReqBo payNotifyReqBo,String notifyParam){
+        PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
+        try {
+            String code = payNotifyDto.getCode();
+            String orderCode = payNotifyDto.getOrderCode();
+            String notifyUrl = payNotifyReqBo.getNotifyUrl();
+            String notifyData = notifyParam;
+            LocalDateTime createAt = LocalDateTime.now();
+            LocalDateTime updateAt = LocalDateTime.now();
+            boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                    SqlMapping.get("dragon_pay_notify.insert"),
+                    new Object[]{code,orderCode,notifyUrl,notifyData, createAt, updateAt}
+                    ,DragonConstant.MysqlRedisQueueEnum.PAY_MCH_NOTIFY_KEY.getCode()
+            );
+            log.info("dragon:createDragonPayNotify:success code:{}",code);
+        } catch (Exception e) {
+            log.error("dragon:createDragonPayNotify:error msg:{}",e);
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 商户异步通知失败入库
+     * @param payNotifyReqBo
+     * @param notifyParam
+     */
+    public void createDragonPayNotifyFail(PayNotifyReqBo payNotifyReqBo, String notifyParam){
+        PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
+        try {
+            String code = payNotifyDto.getCode();
+            String orderCode = payNotifyDto.getOrderCode();
+            String notifyUrl = payNotifyReqBo.getNotifyUrl();
+            String notifyData = notifyParam;
+            String failDesc = "通知失败";
+            LocalDateTime createAt = LocalDateTime.now();
+            LocalDateTime updateAt = LocalDateTime.now();
+            boolean insertResult = mqHandleUtil.sendMySqlRedis(
+                    SqlMapping.get("dragon_pay_notify_fail.insert"),
+                    new Object[]{code,orderCode,notifyUrl,notifyData,failDesc,createAt, updateAt}
+                    , DragonConstant.MysqlRedisQueueEnum.PAY_MCH_NOTIFY_ERROR_KEY.getCode()
+            );
+            log.info("dragon:createDragonPayNotifyFail:success code:{}",code);
+        } catch (Exception e) {
+            log.error("dragon:createDragonPayNotifyFail:error msg:{}",e);
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
 import com.alibaba.fastjson.JSON;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.dragon.channel.alipay.biz.AlipayBiz;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.alipay.req.AlipayTradePayReq;
 import com.liquidnet.service.dragon.channel.alipay.strategy.IAlipayStrategy;
 import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
@@ -25,12 +25,14 @@ import java.util.Map;
  */
 @Slf4j
 public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
-    @Autowired
-    private AlipayBiz alipayBiz;
 
     @Autowired
     private DragonPayBiz dragonPayBiz;
 
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
+
     protected String productCode = "QUICK_WAP_PAY";
 
     @Override
@@ -59,7 +61,7 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
         respDto = this.buildResponseDto(respDto,result);
 
         //支付订单持久化
-        dragonPayBiz.buildPayOrders(dragonPayBaseReqDto,respDto);
+        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respDto);
         return ResponseDto.success(respDto);
     }
 

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

 package com.liquidnet.service.dragon.channel.strategy.biz;
 
 import com.alibaba.fastjson.JSON;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.bo.PayNotifyReqBo;
 import com.liquidnet.service.dragon.constant.DragonConstant;
 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;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.config.RequestConfig;
@@ -45,97 +40,8 @@ import java.util.List;
 @Component
 public class DragonPayBiz {
     @Autowired
-    private MqHandleUtil mqHandleUtil;
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
 
-    @Autowired
-    private DataUtils dataUtils;
-
-    public DragonOrders buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
-        //构造订单
-        DragonOrders orders = new DragonOrders();
-//        orders.setMid();
-        orders.setOrderId(IDGenerator.nextTimeId());
-        orders.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode()));
-        orders.setCode(respDto.getCode());
-        orders.setType(dragonPayBaseReqDto.getType());
-        orders.setPrice(dragonPayBaseReqDto.getPrice());
-        orders.setName(dragonPayBaseReqDto.getName());
-        orders.setDetail(dragonPayBaseReqDto.getDetail());
-        orders.setOrderCode(dragonPayBaseReqDto.getOrderCode());
-        orders.setClientIp(dragonPayBaseReqDto.getClientIp());
-        orders.setNotifyUrl(dragonPayBaseReqDto.getNotifyUrl());
-        orders.setNotifyStatus(DragonConstant.PayNotifyStatusEnum.NOTIFY_INIT.getCode());
-        orders.setPaymentType((dragonPayBaseReqDto.getDeviceFrom()+dragonPayBaseReqDto.getPayType()).toUpperCase());
-//        orders.setPaymentId();
-        orders.setPaymentAt(LocalDateTime.now());
-//        orders.setFinishedAt();
-        orders.setCreatedAt(LocalDateTime.now());
-//        orders.setUpdatedAt();
-
-        DragonOrdersDto ordersDto = new DragonOrdersDto();
-        BeanUtil.copy(orders,ordersDto);
-        //放到redis缓存中
-        dataUtils.createPayOrder(orders.getCode(),ordersDto);
-        // 持久化到数据库
-        boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                SqlMapping.get("dragon_orders.insert"),
-                new Object[]{orders.getOrderId(),orders.getStatus(), orders.getCode(), orders.getType()
-                        , orders.getPrice(), orders.getName(), orders.getDetail()
-                        , orders.getOrderCode(), orders.getClientIp()
-                        , orders.getNotifyUrl(), orders.getNotifyStatus(),orders.getPaymentType(),
-                        orders.getPaymentId(), orders.getPaymentAt()
-                        , orders.getFinishedAt(), orders.getCreatedAt()
-                        , orders.getUpdatedAt(),orders.getDeletedAt()}
-                        ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
-        );
-        return orders;
-    }
-
-    /**
-     * 更新支付状态
-     * @param code
-     * @param paymentId
-     * @return
-     */
-    public boolean updateOrderStatus(String code,Integer status,String paymentId){
-        try {
-            LocalDateTime finishedAt = LocalDateTime.now();
-            LocalDateTime updateAt = LocalDateTime.now();
-            //t.status = ?  ,t.payment_id = ?,t.finished_at = ?,t.updated_at =? where t.code = ?
-            boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                    SqlMapping.get("dragon_orders.updateOrderStatus"),
-                    new Object[]{status,paymentId,finishedAt, updateAt,code}
-                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
-            );
-            if(insertResult) return true;
-        } catch (Exception e) {
-            log.error("dragon:updateDragonOrderStatus:error msg:{}",e);
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    /**
-     * 更新支付通知状态
-     * @param code
-     * @return
-     */
-    public boolean updateNotifyStatus(String code,Integer status){
-        try {
-            LocalDateTime updateAt = LocalDateTime.now();
-            //update dragon_orders t set t.notify_status = ? ,t.updated_at =? where t.code = ?
-            boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                    SqlMapping.get("dragon_orders.updateNotifyStatus"),
-                    new Object[]{status,updateAt,code}
-                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode()
-            );
-            if(insertResult) return true;
-        } catch (Exception e) {
-            log.error("dragon:updateNotifyStatus:error msg:{}",e);
-            e.printStackTrace();
-        }
-        return false;
-    }
 
      public PayNotifyReqBo buildPayNotifyReqBo(DragonOrdersDto dragonOrdersDto){
         PayNotifyReqBo payNotifyReqBo = new PayNotifyReqBo();
@@ -148,85 +54,15 @@ public class DragonPayBiz {
         payNotifyDto.setOrderCode(dragonOrdersDto.getOrderCode());
         payNotifyDto.setPrice(dragonOrdersDto.getPrice());
         payNotifyDto.setPaymentType(dragonOrdersDto.getPaymentType());
+        if(StringUtil.isNotNull(dragonOrdersDto.getPaymentAt())){
+            payNotifyDto.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.format(dragonOrdersDto.getPaymentAt()));
+        }else{
+            payNotifyDto.setPaymentAt("");
+        }
         payNotifyReqBo.setPayNotifyDto(payNotifyDto);
         return payNotifyReqBo;
     }
 
-    /**
-     * 三方异步通知入库
-     * @param paymentType
-     * @param content
-     */
-    public void createDragonOrderLogs(String code,String paymentType,String content){
-        try {
-            String orderId = IDGenerator.nextTimeId();
-            LocalDateTime createAt = LocalDateTime.now();
-            LocalDateTime updateAt = null;
-            LocalDateTime deleteAt = null;
-            boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                    SqlMapping.get("dragon_order_logs.insert"),
-                    new Object[]{code,paymentType,content, createAt, updateAt,deleteAt}
-                    ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_NOTIFY_KEY.getCode()
-            );
-        } catch (Exception e) {
-            log.error("dragon:createOrderLog:error msg:{}",e);
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 商户异步通知入库
-     * @param payNotifyReqBo
-     * @param notifyParam
-     */
-    public void createDragonPayNotify(PayNotifyReqBo payNotifyReqBo,String notifyParam){
-        PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
-        try {
-            String code = payNotifyDto.getCode();
-            String orderCode = payNotifyDto.getOrderCode();
-            String notifyUrl = payNotifyReqBo.getNotifyUrl();
-            String notifyData = notifyParam;
-            LocalDateTime createAt = LocalDateTime.now();
-            LocalDateTime updateAt = LocalDateTime.now();
-            boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                    SqlMapping.get("dragon_pay_notify.insert"),
-                    new Object[]{code,orderCode,notifyUrl,notifyData, createAt, updateAt}
-                    ,DragonConstant.MysqlRedisQueueEnum.PAY_MCH_NOTIFY_KEY.getCode()
-            );
-            log.info("dragon:createDragonPayNotify:success code:{}",code);
-        } catch (Exception e) {
-            log.error("dragon:createDragonPayNotify:error msg:{}",e);
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 商户异步通知失败入库
-     * @param payNotifyReqBo
-     * @param notifyParam
-     */
-    public void createDragonPayNotifyFail(PayNotifyReqBo payNotifyReqBo,String notifyParam){
-        PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
-        try {
-            String code = payNotifyDto.getCode();
-            String orderCode = payNotifyDto.getOrderCode();
-            String notifyUrl = payNotifyReqBo.getNotifyUrl();
-            String notifyData = notifyParam;
-            String failDesc = "通知失败";
-            LocalDateTime createAt = LocalDateTime.now();
-            LocalDateTime updateAt = LocalDateTime.now();
-            boolean insertResult = mqHandleUtil.sendMySqlRedis(
-                    SqlMapping.get("dragon_pay_notify_fail.insert"),
-                    new Object[]{code,orderCode,notifyUrl,notifyData,failDesc,createAt, updateAt}
-                    ,DragonConstant.MysqlRedisQueueEnum.PAY_MCH_NOTIFY_ERROR_KEY.getCode()
-            );
-            log.info("dragon:createDragonPayNotifyFail:success code:{}",code);
-        } catch (Exception e) {
-            log.error("dragon:createDragonPayNotifyFail:error msg:{}",e);
-            e.printStackTrace();
-        }
-    }
-
 
 //    public void sendNotifyBackup(PayNotifyReqBo payNotifyReqBo){
 //        PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
@@ -265,7 +101,7 @@ public class DragonPayBiz {
 //            e.printStackTrace();
 //        }
 //    }
-    public void sendNotify(PayNotifyReqBo payNotifyReqBo){
+    public boolean sendNotify(PayNotifyReqBo payNotifyReqBo){
         PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
         LocalDateTime nowTime = LocalDateTime.now();
         CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -287,6 +123,7 @@ public class DragonPayBiz {
             nvps.add(new BasicNameValuePair("orderCode", payNotifyDto.getOrderCode()));
             nvps.add(new BasicNameValuePair("price", payNotifyDto.getPrice().toString()));
             nvps.add(new BasicNameValuePair("paymentType", payNotifyDto.getPaymentType()));
+            nvps.add(new BasicNameValuePair("paymentAt", payNotifyDto.getPaymentAt()));
             jsonData = JSON.toJSONString(nvps);
             log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
             log.info("dragon:notify:post data:{}",jsonData);
@@ -297,27 +134,29 @@ public class DragonPayBiz {
             String response = EntityUtils.toString(responseObj.getEntity(), "utf-8");
             log.debug("PAY RESPONSE=" + response);
             if (response.equals("success")) {
-                this.createDragonPayNotify(payNotifyReqBo,jsonData);
+                dragonServiceCommonBiz.createDragonPayNotify(payNotifyReqBo,jsonData);
                 //更新通知状态-通知成功
-                this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_SUCCESS.getCode()));
+                dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_SUCCESS.getCode()));
+                return true;
             } else {
-                this.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
+                dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
                 //更新通知状态-通知失败
-                this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
+                dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
+                return false;
             }
 
         } catch (ConnectTimeoutException e) {
             log.error("dragon:sendNotify 请求超时",e);
-            this.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
+            dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
             //更新通知状态-通知失败
-            this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
-
+            dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
+            return false;
         } catch (Exception e) {
             log.error("dragon:sendNotify 请求失败",e);
-            this.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
+            dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
             //更新通知状态-通知失败
-            this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
-
+            dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
+            return false;
         }finally {
             //释放连接
             try {

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

 package com.liquidnet.service.dragon.channel.strategy.impl;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
 import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
 import com.liquidnet.service.dragon.constant.DragonConstant;
@@ -32,6 +33,9 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
     @Autowired
     private DataUtils dataUtils;
 
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
     @Override
     public abstract ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
 
@@ -49,7 +53,7 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
      * @param bankReturnMsg
      */
     @Transactional(rollbackFor = Exception.class)
-    protected void completeSuccessOrder(DragonOrdersDto dragonOrdersDto, String bankTrxNo, LocalDateTime timeEnd, String bankReturnMsg) {
+    protected boolean completeSuccessOrder(DragonOrdersDto dragonOrdersDto, String bankTrxNo, LocalDateTime timeEnd, String bankReturnMsg) {
         log.info("订单支付成功!");
         dragonOrdersDto.setPaymentAt(timeEnd);
         dragonOrdersDto.setPaymentId(bankTrxNo);// 设置银行流水号
@@ -57,9 +61,9 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
         //更新缓存
         dataUtils.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto);
         //修改订单状态
-        dragonPayBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),bankTrxNo);
+        dragonServiceCommonBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),bankTrxNo);
         //通知商户
-        dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));
+        return dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));
     }
 
     /**
@@ -67,7 +71,7 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
      * @param dragonOrdersDto
      * @param bankReturnMsg
      */
-    protected void completeFailOrder(DragonOrdersDto dragonOrdersDto, String bankReturnMsg) {
+    protected boolean completeFailOrder(DragonOrdersDto dragonOrdersDto, String bankReturnMsg) {
         log.info("订单支付失败!");
 //        dragonOrdersDto.setPaymentAt(timeEnd);
 //        dragonOrdersDto.setPaymentId(bankTrxNo);// 设置银行流水号
@@ -75,9 +79,9 @@ public abstract class AbstractPayChannelStrategyImpl implements IPayChannelStrat
         //更新缓存
         dataUtils.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto);
         //修改订单状态
-        dragonPayBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),null);
+        dragonServiceCommonBiz.updateOrderStatus(dragonOrdersDto.getCode(),dragonOrdersDto.getStatus(),null);
         //通知商户
-        dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));
+        return dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(dragonOrdersDto));
     }
 
 }

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

@@ -7,6 +7,7 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.alipay.biz.AlipayBiz;
 import com.liquidnet.service.dragon.channel.alipay.constant.AlipayConstant;
 import com.liquidnet.service.dragon.channel.alipay.strategy.AlipayStrategyContext;
@@ -20,7 +21,6 @@ import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import com.liquidnet.service.dragon.service.impl.DragonOrderRefundsServiceImpl;
 import com.liquidnet.service.dragon.utils.DataUtils;
-import com.liquidnet.service.dragon.utils.MqHandleUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,7 +57,7 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
     private DragonPayBiz dragonPayBiz;
 
     @Autowired
-    private MqHandleUtil mqHandleUtil;
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
 
     @Autowired
     private DragonOrderRefundsServiceImpl dragonOrderRefundsService;
@@ -88,11 +88,11 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
         log.info("接收到{}支付结果{}", payType, notifyMap);
 
 
-        String returnStr = null;
+        String returnStr = "fail";
         String code = notifyMap.get("out_trade_no");
 
         //持久化通知记录
-        dragonPayBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+        dragonServiceCommonBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
 
         //退款
         if(notifyMap.containsKey("refund_fee") || notifyMap.containsKey("gmt_refund") || notifyMap.containsKey("out_biz_no")) {
@@ -112,6 +112,7 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
         try {
             if (AlipaySignature.rsaCheckV1(notifyMap, merchantPubKey, "UTF-8", "RSA2")){
                 String tradeStatus = notifyMap.get("trade_status");
+                boolean notifyResult = false;
 
                 if (AlipayConstant.AlipayTradeStateEnum.TRADE_SUCCESS.name().equals(tradeStatus)
                         ||AlipayConstant.AlipayTradeStateEnum.TRADE_FINISHED.name().equals(tradeStatus)) {
@@ -121,18 +122,20 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
                     if (!StringUtil.isEmpty(gmtPaymentStr)) {
                         timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.parse(gmtPaymentStr);
                     }
-                    this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("trade_no"), timeEnd, notifyMap.toString());
-                    returnStr = "success";
+                    notifyResult = this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("trade_no"), timeEnd, notifyMap.toString());
                 } else {
-                    this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
-                    returnStr = "fail";
+                    notifyResult = this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
+                }
+                if(notifyResult){
+                    returnStr = "success";
                 }
             } else {// 验证失败
-                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getMessage());
+                log.error("alipay notify fail code:{} msg:{} ",DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getMessage());
+                return returnStr;
             }
         } catch (AlipayApiException e) {
-            log.error("验签失败：" , e);
-            throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getMessage());
+            log.error("alipay notify fail 验签失败：e:{}" , e);
+            log.error("alipay notify fail 验签失败：code:{} msg:{}" ,DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_ALIPAY_SIGN_ERROR.getMessage());
         }
 
         log.info("返回支付通道{}信息{}", payType, returnStr);

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

@@ -5,9 +5,9 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
 import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
-import com.liquidnet.service.dragon.channel.wepay.biz.WepayBiz;
 import com.liquidnet.service.dragon.channel.wepay.constant.WepayConstant;
 import com.liquidnet.service.dragon.channel.wepay.strategy.WepayStrategyContext;
 import com.liquidnet.service.dragon.constant.DragonConstant;
@@ -17,7 +17,6 @@ import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
 import com.liquidnet.service.dragon.utils.DataUtils;
-import com.liquidnet.service.dragon.utils.MqHandleUtil;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,10 +49,7 @@ public class PayChannelStrategyWepayImpl extends AbstractPayChannelStrategyImpl
     private DataUtils dataUtils;
 
     @Autowired
-    private MqHandleUtil mqHandleUtil;
-
-    @Autowired
-    private WepayBiz wepayBiz;
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
 
     @Autowired
     private DragonPayBiz dragonPayBiz;
@@ -78,7 +74,7 @@ public class PayChannelStrategyWepayImpl extends AbstractPayChannelStrategyImpl
                 String code = notifyMap.get("out_trade_no");
 
                 //持久化通知记录
-                dragonPayBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+                dragonServiceCommonBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
 
                 // 根据银行订单号获取支付信息
                 DragonOrdersDto dragonOrdersDto = dataUtils.getPayOrderByCode(code);
@@ -91,6 +87,7 @@ public class PayChannelStrategyWepayImpl extends AbstractPayChannelStrategyImpl
                 }
 
                 String sign = notifyMap.remove("sign");
+                boolean notifyResult = false;
                 if (PayWepayUtils.getInstance().notifySign(notifyMap, sign)) {// 根据配置信息验证签名
                     if (WepayConstant.WeixinTradeStateEnum.SUCCESS.getCode().equals(notifyMap.get("result_code"))) {// 业务结果
                         // 成功
@@ -99,13 +96,15 @@ public class PayChannelStrategyWepayImpl extends AbstractPayChannelStrategyImpl
                         if (!StringUtil.isEmpty(timeEndStr)) {
                             timeEnd = DateUtil.Formatter.yyyyMMddHHmmssTrim.parse(timeEndStr);
                         }
-                        this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("transaction_id"), timeEnd, notifyMap.toString());
-                        returnStr = "<xml>\n" + "  <return_code><![CDATA[SUCCESS]]></return_code>\n" + "  <return_msg><![CDATA[OK]]></return_msg>\n" + "</xml>";
+                        notifyResult = this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("transaction_id"), timeEnd, notifyMap.toString());
                     } else {
-                        this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
+                        notifyResult = this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
+                    }
+                    if(notifyResult){
+                        returnStr = "<xml>\n" + "  <return_code><![CDATA[SUCCESS]]></return_code>\n" + "  <return_msg><![CDATA[OK]]></return_msg>\n" + "</xml>";
                     }
                 } else {
-                    throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_WEPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_WEPAY_SIGN_ERROR.getMessage());
+                    log.error("wepay notify fail code:{} msg:{} ",DragonErrorCodeEnum.TRADE_WEPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_WEPAY_SIGN_ERROR.getMessage());
                 }
             } 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

@@ -3,6 +3,7 @@ package com.liquidnet.service.dragon.channel.wepay.strategy.impl;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
 import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
 import com.liquidnet.service.dragon.channel.wepay.biz.WepayBiz;
 import com.liquidnet.service.dragon.channel.wepay.constant.WepayConstant;
@@ -46,6 +47,9 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
     @Autowired
     private DragonPayBiz dragonPayBiz;
 
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
 
@@ -78,7 +82,7 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
                     this.buildResponseDto(respPayDto,respWepayDto);
 
                     //支付订单持久化
-                    dragonPayBiz.buildPayOrders(dragonPayBaseReqDto,respPayDto);
+                    dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respPayDto);
                     return ResponseDto.success(respPayDto);
                 }else{
                     throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_PARAM_ERROR.getCode(),DragonErrorCodeEnum.TRADE_PARAM_ERROR.getMessage());

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

 package com.liquidnet.service.dragon.service.impl;
 
 import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
@@ -65,6 +66,11 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
             queryRespDto.setOrderCode(ordersDto.getOrderCode());
             queryRespDto.setPrice(ordersDto.getPrice());
             queryRespDto.setPaymentType(ordersDto.getPaymentType());
+            if(StringUtil.isNotNull(ordersDto.getPaymentAt())){
+                queryRespDto.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.format(ordersDto.getPaymentAt()));
+            }else{
+                queryRespDto.setPaymentAt("");
+            }
             return queryRespDto;
         }
         //如果未支付进行三方查询
@@ -79,7 +85,6 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
             throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getCode(),DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getMessage());
         }
         //通知商户
-        dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(ordersDto));
-        return false;
+        return dragonPayBiz.sendNotify(dragonPayBiz.buildPayNotifyReqBo(ordersDto));
     }
 }