使用券 增加 id

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyUseResultVo.java

 package com.liquidnet.service.candy.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +11,7 @@ import java.util.List;
 
 @Data
 @ApiModel
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CandyUseResultVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 4073256621782131607L;
@@ -21,6 +23,8 @@ public class CandyUseResultVo implements Serializable, Cloneable {
     private List<String> targetIds;
     @ApiModelProperty(value = "满减金额[满多少]")
     private BigDecimal fullValue;
+    @ApiModelProperty(value = "满减金额[满多少]")
+    private String couponId;
 
     private static final CandyUseResultVo obj = new CandyUseResultVo();
 

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

@@ -54,7 +54,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         CandyMyCouponListVo vo = CandyMyCouponListVo.getNew();
@@ -96,7 +96,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         if (!CollectionUtil.isEmpty(dtoList)) {
@@ -116,7 +116,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         List<CandyCouponVo> memberCoupon = ObjectUtil.getCandyCouponVoArrayList();
@@ -145,7 +145,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         CandyMyCouponListVo vo = CandyMyCouponListVo.getNew();
@@ -188,7 +188,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         int canUse = 0;
@@ -213,7 +213,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         CandyMyCouponListVo vo = CandyMyCouponListVo.getNew();
@@ -255,7 +255,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         int canUse = 0;
@@ -281,7 +281,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
         List<CandyCouponVo> advanceCoupon = ObjectUtil.getCandyCouponVoArrayList();
@@ -307,7 +307,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         CandyUserCouponBasicDto dto = CouponBaseUtil.getSingleDtoByUCouponId(redisDataUtils.getCouponByUid(uid, userCreateTime), uCouponId);
         if (dto == null) {
@@ -322,7 +322,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         CandyUseResultVo vo = CandyUseResultVo.getNew();
         List<String> targetIds = CollectionUtil.linkedListString();
@@ -339,6 +339,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                 dto.setCouType(dto.getCouType());
             }
             vo.setCouType(dto.getCouType());
+            vo.setCouponId(dto.getCouponId());
             switch (dto.getCouType()) {//券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]
                 case 1:
                     vo.setValue(dto.getValFace());
@@ -477,7 +478,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         String mobile = (String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE);
 
@@ -548,7 +549,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         try {
             userCreateTime = getCreatedAt(uid);
         } catch (Exception e) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
         ArrayList<String> uCouponIdList = new ArrayList(Arrays.asList(uCouponIds.split(",")));
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid, userCreateTime);
@@ -569,12 +570,13 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
 
-    private LocalDateTime getCreatedAt(String uid){
+    private LocalDateTime getCreatedAt(String uid) {
         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);
-        return JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<LocalDateTime>>() {}).getData();
+        return JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<LocalDateTime>>() {
+        }).getData();
     }
 }