Merge remote-tracking branch 'origin/阶梯退票_羊毛券_合并分支' into 阶梯退票_羊毛券_合并分支

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinOrderAppService.java

@@ -16,6 +16,8 @@ public interface IGoblinOrderAppService {
 
     ResponseDto<GoblinAppOrderDetailsVo> orderDetails(String orderId,String uid);
 
+    Integer couponState(String orderId, String uid);
+
     ResponseDto<Boolean> getProduce(String orderId,String uid);
 
     ResponseDto<Boolean> applyRefund(GoblinAppOrderRefundParam param);

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Slf4j
@@ -59,6 +60,12 @@ public class GoblinOrderAppController {
         return goblinOrderAppService.orderDetails(orderId, uid);
     }
 
+    @GetMapping("couponState")
+    @ApiOperation(value = "券类商品订单查询已发放券状态", notes = "响应参数[1-可用,5-已用]")
+    public ResponseDto<Integer> couponState(@NotBlank(message = "子订单Id不能为空") @RequestParam String orderSkuId) {
+        return ResponseDto.success(goblinOrderAppService.couponState(orderSkuId, CurrentUtil.getCurrentUid()));
+    }
+
     @PostMapping("getProduce")
     @ApiOperation("已收货")
     @ApiImplicitParams({

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

@@ -160,6 +160,21 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         return ResponseDto.success(vo);
     }
 
+    @Override
+    public Integer couponState(String orderSkuId, String uid) {
+        GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+        if (Objects.equals(orderSkuVo.getSkuType(), 2)) {// 券类商品-校验发放的券是否已使用
+            // 券类商品默认一个商品对应一个券，下单只可购买一张
+            List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtils.get(CandyRedisConst.BASIC_USER_COUPON.concat(uid));
+            if (!CollectionUtil.isEmpty(vos)) {
+                CandyUserCouponBasicDto basicDto = vos.stream().filter(r -> r.getUcouponId().equals(orderSkuId)).findAny().orElse(null);
+
+                return (!Objects.isNull(basicDto) && basicDto.getState() == 5) ? 5 : 1;
+            }
+        }
+        return 1;
+    }
+
     @Override
     public ResponseDto<Boolean> getProduce(String orderId, String uid) {
         LocalDateTime now = LocalDateTime.now();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -136,7 +136,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                                 String couponSkuIdNoBuyLimitKey = String.format(GoblinRedisConst.REDIS_GOBLIN_BUY_COUNT_IDNO, skuParam.getIdType(), skuParam.getIdNo(), skuId, skuParam.getNumber());
                                 couponSkuIdNoBuyLimitMap.put(couponSkuIdNoBuyLimitKey, skuParam.getNumber());
                                 if (redisUtils.redisUtil.incr(couponSkuIdNoBuyLimitKey, skuParam.getNumber()) > idNoLimitCount) {
-                                    throw new LiquidnetServiceException("-1", String.format("超出限购数量，一份证件限购%d张", idNoLimitCount));
+                                    throw new LiquidnetServiceException("-1", String.format("超过限购数量，一个证件信息限购%d张", idNoLimitCount));
                                 }
                             }
                         }