订单 券相关入redis

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

 package com.liquidnet.service.candy.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.entity.CandyCoupon;
 import com.liquidnet.service.candy.vo.CandyCouponVo;
 import com.liquidnet.service.candy.vo.CandyMyCouponListVo;
@@ -37,7 +38,7 @@ public interface ICandyCouponService {
 
     Boolean useBackCoupon(String uCouponId);
 
-    Boolean receiveCoupon(String ccode);
+    ResponseDto<Boolean> receiveCoupon(String ccode);
 
-    CandyCouponVo receiveCouponDetails(String ccode);
+    ResponseDto<CandyCouponVo> receiveCouponDetails(String ccode);
 }

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

@@ -177,12 +177,12 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "ccode", value = "兑换码", required = true),
     })
     public ResponseDto<Boolean> receiveCoupon(@RequestParam("ccode") @NotNull @NotBlank String ccode) {
-        Boolean result = candyCouponService.receiveCoupon(ccode);
-        if (result) {
-            return ResponseDto.success();
-        } else {
-            return ResponseDto.failure();
-        }
+        return candyCouponService.receiveCoupon(ccode);
+//        if (result) {
+//            return ResponseDto.success();
+//        } else {
+//            return ResponseDto.failure();
+//        }
     }
 
     //兑换券详情
@@ -192,11 +192,11 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "ccode", value = "兑换码", required = true),
     })
     public ResponseDto<CandyCouponVo> receiveCouponDetails(@RequestParam("ccode") @NotNull @NotBlank String ccode) {
-        CandyCouponVo result = candyCouponService.receiveCouponDetails(ccode);
-        if (result != null) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure();
-        }
+        return candyCouponService.receiveCouponDetails(ccode);
+//        if (result != null) {
+//            return ResponseDto.success(result);
+//        } else {
+//            return ResponseDto.failure();
+//        }
     }
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.candy.service.impl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.dto.CandyCouponCodeDto;
@@ -285,13 +286,15 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
     @Override
-    public Boolean receiveCoupon(String ccode) {
+    public ResponseDto<Boolean> receiveCoupon(String ccode) {
         String uid = CurrentUtil.getCurrentUid();
         CandyCouponCodeDto dto = redisDataUtils.getCouponByCode(ccode);
-        if (dto != null && dto.getState().equals(0)) {//判断可领
+        if (dto != null) {
+            return ResponseDto.failure("兑换码有误，请重新输入");
+        } else if (dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
             if (!CouponBaseUtil.CandyCanReceive(infoDto)) {
-                return false;
+                return  ResponseDto.failure("兑换码已过期");
             }
             String uCouponId = IDGenerator.get32UUID();
             //构建baseDto
@@ -308,26 +311,28 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                     )
             );
         } else {
-            return false;
+            return  ResponseDto.failure("兑换失败，请稍后再试");
         }
-        return true;
+        return  ResponseDto.success(true);
     }
 
     @Override
-    public CandyCouponVo receiveCouponDetails(String ccode) {
+    public ResponseDto<CandyCouponVo> receiveCouponDetails(String ccode) {
         String uid = CurrentUtil.getCurrentUid();
         CandyCouponCodeDto dto = redisDataUtils.getCouponByCode(ccode);
-        if (dto != null && dto.getState().equals(0)) {//判断可领
+        if (dto != null) {
+            return  ResponseDto.failure("兑换码有误，请重新输入");
+        } else if (dto.getState().equals(0)) {//判断可领
             CandyCouponInfoDto infoDto = redisDataUtils.getCouponInfo(dto.getCouponId());
             if (!CouponBaseUtil.CandyCanReceive(infoDto)) {
-                return null;
+                return  ResponseDto.failure("兑换码已过期");
             }
             String uCouponId = IDGenerator.get32UUID();
             //构建baseDto
             CandyUserCouponBasicDto baseDto = CandyUserCouponBasicDto.getNew().copyToRedisBaseCoupon(uCouponId, uid, ccode, infoDto);
-            return CouponBaseUtil.getBaseCouponUserVo(baseDto);
+            return  ResponseDto.success(CouponBaseUtil.getBaseCouponUserVo(baseDto));
         } else {
-            return null;
+            return  ResponseDto.failure("兑换失败，请稍后再试");
         }
     }
 }