goblin 帮助前端用店铺券/平台券

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

@@ -256,6 +256,10 @@ public class GoblinCouponController {
         if (param.getUid() == null || param.getUid().equals("")) {
             param.setUid(CurrentUtil.getCurrentUid());
         }
-        return ResponseDto.success(goblinCouponService.helpUseCoupon(param));
+        CouponHelpUseVo vo = goblinCouponService.helpUseCoupon(param);
+        if(vo==null){
+            return ResponseDto.failure("券不存在");
+        }
+        return ResponseDto.success(vo);
     }
 }

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

@@ -126,14 +126,17 @@ public class GoblinCouponImpl implements GoblinCouponService {
 //            }
             if ("1".equals(type)) {
                 if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1)) {
+                    vo.setSpuIds(goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId()));
                     returnList.add(vo);
                 }
             } else {
                 if (vo.getDuedAt().isBefore(now) || vo.getState().equals(3)) {
                     vo.setState(3);
+                    vo.setSpuIds(goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId()));
                     returnList.add(vo);
                 }
                 if (vo.getState().equals(5)) {
+                    vo.setSpuIds(goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId()));
                     returnList.add(vo);
                 }
             }
@@ -488,6 +491,9 @@ public class GoblinCouponImpl implements GoblinCouponService {
             }
         } else if (platformUcouponId != null && !platformUcouponId.equals("")) {
             CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(platformUcouponId);
+            if(candyCouponVo==null){
+                return null;
+            }
             if (candyCouponVo.getState().equals(1) && (candyCouponVo.getBusiType().equals(0) || candyCouponVo.getBusiType().equals(2))) {
                 BigDecimal voucherPrice;
                 switch (candyCouponVo.getCouType()) {

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

@@ -65,7 +65,11 @@ public class GoblinOrderUtils {
             String returnData = HttpUtil.post(candyUrl + " /candy-coupon/receive/ListById", params, header);
             ResponseDto<List<CandyCouponVo>> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<List<CandyCouponVo>>>() {
             });
-            return innerReturnVo.getData().get(0);
+            if(innerReturnVo.getData().size()>0){
+                return innerReturnVo.getData().get(0);
+            }else{
+                return null;
+            }
         } catch (Exception e) {
             log.error("回退券ERROR:{}", e);
             CandyCouponVo vo = CandyCouponVo.getNew();