订单列表 详情 增加 日志

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -37,6 +37,7 @@ public abstract class DateUtil {
         yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
         yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
+        yyyyMMddHHmmssSSSUnTrim("yyyyMMddHHmmssSSS"),
         yyyyMMddHHmmssS("yyyy-MM-dd HH:mm:ss.S"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/dao/UserPathDao.java → liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java

-package com.liquidnet.service.kylin.dto.dao;
+package com.liquidnet.service.base;
 
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
@@ -10,7 +10,9 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
-public class UserPathDao implements Serializable {
+public class UserPathDto implements Serializable {
+
+    private static UserPathDto instance = new UserPathDto();
 
     private static final long serialVersionUID = -4153353929914805750L;
     private String tag;
@@ -23,20 +25,23 @@ public class UserPathDao implements Serializable {
     private String ip;
     private String userAgent;
 
-    public UserPathDao(LocalDateTime time, String interfaceName, Object params, Object result) {
-        this.tag = "ANJIABIN";
-        this.uid = CurrentUtil.getCurrentUid()==null?"UID":CurrentUtil.getCurrentUid();
-        this.token = CurrentUtil.getToken()==null?"TOKEN":CurrentUtil.getToken();
-        this.time = DateUtil.Formatter.yyyyMMddHHmmssSSS.format(time);
-        this.interfaceName = interfaceName;
-        this.params = params.toString();
-        this.result = result.toString();
-        this.ip = CurrentUtil.getCliIpAddr();
-        this.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
+    private UserPathDto() {}
+
+    private static UserPathDto getInstance() {
+        return instance;
     }
 
+    public static String setData(String interfaceName, Object params, Object result) {
+        instance.tag = "ANJIABIN";
+        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.ip = CurrentUtil.getCliIpAddr();
+        instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
+        return JsonUtils.toJson(instance);
 
-    public String toString() {
-        return JsonUtils.toJson(this);
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

 package com.liquidnet.service.kylin.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
@@ -11,11 +10,10 @@ import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
+import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderScriptDto;
-import com.liquidnet.service.kylin.dto.dao.UserPathDao;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
@@ -28,9 +26,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.*;
-import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
-import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.kylin.utils.*;
@@ -44,7 +40,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.bson.Document;
-import org.redisson.api.RLock;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -626,6 +621,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 sqlData);
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
+        log.info(UserPathDto.setData("下单(唤起支付)",payOrderParam,payResultVo));
         return ResponseDto.success(payResultVo);
     }
 
@@ -727,6 +723,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC);
                 rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN, sqlData);
+                log.info(UserPathDto.setData("再次支付",payAgainParam,payResultVo));
                 return ResponseDto.success(payResultVo);
             }
             return ResponseDto.failure("未选择支付方式");
@@ -882,6 +879,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             sycDamaiOrder(orderTickets.getOrderTicketsId());
         }
         redisLockUtil.unlock(lock);
+        log.info(UserPathDto.setData("订单支付成功回调",syncOrderParam,""));
         return "success";
     }
 
@@ -923,7 +921,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             mPageInfo = new PageInfo(voList);
             mPageInfo.setTotal(voList.size());
 
-            log.info(new UserPathDao(LocalDateTime.now(),"订单列表","NanParams",voList).toString());
+            log.info(UserPathDto.setData("订单列表","",voList));
             return mPageInfo;
         } catch (Exception e) {
             e.printStackTrace();
@@ -1011,7 +1009,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 vo.setOrderTicketVo(orderTicketVo);
                 vo.setEnterDescribe(dataUtils.getEnterInfo("1"));
             }
-            log.info(new UserPathDao(LocalDateTime.now(),"订单列表",orderId,vo).toString());
+            log.info(UserPathDto.setData("订单列表",orderId,vo));
             return vo;
         } catch (Exception e) {
             return vo;