Merge branch 'hjc_road_coupon' into dev_rc_xuper_op

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinCandyItemParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel
+@Data
+public class KylinCandyItemParam implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "券类型id")
+    private String couponId;
+    @ApiModelProperty(value = "每一张券id")
+    private String ucouponId;
+
+    private static final KylinCandyItemParam obj = new KylinCandyItemParam();
+
+    public static KylinCandyItemParam getNew() {
+        try {
+            return (KylinCandyItemParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinCandyItemParam();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinCandyParam.java

@@ -12,7 +12,7 @@ import java.util.List;
 public class KylinCandyParam implements Serializable, Cloneable {
 
     @ApiModelProperty(value = "券id集合")
-    private List<String> couponList;
+    private List<KylinCandyItemParam> couponList;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCandyVo.java

@@ -10,8 +10,10 @@ import java.io.Serializable;
 @Data
 public class KylinCandyVo implements Serializable, Cloneable {
 
-    @ApiModelProperty(value = "券id")
+    @ApiModelProperty(value = "券类别id")
     private String couponId;
+    @ApiModelProperty(value = "券id")
+    private String ucouponId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java

 package com.liquidnet.service.kylin.service;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.KylinCandyItemParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinCandyVo;
 
 import java.util.List;
@@ -28,5 +29,5 @@ public interface IKylinPerformancesService {
 
     ResponseDto<Integer> isSubscribe(String performancesId);
 
-    ResponseDto<List<KylinCandyVo>> kylinCandy(List<String> data, String roadShowId);
+    ResponseDto<List<KylinCandyVo>> kylinCandy(List<KylinCandyItemParam> data, String roadShowId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -10,6 +10,7 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dto.param.KylinCandyItemParam;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinCandyVo;
@@ -744,18 +745,18 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     }
 
     @Override
-    public ResponseDto<List<KylinCandyVo>> kylinCandy(List<String> data, String roadShowId) {
+    public ResponseDto<List<KylinCandyVo>> kylinCandy(List<KylinCandyItemParam> data, String roadShowId) {
         List<KylinCandyVo> voList = ObjectUtil.kylinCandyVos();
-        for (String couponId : data) {
-            List<String> roadShowIds = dataUtils.getCouponRoad(couponId);
+        for (KylinCandyItemParam item : data) {
+            List<String> roadShowIds = dataUtils.getCouponRoad(item.getCouponId());
             if (roadShowIds.size() == 0 || roadShowIds.contains(roadShowId)) {
                 KylinCandyVo vo = KylinCandyVo.getNew();
-                vo.setCouponId(couponId);
+                vo.setCouponId(item.getCouponId());
+                vo.setCouponId(item.getUcouponId());
                 vo.setRoadShowId(roadShowIds.contains(roadShowId) ? roadShowId : "");
                 voList.add(vo);
             }
         }
-
         return ResponseDto.success(voList);
     }
 }