增加 会员礼包券列表

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

@@ -23,6 +23,8 @@ public interface ICandyCouponService {
 
     CandyMyCouponListVo myCoupon(Integer type);
 
+    List<CandyCouponVo> memberCoupon(String mCouponId);
+
     CandyMyCouponListVo preUsePerformanceCoupon(BigDecimal priceTotal, String performanceId, String timeId, String ticketId,Integer type);
 
     Integer preCanUsePerformanceCoupon(BigDecimal priceTotal, String performanceId, String timeId, String ticketId);

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

@@ -50,6 +50,16 @@ public class CandyCouponController {
         return ResponseDto.success(candyCouponService.myCoupon(type));
     }
 
+    //我的券列表
+    @GetMapping("member")
+    @ApiOperation("会员权益券列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "mCouponId", value = "mCouponId", required = true),
+    })
+    public ResponseDto<List<CandyCouponVo>> myCoupon(@RequestParam("mCouponId") @NotNull @NotBlank String mCouponId) {
+        return ResponseDto.success(candyCouponService.memberCoupon(mCouponId));
+    }
+
     //要使用券列表 - 演出
     @GetMapping("preUse/performance")
     @ApiOperation("要使用券列表 - 演出")

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

@@ -74,6 +74,26 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         return vo;
     }
 
+    @Override
+    public List<CandyCouponVo> memberCoupon(String mCouponId) {
+        String uid = CurrentUtil.getCurrentUid();
+        List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid);
+        List<CandyCouponVo> memberCoupon = ObjectUtil.getCandyCouponVoArrayList();
+
+        for (CandyUserCouponBasicDto dtoItem : dtoList) {
+            if (!mCouponId.equals(dtoItem.getMcouponId())) {
+                continue;
+            }
+            CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+            if (dtoItem.getExclusive().equals(1)) { //会员券
+                memberCoupon.add(baseVo);
+            }
+        }
+        //排序 可用->金额->类型->过期时间
+        memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
+        return memberCoupon;
+    }
+
     @Override
     public CandyMyCouponListVo preUsePerformanceCoupon(BigDecimal priceTotal, String performanceId, String timeId, String ticketId, Integer type) {
         String uid = CurrentUtil.getCurrentUid();
@@ -261,7 +281,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     @Override
     public Boolean useBackCoupon(List<BackCouponParam> backCouponParams) {
         for (BackCouponParam item : backCouponParams) {
-            String uid =item.getUid();
+            String uid = item.getUid();
             ArrayList<String> uCouponIdList = new ArrayList(Arrays.asList(item.getuCouponIds().split(",")));
             List<CandyUserCouponBasicDto> dtoList = CouponBaseUtil.backCoupon(redisDataUtils.getCouponByUid(uid), uCouponIdList);
             if (dtoList == null) {