提交ar相关接口 增加数据 isdefult 上传券接口修改

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode
-public class TempCouponDto implements  Cloneable{
+public class TempCouponDto implements Cloneable {
     @ApiModelProperty(position = 1, value = "券名称")
     private String name;
     @ApiModelProperty(position = 2, value = "spuId【无用】")
@@ -18,8 +18,10 @@ public class TempCouponDto implements  Cloneable{
     private String type;
     @ApiModelProperty(position = 5, value = "优惠价格")
     private BigDecimal value;
-    @ApiModelProperty(position = 6, value = "券id")
+    @ApiModelProperty(position = 6, value = "券组id[领券用]")
     private String ucouponId;
+    @ApiModelProperty(position = 7, value = "是否默认用券")
+    private int isDefault;
 
     private static final TempCouponDto obj = new TempCouponDto();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/TempCouponVo.java

@@ -18,8 +18,10 @@ public class TempCouponVo implements  Cloneable{
     private String type;
     @ApiModelProperty(position = 5, value = "优惠价格")
     private BigDecimal value;
-    @ApiModelProperty(position = 6, value = "券id")
+    @ApiModelProperty(position = 6, value = "券组id[领券用]")
     private String ucouponId;
+    @ApiModelProperty(position = 7, value = "是否默认用券")
+    private int isDefault;
 
     private static final TempCouponVo obj = new TempCouponVo();
 

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

@@ -42,8 +42,9 @@ public class GoblinInnerServiceImpl implements IGoblinInnerService {
                     vo.setName(data.getName());
                     vo.setType(data.getType());
                     vo.setValue(data.getValue());
+                    vo.setIsDefault(data.getIsDefault());
                     vo.setSpuIdList(spuList);
-                    vo.setUcouponId(IDGenerator.nextTimeId2());
+                    vo.setUcouponId(data.getUcouponId());
                     redisUtils.addMarketTempCoupon(performanceId, vo.getUcouponId());
                     redisUtils.setTempCoupon(vo.getUcouponId(), vo);
                 }