记得上下班打卡 | git大法好,push需谨慎

Commit a3d8ce9a authored by 张国柄's avatar 张国柄

opt;

parent 662941a1
package com.liquidnet.service.platform.controller.candy; package com.liquidnet.service.platform.controller.candy;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto; import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
...@@ -10,16 +10,18 @@ import com.liquidnet.service.platform.service.impl.candy.PlatformCandyUserCoupon ...@@ -10,16 +10,18 @@ import com.liquidnet.service.platform.service.impl.candy.PlatformCandyUserCoupon
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
@Api(tags = "券系统-数据降级查询") @Api(tags = "券列表-数据降级查询")
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("cdemote") @RequestMapping("cdemote")
...@@ -28,18 +30,27 @@ public class PlatformCandyDemoteController { ...@@ -28,18 +30,27 @@ public class PlatformCandyDemoteController {
private PlatformCandyUserCouponService platformCandyUserCouponService; private PlatformCandyUserCouponService platformCandyUserCouponService;
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "用户私有券") @ApiOperation(value = "私有券")
@PostMapping("ucoupon") @GetMapping("ucoupon")
public ResponseDto<List<CandyUserCouponBasicDto>> queryForUserCouponBasicDto(@RequestParam String currentUid) { public ResponseDto<List<CandyUserCouponBasicDto>> queryForUserCouponBasicDto(@RequestParam String currentUid) {
return ResponseDto.success(platformCandyUserCouponService.ucouponBasicDtoByUidProcessing(currentUid)); List<CandyUserCouponBasicDto> basicDtoList = null;
if (StringUtils.isNotBlank(currentUid)) {
basicDtoList = platformCandyUserCouponService.ucouponBasicDtoByUidProcessing(currentUid);
}
return ResponseDto.success(basicDtoList);
} }
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "用户公有券") @ApiOperation(value = "公有券")
@PostMapping("ccoupon") @GetMapping("ccoupon")
public ResponseDto<List<CandyCommonCouponBasicDto>> queryForCommonCouponBasicDto(@RequestParam String ucreatedAtStr) { public ResponseDto<List<CandyCommonCouponBasicDto>> queryForCommonCouponBasicDto(@RequestParam String ucreatedAtStr) {
LocalDateTime ucreatedAt = DateUtil.Formatter.yyyyMMddHHmmss.parse(ucreatedAtStr); List<CandyCommonCouponBasicDto> basicDtoList = null;
return ResponseDto.success(platformCandyUserCouponService.ccouponBasicDtoByUidProcessing(ucreatedAt)); if (StringUtils.isNotBlank(ucreatedAtStr) && Pattern.matches(LnsRegex.Valid.DATETIME_FULL, ucreatedAtStr)) {
LocalDateTime ucreatedAt = DateUtil.Formatter.yyyyMMddHHmmss.parse(ucreatedAtStr);
basicDtoList = platformCandyUserCouponService.ccouponBasicDtoByUidProcessing(ucreatedAt);
}
return ResponseDto.success(basicDtoList);
} }
} }
...@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.base.OrderCloseMapping; import com.liquidnet.service.base.OrderCloseMapping;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.candy.constant.CandyRedisConst; import com.liquidnet.service.candy.constant.CandyRedisConst;
...@@ -69,6 +70,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM ...@@ -69,6 +70,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
} }
public List<CandyUserCouponBasicDto> ucouponBasicDtoByUidProcessing(String uid) { public List<CandyUserCouponBasicDto> ucouponBasicDtoByUidProcessing(String uid) {
if (null == redisUtil.get(AdamRedisConst.INFO_USER.concat(uid))) return null;
List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid); List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
if (!CollectionUtils.isEmpty(basicDtoList)) { if (!CollectionUtils.isEmpty(basicDtoList)) {
List<String> couponIdList = basicDtoList.parallelStream().map(CandyUserCouponBasicDto::getCouponId).collect(Collectors.toList()); List<String> couponIdList = basicDtoList.parallelStream().map(CandyUserCouponBasicDto::getCouponId).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment