接口 增加参数校验

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

@@ -12,8 +12,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +31,7 @@ import java.util.List;
  */
 @Api(tags = "券相关接口")
 @RestController
+@Validated
 @RequestMapping("/candy-coupon")
 public class CandyCouponController {
 
@@ -40,7 +44,7 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "类型 1可用 2过期/已使用 ", required = true),
     })
-    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") Integer type) {
+    public ResponseDto<CandyMyCouponListVo> myCoupon(@RequestParam("type") @NotNull Integer type) {
         return ResponseDto.success(candyCouponService.myCoupon(type));
     }
 
@@ -54,7 +58,11 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "ticketId", value = "票id", required = true),
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "类型 1可用 2过期/已使用 ", required = true),
     })
-    public ResponseDto<CandyMyCouponListVo> preUsePerformanceCoupon(@RequestParam("priceTotal") BigDecimal priceTotal, @RequestParam("performanceId") String performanceId, @RequestParam("timeId") String timeId, @RequestParam("ticketId") String ticketId, @RequestParam("type") Integer type) {
+    public ResponseDto<CandyMyCouponListVo> preUsePerformanceCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
+                                                                    @RequestParam("performanceId") @NotNull @NotBlank String performanceId,
+                                                                    @RequestParam("timeId") @NotNull @NotBlank String timeId,
+                                                                    @RequestParam("ticketId") @NotNull @NotBlank String ticketId,
+                                                                    @RequestParam("type") @NotNull Integer type) {
         return ResponseDto.success(candyCouponService.preUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId, type));
     }
 
@@ -67,7 +75,10 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "timeId", value = "场次id", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "ticketId", value = "票id", required = true),
     })
-    public ResponseDto<HashMap<String, Integer>> preCanUsePerformanceCoupon(@RequestParam("priceTotal") BigDecimal priceTotal, @RequestParam("performanceId") String performanceId, @RequestParam("timeId") String timeId, @RequestParam("ticketId") String ticketId) {
+    public ResponseDto<HashMap<String, Integer>> preCanUsePerformanceCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
+                                                                            @RequestParam("performanceId") @NotNull @NotBlank String performanceId,
+                                                                            @RequestParam("timeId") @NotNull @NotBlank String timeId,
+                                                                            @RequestParam("ticketId") @NotNull @NotBlank String ticketId) {
         HashMap<String, Integer> hashMap = CollectionUtil.mapStringInteger();
         hashMap.put("canUse", candyCouponService.preCanUsePerformanceCoupon(priceTotal, performanceId, timeId, ticketId));
         return ResponseDto.success(hashMap);
@@ -83,7 +94,10 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "produceId", value = "场次id", required = true),
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "类型 1可用 2过期/已使用 ", required = true),
     })
-    public ResponseDto<CandyMyCouponListVo> preUseGoodCoupon(@RequestParam("priceTotal") BigDecimal priceTotal, @RequestParam("goodId") String goodId, @RequestParam("produceId") String produceId, @RequestParam("type") Integer type) {
+    public ResponseDto<CandyMyCouponListVo> preUseGoodCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
+                                                             @RequestParam("goodId") @NotNull @NotBlank String goodId,
+                                                             @RequestParam("produceId") @NotNull @NotBlank String produceId,
+                                                             @RequestParam("type") @NotNull Integer type) {
         return ResponseDto.success(candyCouponService.preUseGoodCoupon(priceTotal, goodId, produceId, type));
     }
 
@@ -95,7 +109,9 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "goodId", value = "演出id", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "produceId", value = "场次id", required = true),
     })
-    public ResponseDto<HashMap<String, Integer>> preCanUseGoodCoupon(@RequestParam("priceTotal") BigDecimal priceTotal, @RequestParam("goodId") String goodId, @RequestParam("produceId") String produceId) {
+    public ResponseDto<HashMap<String, Integer>> preCanUseGoodCoupon(@RequestParam("priceTotal") @NotNull BigDecimal priceTotal,
+                                                                     @RequestParam("goodId") @NotNull @NotBlank String goodId,
+                                                                     @RequestParam("produceId") @NotNull @NotBlank String produceId) {
         HashMap<String, Integer> hashMap = CollectionUtil.mapStringInteger();
         hashMap.put("canUse", candyCouponService.preCanUseGoodCoupon(priceTotal, goodId, produceId));
         return ResponseDto.success(hashMap);
@@ -115,7 +131,7 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "uCouponId", value = "券唯一表示id", required = true),
     })
-    public ResponseDto<HashMap<String, Integer>> stateCoupon(@RequestParam("uCouponId") String uCouponId) {
+    public ResponseDto<HashMap<String, Integer>> stateCoupon(@RequestParam("uCouponId") @NotNull @NotBlank String uCouponId) {
         Integer result = candyCouponService.stateCoupon(uCouponId);
         if (result == null) {
             return ResponseDto.failure();
@@ -133,7 +149,9 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "content", value = "消费内容", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "totalPrice", value = "消费价格", required = true),
     })
-    public ResponseDto<CandyUseResultVo> useCoupon(@RequestParam("uCouponId") String uCouponId, @RequestParam("content") String content, @RequestParam("totalPrice") String totalPrice) {
+    public ResponseDto<CandyUseResultVo> useCoupon(@RequestParam("uCouponId") @NotNull @NotBlank String uCouponId,
+                                                   @RequestParam("content") @NotNull @NotBlank String content,
+                                                   @RequestParam("totalPrice") @NotNull String totalPrice) {
         CandyUseResultVo result = candyCouponService.useCoupon(uCouponId, content, totalPrice);
         if (result == null) {
             return ResponseDto.failure();
@@ -147,7 +165,7 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "uCouponId", value = "券唯一表示id(逗号隔开的字符串)", required = true),
     })
-    public ResponseDto<Boolean> useBackCoupon(@RequestParam("uCouponId") String uCouponId) {
+    public ResponseDto<Boolean> useBackCoupon(@RequestParam("uCouponId") @NotNull @NotBlank String uCouponId) {
         candyCouponService.useBackCoupon(uCouponId);
         return ResponseDto.success();
     }
@@ -158,7 +176,7 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "ccode", value = "兑换码", required = true),
     })
-    public ResponseDto<Boolean> receiveCoupon(@RequestParam("ccode") String ccode) {
+    public ResponseDto<Boolean> receiveCoupon(@RequestParam("ccode") @NotNull @NotBlank String ccode) {
         Boolean result = candyCouponService.receiveCoupon(ccode);
         if (result) {
             return ResponseDto.success();
@@ -173,7 +191,7 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "ccode", value = "兑换码", required = true),
     })
-    public ResponseDto<CandyCouponVo> receiveCouponDetails(@RequestParam("ccode") String ccode) {
+    public ResponseDto<CandyCouponVo> receiveCouponDetails(@RequestParam("ccode") @NotNull @NotBlank String ccode) {
         CandyCouponVo result = candyCouponService.receiveCouponDetails(ccode);
         if (result != null) {
             return ResponseDto.success(result);

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

@@ -73,7 +73,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
     @Override
-    public CandyMyCouponListVo preUsePerformanceCoupon(BigDecimal priceTotal, String performanceId, String timeId, String ticketId,Integer type) {
+    public CandyMyCouponListVo preUsePerformanceCoupon(BigDecimal priceTotal, String performanceId, String timeId, String ticketId, Integer type) {
         String uid = CurrentUtil.getCurrentUid();
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid);
         CandyMyCouponListVo vo = CandyMyCouponListVo.getNew();
@@ -124,7 +124,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
     @Override
-    public CandyMyCouponListVo preUseGoodCoupon(BigDecimal priceTotal, String goodId, String produceId,Integer type) {
+    public CandyMyCouponListVo preUseGoodCoupon(BigDecimal priceTotal, String goodId, String produceId, Integer type) {
         String uid = CurrentUtil.getCurrentUid();
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid);
         CandyMyCouponListVo vo = CandyMyCouponListVo.getNew();
@@ -201,7 +201,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         if (dto == null) {
             return null;//券不存在
         }
-        return CouponBaseUtil.getCouponState(LocalDateTime.now(), dto.getExpireAt(),dto.getEffectAt(), dto.getState());
+        return CouponBaseUtil.getCouponState(LocalDateTime.now(), dto.getExpireAt(), dto.getEffectAt(), dto.getState());
     }
 
     @Override
@@ -288,9 +288,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     public Boolean receiveCoupon(String ccode) {
         String uid = CurrentUtil.getCurrentUid();
         CandyCouponCodeDto dto = redisDataUtils.getCouponByCode(ccode);
-        if (dto.getState().equals(0) ) {//判断可领
+        if (dto != null && dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
-            if(!CouponBaseUtil.CandyCanReceive(infoDto)){
+            if (!CouponBaseUtil.CandyCanReceive(infoDto)) {
                 return false;
             }
             String uCouponId = IDGenerator.get32UUID();
@@ -317,16 +317,16 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     public CandyCouponVo receiveCouponDetails(String ccode) {
         String uid = CurrentUtil.getCurrentUid();
         CandyCouponCodeDto dto = redisDataUtils.getCouponByCode(ccode);
-        if (dto.getState().equals(0)) {//判断可领
+        if (dto != null && dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
-            if(!CouponBaseUtil.CandyCanReceive(infoDto)){
+            if (!CouponBaseUtil.CandyCanReceive(infoDto)) {
                 return null;
             }
             String uCouponId = IDGenerator.get32UUID();
             //构建baseDto
             CandyUserCouponBasicDto baseDto = CandyUserCouponBasicDto.getNew().copyToRedisBaseCoupon(uCouponId, uid, ccode, infoDto);
             return CouponBaseUtil.getBaseCouponUserVo(baseDto);
-        }else{
+        } else {
             return null;
         }
     }