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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserCouponVo.java

@@ -15,6 +15,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
+//@JsonIgnoreProperties(value = {"storeName"}, ignoreUnknown = true)
 public class GoblinUserCouponVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -5700053935603334517L;
     @ApiModelProperty(position = 10, value = "用户券ID[64]")
@@ -24,13 +25,13 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 12, value = "用户券状态[1-可用|2-无效|3-已过期|5-已使用]")
     private Integer state;
     @ApiModelProperty(position = 13, value = "激活时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime bindAt;
     @ApiModelProperty(position = 14, value = "到期时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime duedAt;
     @ApiModelProperty(position = 15, value = "使用时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime usedAt;
     @ApiModelProperty(position = 16, value = "用于记录购买的内容")
     private String usedFor;
@@ -58,6 +59,15 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 31, value = "使用范围[0-全部商品|1-部分商品]")
     private String useScope;
 
+    @ApiModelProperty(position = 35, value = "店铺ID")
+    private String storeId;
+
+
+    /* -------------------------------------------------------------------- */
+
+//    @ApiModelProperty(position = 35, value = "店铺名称")
+//    private String storeName;
+
 
     private static final GoblinUserCouponVo obj = new GoblinUserCouponVo();
 
@@ -89,6 +99,7 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
         this.setValMinus(source.getValMinus());
         this.setDeduction(source.getDeduction());
         this.setUseScope(source.getUseScope());
+        this.setStoreId(source.getStoreId());
         return this;
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/TestAdam.java

+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DESUtils;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IdentityUtils;
@@ -45,6 +46,8 @@ public class TestAdam {
                 "adam:info:user:922833055536291845022973",
                 "adam:morder:2283655",
                 "adam:info:umember:1957341",
+                "adam:info:umember:926280978917662724119825",
+                "adam:info:umember:926280978917662724119825",
                 "adam:info:morder:331587681810022407979836",
 
                 "adam:info:member:simple",
@@ -59,6 +62,9 @@ public class TestAdam {
                 "adam:info:morder:2292617",
                 "adam:info:certification_junk:1510827199912020821",
 
+                "kylin:member:uid:926280978917662724119825",
+                "kylin:member:uid:925802662655180800214832",
+
                 "candy:basic:coupon_code:0Jxko0wLWQdoTTF4",
                 "candy:basic:coupon_code:MJIoHC2qVZ0lp9UI",
                 "candy:basic:user_coupon:809406",
@@ -97,6 +103,7 @@ public class TestAdam {
 
     @Test
     public void testTmp() {
-
+        String post = HttpUtil.post("http://ttestkylin.zhengzai.tv/kylin/inner/cache/member?uid=925802662655180800214832", CollectionUtil.linkedMultiValueMapStringString());
+        System.out.println("===" + post);
     }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

 package com.liquidnet.service.goblin.service.impl;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinUseResultVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponBasicVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.param.BackCouponParam;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
@@ -112,7 +108,13 @@ public class GoblinCouponImpl implements GoblinCouponService {
         String uid = CurrentUtil.getCurrentUid();
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
         List<GoblinUserCouponVo> returnList = ObjectUtil.getGoblinUserCouponVo();
+//        HashMap<String, String> storeIdNameMap = CollectionUtil.mapStringString();
+//        GoblinStoreInfoVo storeInfoVoTmp;
         for (GoblinUserCouponVo vo : voList) {
+//            if (StringUtils.isNotEmpty(vo.getStoreId())) {
+//                storeInfoVoTmp = goblinRedisUtils.getStoreInfoVo(vo.getStoreId());
+//                vo.setStoreName(storeIdNameMap.getOrDefault(vo.getStoreId(), null == storeInfoVoTmp ? null : storeInfoVoTmp.getStoreName()));
+//            }
             if ("1".equals(type)) {
                 if (vo.getState().equals(1)) {
                     returnList.add(vo);