Merge branch 'dev_member_voucher_social' of...

Merge branch 'dev_member_voucher_social' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_member_voucher_social

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyUserCouponBasicDto.java

@@ -141,6 +141,7 @@ public class CandyUserCouponBasicDto implements Serializable, Cloneable {
     public CandyUserCouponBasicDto copyToRedisCommonBaseCoupon(String uCouponId, String uid, CandyCommonCouponBasicDto commonCouponBasicDto) {
         this.setCouponId(commonCouponBasicDto.getCouponId());
         this.setTitle(commonCouponBasicDto.getTitle());
+        this.setCcouponId(commonCouponBasicDto.getCcouponId());
         this.setLabel(commonCouponBasicDto.getLabel());
         this.setNotice(commonCouponBasicDto.getNotice());
         this.setExclusive(commonCouponBasicDto.getExclusive());

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
 import com.liquidnet.service.candy.dto.CandyCouponCodeDto;
 import com.liquidnet.service.candy.dto.CandyCouponInfoDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
+@Slf4j
 public class RedisDataUtils {
 
     @Autowired
@@ -46,10 +48,13 @@ public class RedisDataUtils {
 
         boolean needSet = false;
         List<String> userIds = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
+        log.info("userIds = "+userIds.toString());
         for (CandyCommonCouponBasicDto item : pubDto) {
+            log.info("pubDto = "+item.getCcouponId());
             if (userIds.contains(item.getCcouponId())) {
                 continue;
             } else {
+                log.info("pubDto = add");
                 CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copyToRedisCommonBaseCoupon(IDGenerator.get32UUID(), uid, item);
                 userDto.add(userCouponBasicDto);
                 needSet = true;