修改通知逻辑

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

@@ -15,7 +15,6 @@ 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.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -158,7 +157,7 @@ public class DragonPayBiz {
      * @param paymentType
      * @param content
      */
-    public void createDragonOrderLogs(String paymentType,String content){
+    public void createDragonOrderLogs(String code,String paymentType,String content){
         try {
             String orderId = IDGenerator.nextTimeId();
             LocalDateTime createAt = LocalDateTime.now();
@@ -166,7 +165,7 @@ public class DragonPayBiz {
             LocalDateTime deleteAt = null;
             boolean insertResult = mqHandleUtil.sendMySqlRedis(
                     SqlMapping.get("dragon_order_logs.insert"),
-                    new Object[]{orderId,paymentType,content, createAt, updateAt,deleteAt}
+                    new Object[]{code,paymentType,content, createAt, updateAt,deleteAt}
                     ,DragonConstant.MysqlRedisQueueEnum.DRAGON_PAY_NOTIFY_KEY.getCode()
             );
         } catch (Exception e) {

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

@@ -86,12 +86,14 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
         notifyMap = alipayBiz.parseNotifyMsg(requestParams);
         log.info("dragonNotify-->alipay json : {}", JSON.toJSONString(notifyMap));
         log.info("接收到{}支付结果{}", payType, notifyMap);
-        //持久化通知记录
-        dragonPayBiz.createDragonOrderLogs(dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+
 
         String returnStr = null;
         String code = notifyMap.get("out_trade_no");
 
+        //持久化通知记录
+        dragonPayBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+
         //退款
         if(notifyMap.containsKey("refund_fee") || notifyMap.containsKey("gmt_refund") || notifyMap.containsKey("out_biz_no")) {
             returnStr = dragonOrderRefundsService.aliPayRefundCallBack(JSON.toJSONString(notifyMap));

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

@@ -73,11 +73,13 @@ public class PayChannelStrategyWepayImpl extends AbstractPayChannelStrategyImpl
                 notifyMap = PayWepayUtils.parseXml(inputStream);
                 log.info("dragonNotify-->wepay json : {}", JSON.toJSONString(notifyMap));
 
-                //持久化通知记录
-                dragonPayBiz.createDragonOrderLogs(dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
                 log.info("接收到{}支付结果{}", payType, notifyMap);
 
                 String code = notifyMap.get("out_trade_no");
+
+                //持久化通知记录
+                dragonPayBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+
                 // 根据银行订单号获取支付信息
                 DragonOrdersDto dragonOrdersDto = dataUtils.getPayOrderByCode(code);
                 if (dragonOrdersDto == null) {

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/sqlmap.properties

@@ -9,7 +9,7 @@ dragon_order_refund_log.insert=INSERT INTO `dragon_order_refund_logs`(`order_ref
 
 
 dragon_orders.insert=insert into dragon_orders(order_id, status, code, type, price, name, detail, order_code, client_ip, notify_url, payment_type, payment_id, payment_at, finished_at, created_at, updated_at, deleted_at) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-dragon_order_logs.insert=insert into dragon_order_logs(order_id, payment_type, content, created_at, updated_at, deleted_at) values(?,?,?,?,?,?)
+dragon_order_logs.insert=insert into dragon_order_logs(code, payment_type, content, created_at, updated_at, deleted_at) values(?,?,?,?,?,?)
 dragon_pay_notify.insert=insert into dragon_pay_notify (code, order_code, notify_url, notify_data, created_at, updated_at) values(?,?,?,?,?,?)
 dragon_pay_notify_fail.insert=insert into dragon_pay_notify_fail (code, order_code, notify_url, notify_data, fail_desc, created_at, updated_at) values(?,?,?,?,?,?,?)