adam 添加接口

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoDto;
 import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoReq;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -70,7 +72,7 @@ public class AdamRscController {
     @ApiOperation(value = "@API:入场人列表", notes = "查取用户指定入场人列表")
     @GetMapping("inquire/enters")
     public ResponseDto<List<AdamEntersVo>> querysEnters(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersIds,
-                                                          @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+                                                        @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
         List<AdamEntersVo> vos = entersIds.isEmpty() ? null : adamRdmService.getEntersVoByUidEntersIds(uid, Arrays.asList(entersIds.split(",")));
         return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }
@@ -82,6 +84,17 @@ public class AdamRscController {
         return ResponseDto.success(adamRdmService.getUserMemberVoByUid(uid));
     }
 
+    @ApiOperationSupport(order = 22)
+    @ApiOperation(value = "@API:用户创建日期")
+    @GetMapping("inquire/createdAt")
+    public ResponseDto<LocalDateTime> queryCreatedAt(@NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        AdamUserInfoVo vo = adamRdmService.getUserInfoVoByUid(uid);
+        if (vo == null) {
+            return ResponseDto.success(LocalDateTime.of(2000, 1, 1, 1, 1, 1, 1));
+        }
+        return ResponseDto.success(vo.getCreateAt());
+    }
+
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
     @PostMapping("inquire/of_buy_ticket")
@@ -136,12 +149,12 @@ public class AdamRscController {
     @ApiOperationSupport(order = 40)
     @ApiOperation(value = "@API:社交用户点击喜欢或不喜欢", notes = "发送点击事件计数")
     @PostMapping("inquire/sendMsgToRedis")
-    public ResponseDto<Boolean> sendMsgToRedis(@RequestParam(required = true) String redisKey,@RequestParam(required = true) String jsonParamStr) {
+    public ResponseDto<Boolean> sendMsgToRedis(@RequestParam(required = true) String redisKey, @RequestParam(required = true) String jsonParamStr) {
         if (null == redisKey || null == jsonParamStr || redisKey.isEmpty() || jsonParamStr.isEmpty()) {
             return ResponseDto.failure();
         }
         try {
-            queueUtils.sendMsgByRedis(redisKey,jsonParamStr);
+            queueUtils.sendMsgByRedis(redisKey, jsonParamStr);
         } catch (Exception e) {
             log.error("@API:社交用户点击喜欢或不喜欢计数入队", e);
         }

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -22,7 +20,9 @@ import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.candy.vo.CandyMyCouponListVo;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -44,6 +44,8 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     private RedisDataUtils redisDataUtils;
     @Autowired
     private QueueUtils queueUtils;
+    @Value("${liquidnet.service.adam.url}")
+    private String adamUrl;
 
     @Override
     public CandyMyCouponListVo myCoupon(Integer type) {
@@ -433,7 +435,13 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
             String uid = item.getUid();
             LocalDateTime userCreateTime;
             try {
-                userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssTrim.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
+                MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+                params.add("uid", uid);
+                MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+                headers.add("Accept", "application/json;charset=UTF-8");
+                String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/inquire/createdAt"), params, headers);
+                userCreateTime = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<LocalDateTime>>() {
+                }).getData();
             } catch (Exception e) {
                 userCreateTime = null;
             }
@@ -535,7 +543,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
     @Override
-    public ResponseDto<List<CandyCouponVo>> couponListById(String uCouponIds,String uid) {
+    public ResponseDto<List<CandyCouponVo>> couponListById(String uCouponIds, String uid) {
         LocalDateTime userCreateTime;
         try {
             userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssTrim.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());