提交 apimodel 文档

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

 package com.liquidnet.service.candy.vo;
 
-import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 @Data
+@ApiModel
 public class CandyCouponRulesVo implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 4073256621782131607L;
 
+    @ApiModelProperty(value = "适用范围[100-全场｜90-演出｜91-场次｜92-票｜80-商品｜81-款式]",example = "90")
     private Integer useScope;
+    @ApiModelProperty(value = "适用名称",example = "北京草莓")
     private String busiName;
+    @ApiModelProperty(value = "适用ID",example = "1")
     private String busiId;
 
     private static final CandyCouponRulesVo obj = new CandyCouponRulesVo();

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

 package com.liquidnet.service.candy.vo;
 
 import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -9,36 +12,53 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
-public class CandyCouponVo implements Serializable,Cloneable {
+@ApiModel
+public class CandyCouponVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 4073256621782131606L;
 
     /* --- --- --- CandyCoupon */
-    private String title;//标题
-    private String label;//标注
-    private String notice;//须知
-//    private Integer exclusive;//专享标识[0-常规｜1-会员礼包]
-//    private Integer busiType;//业务类别[0-全场｜1-演出｜2-商品｜3-优先购]
-    private Integer couType;//券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]
-    private Integer bindType;//[0-用户输入兑换｜1-发放至用户]
-    private BigDecimal discount;//折扣
-    private BigDecimal valFace;//面值
-    private BigDecimal valOver;//满减~满
-    private BigDecimal valMinus;//满减~减少
-    private String expireAt;//过期时间
+    @ApiModelProperty(value = "标题",example = "标题")
+    private String title;
+    @ApiModelProperty(value = "标注",example = "标注")
+    private String label;
+    @ApiModelProperty(value = "须知",example = "须知")
+    private String notice;
+    //    private Integer exclusive;//专享标识[0-常规｜1-会员礼包]
+    @ApiModelProperty(value = "业务类别[0-全场｜1-演出｜2-商品｜3-优先购]",example = "0")
+    private Integer busiType;
+    @ApiModelProperty(value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]",example = "1")
+    private Integer couType;
+    @ApiModelProperty(value = "[0-用户输入兑换｜1-发放至用户]",example = "1")
+    private Integer bindType;
+    @ApiModelProperty(value = "折扣 可null",example = "0.5")
+    private BigDecimal discount;
+    @ApiModelProperty(value = "面值 可null",example = "1")
+    private BigDecimal valFace;
+    @ApiModelProperty(value = "满减~满 可null",example = "100")
+    private BigDecimal valOver;
+    @ApiModelProperty(value = "满减~减少 可null",example = "5")
+    private BigDecimal valMinus;
+    @ApiModelProperty(value = "过期时间 可null",example = "2021-09-25")
+    private String expireAt;
 
     /* --- --- --- CandyUserCoupon */
-    private String ucouponId;//券id
-    private Integer state;//券状态[1-可用|2-无效｜3-已过期｜5-已使用 |21-不可用]
-//    private String bindAt;//激活时间
-    private String usedAt;//使用时间
-    private String usedFor;//购买内容
+    @ApiModelProperty(value = "券id",example = "6d74a49d3d1d13f96ba09215abcc49af")
+    private String ucouponId;
+    @ApiModelProperty(value = "券状态[1-可用|2-无效｜3-已过期｜5-已使用 |21-不可用]",example = "1")
+    private Integer state;
+    //    private String bindAt;//激活时间
+    @ApiModelProperty(value = "使用时间 可null",example = "2021-09-25")
+    private String usedAt;
+    @ApiModelProperty(value = "购买内容 可null",example = "北京草莓")
+    private String usedFor;
 
 
     /* --- --- --- CandyCouponRule */
     private List<CandyCouponRulesVo> useRules;
 
     private static final CandyCouponVo obj = new CandyCouponVo();
+
     public static CandyCouponVo getNew() {
         try {
             return (CandyCouponVo) obj.clone();

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

 package com.liquidnet.service.candy.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
+@ApiModel
 public class CandyMyCouponListVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 4073256621782131607L;
-
+    @ApiModelProperty(value = "会员券")
     private List<CandyCouponVo> memberCoupon;
+    @ApiModelProperty(value = "我的券")
     private List<CandyCouponVo> myCoupon;
 
     private static final CandyMyCouponListVo obj = new CandyMyCouponListVo();

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

 package com.liquidnet.service.candy.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,11 +9,13 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@ApiModel
 public class CandyUseResultVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 4073256621782131607L;
-
+    @ApiModelProperty(value = "优惠内容",example = "1")
     private BigDecimal value;
+    @ApiModelProperty(value = "券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券]",example = "1")
     private Integer couType;
 
     private static final CandyUseResultVo obj = new CandyUseResultVo();

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

+package com.liquidnet.service.candy.config;
+
+import com.liquidnet.common.web.config.WebMvcConfig;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class CandyWebMvcConfig extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}

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

@@ -26,7 +26,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-08-18
  */
-@Api("券相关接口")
+@Api(tags = "券相关接口")
 @RestController
 @RequestMapping("/candy-coupon")
 public class CandyCouponController {

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

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.service.candy.entity.CandyCouponCode;
-import com.liquidnet.service.candy.mapper.CandyCouponCodeMapper;
 import com.liquidnet.service.candy.service.ICandyCouponCodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.service.candy.entity.CandyCouponRule;
-import com.liquidnet.service.candy.mapper.CandyCouponRuleMapper;
 import com.liquidnet.service.candy.service.ICandyCouponRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.candy.dto.CandyCouponCodeDto;
 import com.liquidnet.service.candy.dto.CandyCouponInfoDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
-import com.liquidnet.service.candy.entity.CandyCoupon;
-import com.liquidnet.service.candy.mapper.CandyCouponMapper;
 import com.liquidnet.service.candy.service.ICandyCouponService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.candy.util.CouponBaseUtil;
 import com.liquidnet.service.candy.util.ObjectUtil;
 import com.liquidnet.service.candy.util.QueueUtils;
@@ -26,7 +21,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 
 /**

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

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.service.candy.entity.CandyMgtCoupon;
-import com.liquidnet.service.candy.mapper.CandyMgtCouponMapper;
 import com.liquidnet.service.candy.service.ICandyMgtCouponService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

 package com.liquidnet.service.candy.service.impl;
 
-import com.liquidnet.service.candy.entity.CandyUserCoupon;
-import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
 import com.liquidnet.service.candy.service.ICandyUserCouponService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -28,6 +28,7 @@ public class CouponBaseUtil {
         vo.setTitle(dtoItem.getTitle());
         vo.setExpireAt(DateUtil.format(dtoItem.getExpireAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setValFace(dtoItem.getValFace());
+        vo.setBusiType(dtoItem.getBusiType());
         vo.setValOver(dtoItem.getValOver());
         vo.setValMinus(dtoItem.getValMinus());
         vo.setBindType(dtoItem.getBindType());
@@ -82,6 +83,9 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
+        if (dtoItem.getUseRules() == null && dtoItem.getBusiType().equals(1)) {
+            isTarget = true;
+        } else {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
                 CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
                 voRules.setUseScope(ruleItem.getUseScope());
@@ -103,6 +107,7 @@ public class CouponBaseUtil {
                         break;
                 }
             }
+        }
         //券类别
         if (dtoItem.getBusiType().equals(3)) {
             vo.setCouType(101);
@@ -145,6 +150,9 @@ public class CouponBaseUtil {
         vo.setUsedAt(DateUtil.format(dtoItem.getUsedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setUsedFor(dtoItem.getUsedFor());
         //适用范围 规则
+        if (dtoItem.getUseRules() == null && dtoItem.getBusiType().equals(1)) {
+            isTarget = true;
+        } else {
             for (CandyCouponRuleDto ruleItem : dtoItem.getUseRules()) {
                 CandyCouponRulesVo voRules = CandyCouponRulesVo.getNew();
                 voRules.setUseScope(ruleItem.getUseScope());
@@ -163,6 +171,7 @@ public class CouponBaseUtil {
                         break;
                 }
             }
+        }
         //券类别
         if (dtoItem.getBusiType().equals(3)) {
             vo.setCouType(101);
@@ -250,7 +259,7 @@ public class CouponBaseUtil {
      * @param uCouponId 券唯一id
      * @return List<CandyUserCouponBasicDto>
      */
-    public static List<CandyUserCouponBasicDto> useCoupon(List<CandyUserCouponBasicDto> dtoList, String uCouponId,String content) {
+    public static List<CandyUserCouponBasicDto> useCoupon(List<CandyUserCouponBasicDto> dtoList, String uCouponId, String content) {
         boolean isHas = false;
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             if (dtoItem.getUcouponId().equals(uCouponId)) {