修改下单接口

券 使用接口
券 提前下单接口

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

@@ -33,7 +33,7 @@ public interface ICandyCouponService {
 
     Integer preCanUseGoodCoupon(BigDecimal priceTotal, String goodI);
 
-    List<CandyCouponVo> myAdvanceCoupon(String performanceId, String timesId, String ticketId);
+    List<CandyCouponVo> myAdvanceCoupon(String performanceId);
 
     Integer stateCoupon(String uCouponId);
 

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

@@ -130,14 +130,10 @@ public class CandyCouponController {
     @GetMapping("my/advance")
     @ApiOperation("提前券列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", dataType = "String", name = "performanceId", value = "演出id", required = true),
-            @ApiImplicitParam(type = "form", dataType = "String", name = "timeId", value = "场次id", required = true),
-            @ApiImplicitParam(type = "form", dataType = "String", name = "ticketId", value = "票id", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "performanceId", value = "演出id", required = true)
     })
-    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId,
-                                                            @RequestParam("timeId") @NotNull @NotBlank String timeId,
-                                                            @RequestParam("ticketId") @NotNull @NotBlank String ticketId) {
-        return ResponseDto.success(candyCouponService.myAdvanceCoupon(performanceId, timeId, ticketId));
+    public ResponseDto<List<CandyCouponVo>> myAdvanceCoupon(@RequestParam("performanceId") @NotNull @NotBlank String performanceId) {
+        return ResponseDto.success(candyCouponService.myAdvanceCoupon(performanceId));
     }
 
     //判断券是否可用
@@ -164,7 +160,7 @@ public class CandyCouponController {
             @ApiImplicitParam(type = "form", dataType = "String", name = "content", value = "消费内容", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "totalPrice", value = "消费价格", required = true),
 
-            @ApiImplicitParam(type = "form", dataType = "String", name = "goodId", value = "商品id(逗号隔开的字符串)", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "goodId", value = "商品id(逗号隔开的字符串) 没有传-1", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "performanceId", value = "演出id", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "timeId", value = "场次id", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "ticketId", value = "票id", required = true),

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

@@ -198,13 +198,13 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
     }
 
     @Override
-    public List<CandyCouponVo> myAdvanceCoupon(String performanceId, String timesId, String ticketId) {
+    public List<CandyCouponVo> myAdvanceCoupon(String performanceId) {
         String uid = CurrentUtil.getCurrentUid();
         List<CandyUserCouponBasicDto> dtoList = redisDataUtils.getCouponByUid(uid);
         List<CandyCouponVo> advanceCoupon = ObjectUtil.getCandyCouponVoArrayList();
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             if (dtoItem.getBusiType().equals(3)) {
-                CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, BigDecimal.ZERO, performanceId, timesId, ticketId);
+                CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, BigDecimal.ZERO, performanceId, "-1", "-1");
                 if (baseVo.getState().equals(1)) {
                     advanceCoupon.add(baseVo);
                 } else {