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

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/constant/DragonConstant.java

@@ -17,7 +17,6 @@ public class DragonConstant {
 
 
     public static final String REFUND_REDIS_KET="dragon:refund:refundCode:";// 订单号对应回调地址
-    public static final String REDIS_KET_PAY_ORDERCODE="dragon:pay:orderCode:";// 订单编号
     public static final String REDIS_KET_PAY_CODE="dragon:pay:code:";// 支付流水号
 
     public enum PayChannelEnum{
@@ -252,12 +251,12 @@ public class DragonConstant {
         DRAGON_PAY_GROUP("dragon-pay-group","同步数据-支付-组"),
         DRAGON_REFUND_GROUP ("dragon-refund-group","同步数据-退款-组"),
         //三方异步通知相关队列
-        DRAGON_PAY_NOTIFY_KEY("dragon-pay-notify-key","支付异步通知"),
+        DRAGON_PAY_NOTIFY_KEY("dragon:stream:dragon-pay-notify-key","支付异步通知"),
         DRAGON_PAY_NOTIFY_GROUP ("dragon-pay-notify-group","支付异步通知-组"),
         //商户通知相关队列
-        PAY_MCH_NOTIFY_KEY("pay-mch-notify-key","商户异步通知"),
+        PAY_MCH_NOTIFY_KEY("dragon:stream:pay-mch-notify-key","商户异步通知"),
         PAY_MCH_NOTIFY_GROUP ("pay-mch-notify-group","商户异步通知-组"),
-        PAY_MCH_NOTIFY_ERROR_KEY("pay-mch-notify-error-key","商户异步通知失败"),
+        PAY_MCH_NOTIFY_ERROR_KEY("dragon:stream:pay-mch-notify-error-key","商户异步通知失败"),
         PAY_MCH_NOTIFY_ERROR_GROUP ("pay-mch-notify-error-group","商户异步通知失败-组");
         private String code;
         private String message;

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

@@ -13,6 +13,4 @@ public interface IDragonOrdersService {
     String dragonNotify(HttpServletRequest request,String payType,String deviceFrom);
 
     DragonPayOrderQueryRespDto checkOrderStatusByCode(String code);
-
-    DragonPayOrderQueryRespDto checkOrderStatusByOrderCode(String orderCode);
 }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java

@@ -16,8 +16,8 @@ public class UserPathDto implements Serializable {
 
     private static final long serialVersionUID = -4153353929914805750L;
 //    private String tag;
-//    private String uid;
-//    private String ip;
+    private String uid;
+    private String ip;
     private String token;
     private String time;//yyyyMMddHHmmssSSS
     private String interfaceName;
@@ -34,14 +34,14 @@ public class UserPathDto implements Serializable {
 
     public static String setData(String interfaceName, Object params, Object result) {
 //        instance.tag = "MDSKY.NOW.ELK";
-//        instance.ip = CurrentUtil.getCliIpAddr();
-        String uid = CurrentUtil.getCurrentUid() == null ? "UID" : CurrentUtil.getCurrentUid();
+        instance.ip = CurrentUtil.getCliIpAddr();
+        instance.uid = CurrentUtil.getCurrentUid() == null ? "UID" : CurrentUtil.getCurrentUid();
         instance.token = CurrentUtil.getToken() == null ? "TOKEN" : CurrentUtil.getToken();
         instance.time = DateUtil.Formatter.yyyyMMddHHmmssSSSUnTrim.format(LocalDateTime.now());
         instance.interfaceName = interfaceName;
         instance.params = params.toString().equals("") ? "NanParams" : params.toString();
         instance.result = result.toString().equals("") ? "NanResults" : result.toString();
         instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
-        return "MDSKY.NOW.ELK." + (uid.equals("UID") ? CurrentUtil.getCliIpAddr() : uid )+ " = " + JsonUtils.toJson(instance);
+        return "MDSKY.NOW.ELK." + ( instance.uid.equals("UID") ? CurrentUtil.getCliIpAddr() :  instance.uid )+ " = " + JsonUtils.toJson(instance);
     }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/docu/redis_queue_create.sql

 -- pay
 XADD dragon:stream:dragon-pay * 0 0
-XADD dragon-pay-notify-key * 0 0
-XADD pay-mch-notify-key * 0 0
-XADD pay-mch-notify-error-key * 0 0
+XADD dragon:stream:dragon-pay-notify-key * 0 0
+XADD dragon:stream:pay-mch-notify-key * 0 0
+XADD dragon:stream:pay-mch-notify-error-key * 0 0
 XGROUP CREATE dragon:stream:dragon-pay dragon-pay-group 0
 XGROUP CREATE dragon-pay-notify-key dragon-pay-notify-group 0
 XGROUP CREATE pay-mch-notify-key pay-mch-notify-group 0

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

@@ -74,7 +74,7 @@ public class DragonPayBiz {
         DragonOrdersDto ordersDto = new DragonOrdersDto();
         BeanUtil.copy(orders,ordersDto);
         //放到redis缓存中
-        dataUtils.createPayOrder(orders.getOrderCode(),orders.getCode(),ordersDto);
+        dataUtils.createPayOrder(orders.getCode(),ordersDto);
         // 持久化到数据库
         boolean insertResult = mqHandleUtil.sendMySqlRedis(
                 SqlMapping.get("dragon_orders.insert"),

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

@@ -67,10 +67,4 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
         String payType = DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getPayType();
         return payChannelStrategyContext.getStrategy(payType).checkOrderStatus(code);
     }
-
-    @Override
-    public DragonPayOrderQueryRespDto checkOrderStatusByOrderCode(String orderCode) {
-        String code = dataUtils.getCodeByOrderCode(orderCode);
-        return this.checkOrderStatusByCode(code);
-    }
 }

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

@@ -11,38 +11,17 @@ public class DataUtils {
     @Autowired
     private RedisUtil redisUtil;
 
-    /**
-     * 根据订单编号获取支付code
-     * @param orderCode
-     * @return
-     */
-    public String getCodeByOrderCode(String orderCode) {
-        //获取支付订单号
-        return (String) redisUtil.get(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode);
-    }
-
-    public void createPayOrder(String orderCode, String code, DragonOrdersDto ordersDto) {
-        if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode)) {
-            redisUtil.set(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode, code);
+    public void createPayOrder(String code, DragonOrdersDto ordersDto) {
+        if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
             redisUtil.set(DragonConstant.REDIS_KET_PAY_CODE + code, ordersDto);
         }
     }
 
     public DragonOrdersDto getPayOrderByCode(String code) {
-        if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
-            //TODO 是否降级处理
+        if (redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
+            return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
         }
-        return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
-    }
-
-    public DragonOrdersDto getPayOrderByOrderCode(String orderCode) {
-        if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode)) {
-            //TODO 是否降级处理
-        }
-        //获取支付订单号
-        String code = (String) redisUtil.get(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode);
-
-        return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
+        return null;
     }
 
     public void updateOrderStatus(String code, DragonOrdersDto dragonOrdersDto) {