fixed 实体类set和get

fuint-application/src/main/java/com/fuint/common/dto/AssetDto.java

@@ -1,28 +1,25 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 个人资产实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class AssetDto {
-    private Integer timer;
-    private Integer prestore;
-    private Integer coupon;
 
-    public Integer getTimer() {
-        return timer;
-    }
-    public void setTimer(Integer timer) {
-        this.timer = timer;
-    }
+    @ApiModelProperty("次卡数量")
+    private Integer timer;
 
-    public Integer getPrestore() {
-        return prestore;
-    }
-    public void setPrestore(Integer prestore) {
-        this.prestore = prestore;
-    }
+    @ApiModelProperty("储值卡数量")
+    private Integer prestore;
 
-    public Integer getCoupon() {
-        return coupon;
-    }
-    public void setCoupon(Integer coupon) {
-        this.coupon = coupon;
-    }
+    @ApiModelProperty("优惠券数量")
+    private Integer coupon;
 }

fuint-application/src/main/java/com/fuint/common/dto/BalanceDto.java

@@ -1,146 +1,56 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * BalanceDto 实体类
+ * 余额变动实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class BalanceDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 会员信息
-     */
+    @ApiModelProperty("会员信息")
     private MtUser userInfo;
 
-    /**
-     * 订单号
-     */
+    @ApiModelProperty("订单号")
     private String orderSn;
 
-    /**
-     * 余额变化数量
-     */
+    @ApiModelProperty("余额变化数量")
     private BigDecimal amount;
 
-    /**
-     * 创建时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 备注说明
-     */
+    @ApiModelProperty("备注说明")
     private String description;
 
-    /**
-     * 状态，A正常；D作废
-     */
+    @ApiModelProperty("状态，A正常；D删除")
     private String status;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public MtUser getUserInfo() {
-        return userInfo;
-    }
-
-    public void setUserInfo(MtUser userInfo) {
-        this.userInfo = userInfo;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOperator(){
-        return operator;
-    }
-
-    public void setOperator(String operator){
-        this.operator=operator;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/BannerDto.java

@@ -1,145 +1,59 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 焦点图实体类
+ *
  * Created by FSQ
+ * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class BannerDto implements Serializable {
 
-    /**
-    * 自增ID 
-    */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-   /**
-    * 标题 
-    */
+    @ApiModelProperty("标题")
     private String title;
 
-    /**
-     * 所属商户
-     * */
+    @ApiModelProperty("所属商户ID")
     private Integer merchantId;
 
-    /**
-     * 所属店铺
-     * */
+    @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 
-    /**
-     * 链接地址
-     */
+    @ApiModelProperty("链接地址")
     private String url;
 
-   /**
-    * 图片地址 
-    */
+    @ApiModelProperty("图片地址")
     private String image;
 
-   /**
-    * 描述 
-    */
+    @ApiModelProperty("描述信息")
     private String description;
 
-   /**
-    * 创建时间 
-    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-   /**
-    * 更新时间 
-    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-   /**
-    * 最后操作人 
-    */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-   /**
-    * A：正常；D：删除 
-    */
-    private String status;
-
-    /**
-     * 排序
-     * */
+    @ApiModelProperty("排序")
     private Integer sort;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-    this.id=id;
-    }
-    public String getTitle(){
-        return title;
-    }
-    public void setTitle(String title){
-    this.title=title;
-    }
-    public Integer getMerchantId(){
-        return merchantId;
-    }
-    public void setMerchantId(Integer merchantId){
-        this.merchantId=merchantId;
-    }
-    public Integer getStoreId(){
-        return storeId;
-    }
-    public void setStoreId(Integer storeId){
-        this.storeId=storeId;
-    }
-    public String getUrl(){
-        return url;
-    }
-    public void setUrl(String url){
-        this.url=url;
-    }
-    public String getImage(){
-        return image;
-    }
-    public void setImage(String image){
-    this.image=image;
-    }
-    public String getDescription(){
-        return description;
-    }
-    public void setDescription(String description){
-    this.description=description;
-    }
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-    this.createTime=createTime;
-    }
-    public Date getUpdateTime(){
-        return updateTime;
-    }
-    public void setUpdateTime(Date updateTime){
-    this.updateTime=updateTime;
-    }
-    public String getOperator(){
-        return operator;
-    }
-    public void setOperator(String operator){
-    this.operator=operator;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-    this.status=status;
-    }
-    public Integer getSort(){
-        return sort;
-    }
-    public void setSort(Integer sort){
-        this.sort=sort;
-    }
+    @ApiModelProperty("状态，A正常；D删除")
+    private String status;
 }
 

fuint-application/src/main/java/com/fuint/common/dto/Body.java

@@ -1,5 +1,8 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -9,28 +12,15 @@ import java.util.Map;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class Body implements Serializable{
+@Getter
+@Setter
+public class Body implements Serializable {
 
-    private static final long serialVersionUID = 5748371865401175733L;
+    @ApiModelProperty("入参信息")
+    private Map<String,Object> inParams;
 
-    private Map<String,Object> inParams;//入参信息
-    private Map<String,Object> outParams;//出参信息
-
-    public Map<String, Object> getInParams() {
-        return inParams;
-    }
-
-    public void setInParams(Map<String, Object> inParams) {
-        this.inParams = inParams;
-    }
-
-    public Map<String, Object> getOutParams() {
-        return outParams;
-    }
-
-    public void setOutParams(Map<String, Object> outParams) {
-        this.outParams = outParams;
-    }
+    @ApiModelProperty("出参信息")
+    private Map<String,Object> outParams;
 
     @Override
     public String toString() {

fuint-application/src/main/java/com/fuint/common/dto/ConfirmLogDto.java

@@ -4,6 +4,11 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fuint.repository.model.MtCoupon;
 import com.fuint.repository.model.MtStore;
 import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -13,152 +18,50 @@ import java.util.Date;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class ConfirmLogDto {
+@Getter
+@Setter
+public class ConfirmLogDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
-     private Integer id;
+    @ApiModelProperty("自增ID")
+    private Integer id;
 
-    /**
-     * 核销编码
-     */
+    @ApiModelProperty("核销编码")
     private String code;
 
-    /**
-     * 核销状态
-     */
+    @ApiModelProperty("核销状态")
     private String status;
 
-    /**
-     * 会员卡券ID
-     */
+    @ApiModelProperty("会员卡券ID")
     private Integer userCouponId;
 
-    /**
-     * 卡券信息
-     */
+    @ApiModelProperty("卡券信息")
     private MtCoupon couponInfo;
 
-    /**
-     * 核销会员信息
-     */
+    @ApiModelProperty("会员信息")
     private MtUser userInfo;
 
-    /**
-     * 使用店铺信息
-     */
+    @ApiModelProperty("核销店铺信息")
     private MtStore storeInfo;
 
-    /**
-     * 创建时间
-     */
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 核销面额
-     */
+    @ApiModelProperty("核销金额")
     private BigDecimal amount;
 
-    /**
-     * 核销uuid
-     */
+    @ApiModelProperty("核销uuid")
     private String uuid;
 
-    /**
-     * 核销备注
-     */
+    @ApiModelProperty("核销备注")
     private String remark;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    public Integer getId(){
-    return id;
-    }
-    public void setId(Integer id){
-    this.id=id;
-    }
-    public String getCode(){
-    return code;
-    }
-    public void setCode(String code){
-    this.code=code;
-    }
-    public Integer getUserCouponId(){
-    return userCouponId;
-    }
-    public void setUserCouponId(Integer userCouponId){
-    this.userCouponId=userCouponId;
-    }
-    public MtCoupon getCouponInfo(){
-    return couponInfo;
-    }
-    public void setCouponInfo(MtCoupon couponInfo){
-    this.couponInfo=couponInfo;
-    }
-    public MtUser getUserInfo(){
-     return userInfo;
-    }
-    public void setUserInfo(MtUser userInfo){
-    this.userInfo=userInfo;
-    }
-    public MtStore getStoreInfo(){
-     return storeInfo;
-    }
-    public void setStoreInfo(MtStore storeInfo){
-    this.storeInfo=storeInfo;
-    }
-    public Date getCreateTime(){
-     return createTime;
-    }
-    public void setCreateTime(Date createTime){
-    this.createTime=createTime;
-    }
-    public Date getUpdateTime(){
-     return updateTime;
-    }
-    public void setUpdateTime(Date updateTime){
-    this.updateTime=updateTime;
-    }
-    public BigDecimal getAmount(){
-     return amount;
-    }
-    public void setAmount(BigDecimal amount){
-    this.amount=amount;
-    }
-    public String getUuid(){
-    return uuid;
-    }
-    public void setUuid(String uuid){
-    this.uuid=uuid;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status=status;
-    }
-    public String getRemark(){
-        return remark;
-    }
-    public void setRemark(String remark){
-        this.remark=remark;
-    }
-    public String getOperator(){
-        return operator;
-    }
-    public void setOperator(String operator){
-        this.operator=operator;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/ContentDto.java

@@ -1,34 +0,0 @@
-package com.fuint.common.dto;
-
-public class ContentDto {
-
-    private String key;
-
-    private String value;
-
-    private String type;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

fuint-application/src/main/java/com/fuint/common/dto/CouponCellDto.java

@@ -1,49 +1,30 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.util.List;
 
+/**
+ * 卡券导入单元实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class CouponCellDto {
 
+    @ApiModelProperty("手机号")
     private String mobile;
 
-    // 商户ID
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    // 分组ID
+    @ApiModelProperty("分组ID")
     private List<Integer> groupId;
 
-    // 发放数量
+    @ApiModelProperty("发放数量")
     private List<Integer> num;
 
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public List<Integer> getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(List<Integer> groupId) {
-        this.groupId = groupId;
-    }
-
-    public List<Integer> getNum() {
-        return num;
-    }
-
-    public void setNum(List<Integer> num) {
-        this.num = num;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/CouponDto.java

@@ -1,229 +1,71 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * 卡券DTO
+ * 卡券实体
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Data
 public class CouponDto implements Serializable {
 
-    /**
-     * 自增ID
-     * */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 名称（券名称）
-     * */
+    @ApiModelProperty("卡券名称")
     private String name;
 
-    /**
-     * 卡券类型
-     * */
+    @ApiModelProperty("卡券类型")
     private String type;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    /**
-     * 获取规则
-     * */
+    @ApiModelProperty("获取规则")
     private String inRule;
 
-    /**
-     * 使用规则
-     * */
+    @ApiModelProperty("使用规则")
     private String outRule;
 
-    /**
-     * 图片
-     * */
+    @ApiModelProperty("图片")
     private String image;
 
-    /**
-     * 面额
-     * */
+    @ApiModelProperty("面额")
     private BigDecimal amount;
 
-    /**
-     * 领取需要积分数量
-     */
+    @ApiModelProperty("领取需要积分数量")
     private Integer point;
 
-    /**
-     * 卖点
-     * */
+    @ApiModelProperty("卖点")
     private String sellingPoint;
 
-    /**
-     * 已领取、预存张数
-     * */
+    @ApiModelProperty("已领取、预存数量")
     private Integer gotNum;
 
-    /**
-     * 剩余张数
-     * */
+    @ApiModelProperty("剩余数量")
     private Integer leftNum;
 
-    /**
-     * 限制数量
-     * */
+    @ApiModelProperty("限制数量")
     private Integer limitNum;
 
-    /**
-     * 是否领取
-     * */
-    private boolean isReceive;
+    @ApiModelProperty("是否领取")
+    private Boolean isReceive;
 
-    /**
-     * 是否需要领取码
-     * */
+    @ApiModelProperty("是否需要领取码")
     private boolean needReceiveCode;
 
-    /**
-     * 会员卡券ID
-     * */
-    private Integer userCouponId;
+    @ApiModelProperty("会员卡券ID")
+    private int userCouponId;
 
-    /**
-     * 有效期
-     * */
+    @ApiModelProperty("有效期")
     private String effectiveDate;
 
-    /**
-     * 卡券说明
-     * */
+    @ApiModelProperty("卡券说明")
     private String description;
 
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getInRule() {
-        return inRule;
-    }
-    public void setInRule(String inRule) {
-        this.inRule = inRule;
-    }
-
-    public String getOutRule() {
-        return outRule;
-    }
-    public void setOutRule(String outRule) {
-        this.outRule = outRule;
-    }
-
-    public String getImage() {
-        return image;
-    }
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Integer getPoint(){
-        return point;
-    }
-    public void setPoint(Integer point){
-        this.point=point;
-    }
-
-    public String getSellingPoint() {
-        return sellingPoint;
-    }
-    public void setSellingPoint(String sellingPoint) {
-        this.sellingPoint = sellingPoint;
-    }
-
-    public Integer getLimitNum() {
-        return limitNum;
-    }
-    public void setLimitNum(Integer limitNum) {
-        this.limitNum = limitNum;
-    }
-
-    public Integer getGotNum() {
-        return gotNum;
-    }
-    public void setGotNum(Integer gotNum) {
-        this.gotNum = gotNum;
-    }
-
-    public Integer getLeftNum() {
-        return leftNum;
-    }
-    public void setLeftNum(Integer leftNum) {
-        this.leftNum = leftNum;
-    }
-
-    public boolean getIsReceive() {
-        return isReceive;
-    }
-    public void setIsReceive(boolean isReceive) {
-        this.isReceive = isReceive;
-    }
-
-    public boolean getNeedReceiveCode() {
-        return needReceiveCode;
-    }
-    public void setNeedReceiveCode(boolean needReceiveCode) {
-        this.needReceiveCode = needReceiveCode;
-    }
-
-    public Integer getUserCouponId() {
-        return userCouponId;
-    }
-    public void setUserCouponId(Integer userCouponId) {
-        this.userCouponId = userCouponId;
-    }
-
-    public String getEffectiveDate() {
-        return effectiveDate;
-    }
-    public void setEffectiveDate(String effectiveDate) {
-        this.effectiveDate = effectiveDate;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/CouponTotalDto.java

@@ -1,67 +0,0 @@
-package com.fuint.common.dto;
-
-public class CouponTotalDto {
-    /**
-     * 发券量
-     */
-    private Long couponTotal;
-    /**
-     * 未使用量
-     */
-    private Long unUsedTotal;
-    /**
-     * 使用量
-     */
-    private Long usedTotal;
-
-    /**
-     * 过期量
-     */
-    private Long expireTotal;
-
-    /**
-     * 作废量
-     */
-    private Long disableTotal;
-
-    public Long getCouponTotal() {
-        return couponTotal;
-    }
-
-    public void setCouponTotal(Long couponTotal) {
-        this.couponTotal = couponTotal;
-    }
-
-    public Long getUnUsedTotal() {
-        return unUsedTotal;
-    }
-
-    public void setUnUsedTotal(Long unUsedTotal) {
-        this.unUsedTotal = unUsedTotal;
-    }
-
-    public Long getUsedTotal() {
-        return usedTotal;
-    }
-
-    public void setUsedTotal(Long usedTotal) {
-        this.usedTotal = usedTotal;
-    }
-
-    public Long getExpireTotal() {
-        return expireTotal;
-    }
-
-    public void setExpireTotal(Long expireTotal) {
-        this.expireTotal = expireTotal;
-    }
-
-    public Long getDisableTotal() {
-        return disableTotal;
-    }
-
-    public void setDisableTotal(Long disableTotal) {
-        this.disableTotal = disableTotal;
-    }
-}
-

fuint-application/src/main/java/com/fuint/common/dto/DateDto.java

@@ -1,23 +1,22 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 日期实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class DateDto {
+
+    @ApiModelProperty("开始时间")
     private String startDate;
 
+    @ApiModelProperty("结束时间")
     private String endDate;
-
-    public String getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(String startDate) {
-        this.startDate = startDate;
-    }
-
-    public String getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/ExceptionDto.java

@@ -1,249 +0,0 @@
-package com.fuint.common.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 特例dto
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class ExceptionDto implements Serializable {
-
-    /**
-     * 主键ID
-     */
-    private Long id;
-    /**
-     * 名称
-     */
-    private String name;
-    /**
-     * 描述
-     */
-    private String description;
-    /**
-     * 状态(A:有效 D:无效)
-     */
-    private String status;
-    /**
-     * 平台
-     */
-    private String[] platformId;
-
-    /**
-     * 渠道
-     */
-    private String[] shopId;
-
-    /**
-     * 品牌
-     */
-    private String brand;
-
-    /**
-     * 一级分类
-     */
-    private String[] firstCategoryId;
-    /**
-     * 一级分类
-     */
-    private String firstCategory;
-
-    /**
-     * 二级分类
-     */
-    private String[] secondCategoryId;
-    /**
-     * 二级分类
-     */
-    private String secondCategory;
-
-    /**
-     * 三级分类
-     */
-    private String[] thirdCategoryId;
-    /**
-     * 三级分类
-     */
-    private String thirdCategory;
-
-    /**
-     * 商品SKU（多个值使用英文逗号隔开）
-     */
-    private String skus;
-    /**
-     * 标签类型
-     */
-    private String tagType;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-    /**
-     * 操作人
-     */
-    private String operator;
-
-    public ExceptionDto() {
-    }
-
-    public ExceptionDto(Long id, String name, String description, String status, String skus, String tagType) {
-        this.id = id;
-        this.name = name;
-        this.description = description;
-        this.status = status;
-        this.skus = skus;
-        this.tagType = tagType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String[] getPlatformId() {
-        return platformId;
-    }
-
-    public void setPlatformId(String[] platformId) {
-        this.platformId = platformId;
-    }
-
-    public String[] getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(String[] shopId) {
-        this.shopId = shopId;
-    }
-
-    public String getBrand() {
-        return brand;
-    }
-
-    public void setBrand(String brand) {
-        this.brand = brand;
-    }
-
-
-    public String[] getFirstCategoryId() {
-        return firstCategoryId;
-    }
-
-    public void setFirstCategoryId(String[] firstCategoryId) {
-        this.firstCategoryId = firstCategoryId;
-    }
-
-    public String getFirstCategory() {
-        return firstCategory;
-    }
-
-    public void setFirstCategory(String firstCategory) {
-        this.firstCategory = firstCategory;
-    }
-
-    public String[] getSecondCategoryId() {
-        return secondCategoryId;
-    }
-
-    public void setSecondCategoryId(String[] secondCategoryId) {
-        this.secondCategoryId = secondCategoryId;
-    }
-
-    public String getSecondCategory() {
-        return secondCategory;
-    }
-
-    public void setSecondCategory(String secondCategory) {
-        this.secondCategory = secondCategory;
-    }
-
-    public String[] getThirdCategoryId() {
-        return thirdCategoryId;
-    }
-
-    public void setThirdCategoryId(String[] thirdCategoryId) {
-        this.thirdCategoryId = thirdCategoryId;
-    }
-
-    public String getThirdCategory() {
-        return thirdCategory;
-    }
-
-    public void setThirdCategory(String thirdCategory) {
-        this.thirdCategory = thirdCategory;
-    }
-
-    public String getSkus() {
-        return skus;
-    }
-
-    public void setSkus(String skus) {
-        this.skus = skus;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getTagType() {
-        return tagType;
-    }
-
-    public void setTagType(String tagType) {
-        this.tagType = tagType;
-    }
-}

fuint-application/src/main/java/com/fuint/common/dto/ExpressDto.java

@@ -1,37 +1,26 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * 订单物流信息dto
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ExpressDto {
-    private String expressCompany;
-    private String expressNo;
-    private String expressTime;
-
-    public String getExpressCompany(){
-        return expressCompany;
-    }
 
-    public void setExpressCompany(String expressCompany){
-        this.expressCompany = expressCompany;
-    }
-
-    public String getExpressNo(){
-        return expressNo;
-    }
+    @ApiModelProperty("物流公司")
+    private String expressCompany;
 
-    public void setExpressNo(String expressNo){
-        this.expressNo = expressNo;
-    }
+    @ApiModelProperty("物流单号")
+    private String expressNo;
 
-    public String getExpressTime(){
-        return expressTime;
-    }
+    @ApiModelProperty("发货时间")
+    private String expressTime;
 
-    public void setExpressTime(String expressTime){
-        this.expressTime = expressTime;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/GiveDto.java

@@ -1,212 +1,78 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * mt_give 实体类
+ * 卡券转赠实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class GiveDto implements Serializable{
-   /**
-    * 自增 
-    */
+@Getter
+@Setter
+public class GiveDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-   /**
-    * 获赠者会员ID
-    */
+    @ApiModelProperty("获赠者会员ID")
     private Integer userId;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-   /**
-    * 赠送者会员ID
-    */
+    @ApiModelProperty("赠送者会员ID")
     private Integer giveUserId;
 
-   /**
-    * 赠予对象手机号 
-    */
+    @ApiModelProperty("获赠者手机号")
     private String mobile;
 
-   /**
-    * 用户手机 
-    */
+    @ApiModelProperty("转赠者手机号")
     private String userMobile;
 
-   /**
-    * 分组ID，逗号隔开
-    */
+    @ApiModelProperty("分组ID，逗号隔开")
     private String groupIds;
 
-   /**
-    * 分组名称，逗号隔开
-    */
+    @ApiModelProperty("分组名称，逗号隔开")
     private String groupNames;
 
-    /**
-     * 图片
-     */
+    @ApiModelProperty("图片")
     private String image;
 
-   /**
-    * 券ID，逗号隔开 
-    */
+    @ApiModelProperty("券ID，逗号隔开")
     private String couponIds;
 
-   /**
-    * 券名称，逗号隔开 
-    */
+    @ApiModelProperty("券名称，逗号隔开")
     private String couponNames;
 
-   /**
-    * 数量 
-    */
+    @ApiModelProperty("数量")
     private Integer num;
 
-   /**
-    * 总金额 
-    */
+    @ApiModelProperty("总金额")
     private BigDecimal money;
 
-   /**
-    * 备注 
-    */
+    @ApiModelProperty("备注")
     private String note;
 
-   /**
-    * 留言
-    */
-   private String message;
+    @ApiModelProperty("留言")
+    private String message;
 
-   /**
-    * 赠送时间 
-    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("赠送时间")
     private String createTime;
 
-   /**
-    * 更新时间 
-    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private String updateTime;
 
-   /**
-    * 状态，A正常；C取消 
-    */
+    @ApiModelProperty("状态，A正常；C取消 ")
     private String status;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-    this.id=id;
-    }
-    public Integer getUserId(){
-        return userId;
-    }
-    public void setUserId(Integer userId){
-    this.userId=userId;
-    }
-    public Integer getStoreId(){
-        return storeId;
-    }
-    public void setStoreId(Integer storeId){
-        this.storeId=storeId;
-    }
-    public Integer getGiveUserId(){
-        return giveUserId;
-    }
-    public void setGiveUserId(Integer giveUserId){
-    this.giveUserId=giveUserId;
-    }
-    public String getMobile(){
-        return mobile;
-    }
-    public void setMobile(String mobile){
-    this.mobile=mobile;
-    }
-    public String getUserMobile(){
-        return userMobile;
-    }
-    public void setUserMobile(String userMobile){
-    this.userMobile=userMobile;
-    }
-    public String getGroupIds(){
-        return groupIds;
-    }
-    public void setGroupIds(String groupIds){
-    this.groupIds=groupIds;
-    }
-    public String getGroupNames(){
-        return groupNames;
-    }
-    public void setGroupNames(String groupNames){
-    this.groupNames=groupNames;
-    }
-    public String getImage(){
-        return image;
-    }
-    public void setImage(String image){
-        this.image=image;
-    }
-    public String getCouponIds(){
-        return couponIds;
-    }
-    public void setCouponIds(String couponIds){
-    this.couponIds=couponIds;
-    }
-    public String getCouponNames(){
-        return couponNames;
-    }
-    public void setCouponNames(String couponNames){
-    this.couponNames=couponNames;
-    }
-    public Integer getNum(){
-        return num;
-    }
-    public void setNum(Integer num){
-    this.num=num;
-    }
-    public BigDecimal getMoney(){
-        return money;
-    }
-    public void setMoney(BigDecimal money){
-    this.money=money;
-    }
-    public String getNote(){
-        return note;
-    }
-    public void setNote(String note){
-    this.note=note;
-    }
-    public String getMessage(){
-       return message;
-   }
-    public void setMessage(String message){
-           this.message=message;
-       }
-    public String getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(String createTime){
-    this.createTime=createTime;
-    }
-    public String getUpdateTime(){
-        return updateTime;
-    }
-    public void setUpdateTime(String updateTime){
-    this.updateTime=updateTime;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-    this.status=status;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GiveItemDto.java

@@ -1,113 +1,50 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * mt_give_item 实体类
+ * 转赠明细实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class GiveItemDto implements Serializable{
-   /**
-    * 自增 
-    */
+@Getter
+@Setter
+public class GiveItemDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-   /**
-    * 赠予对象手机号 
-    */
+    @ApiModelProperty("赠予对象手机号")
     private String mobile;
 
-   /**
-    * 用户手机 
-    */
+    @ApiModelProperty("用户手机")
     private String userMobile;
 
-   /**
-    * 分组ID
-    */
+    @ApiModelProperty("分组ID")
     private Integer groupId;
 
-   /**
-    * 分组名称
-    */
+    @ApiModelProperty("分组名称")
     private String groupName;
 
-   /**
-    * 券ID
-    */
+    @ApiModelProperty("卡券ID")
     private Integer couponId;
 
-   /**
-    * 券名称
-    */
+    @ApiModelProperty("卡券名称")
     private String couponName;
 
-   /**
-    * 总金额 
-    */
+    @ApiModelProperty("总金额")
     private BigDecimal money;
 
-   /**
-    * 赠送时间 
-    */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("赠送时间")
     private Date createTime;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-    this.id=id;
-    }
-    public String getMobile(){
-        return mobile;
-    }
-    public void setMobile(String mobile){
-    this.mobile=mobile;
-    }
-    public String getUserMobile(){
-        return userMobile;
-    }
-    public void setUserMobile(String userMobile){
-    this.userMobile=userMobile;
-    }
-    public Integer getGroupId(){
-        return groupId;
-    }
-    public void setGroupId(Integer groupId){
-    this.groupId=groupId;
-    }
-    public String getGroupName(){
-        return groupName;
-    }
-    public void setGroupName(String groupName){
-    this.groupName=groupName;
-    }
-    public Integer getCouponId(){
-        return couponId;
-    }
-    public void setCouponId(Integer couponId){
-    this.couponId=couponId;
-    }
-    public String getCouponName(){
-        return couponName;
-    }
-    public void setCouponName(String couponName){
-    this.couponName=couponName;
-    }
-    public BigDecimal getMoney(){
-        return money;
-    }
-    public void setMoney(BigDecimal money){
-    this.money=money;
-    }
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-    this.createTime=createTime;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/GoodsCateDto.java

@@ -2,12 +2,15 @@ package com.fuint.common.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * 商品分类DTO
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
@@ -15,8 +18,6 @@ import lombok.Setter;
 @Setter
 public class GoodsCateDto implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("自增ID")
     private Integer id;
 
@@ -41,9 +42,11 @@ public class GoodsCateDto implements Serializable {
     @ApiModelProperty("分类描述")
     private String description;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("更新时间")
     private Date updateTime;
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsDetailDto.java

@@ -1,314 +1,95 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 /**
- * 商品详情DTO
+ * 商品详情实体
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class GoodsDetailDto implements Serializable {
-    /**
-     * 自增ID
-     */
+
+    @ApiModelProperty("自增ID")
     private Integer goodsId;
 
-    /**
-     * 商品名称
-     */
+    @ApiModelProperty("商品名称")
     private String name;
 
-    /**
-     * 分类ID
-     */
+    @ApiModelProperty("分类ID")
     private Integer cateId;
 
-    /**
-     * 商品条码
-     */
+    @ApiModelProperty("商品条码")
     private String goodsNo;
 
-    /**
-     * 可否单规格
-     */
+    @ApiModelProperty("可否单规格")
     private String isSingleSpec;
 
-    /**
-     * 主图地址
-     */
+    @ApiModelProperty("主图地址")
     private String logo;
 
-    /**
-     * 图片地址
-     */
+    @ApiModelProperty("图片地址")
     private List<String> images;
 
-    /**
-     * 价格
-     */
+    @ApiModelProperty("商品价格")
     private BigDecimal price;
 
-    /**
-     * 划线价格
-     */
+    @ApiModelProperty("划线价格")
     private BigDecimal linePrice;
 
-    /**
-     * 库存
-     */
+    @ApiModelProperty("库存")
     private Integer stock;
 
-    /**
-     * 重量
-     */
+    @ApiModelProperty("商品重量")
     private BigDecimal weight;
 
-    /**
-     * 初始销量
-     */
+    @ApiModelProperty("初始销量")
     private Integer initSale;
 
-    /**
-     * 商品卖点
-     */
+    @ApiModelProperty("商品卖点")
     private String salePoint;
 
-    /**
-     * 可否使用积分抵扣
-     */
+    @ApiModelProperty("可否使用积分抵扣")
     private String canUsePoint;
 
-    /**
-     * 会员是否有折扣
-     */
+    @ApiModelProperty("会员是否有折扣")
     private String isMemberDiscount;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty("排序")
     private Integer sort;
 
-    /**
-     * 商品描述
-     */
+    @ApiModelProperty("商品描述")
     private String description;
 
-    /**
-     * 创建时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    /**
-     * A：正常；D：删除
-     */
+    @ApiModelProperty("状态，A：正常；D：删除")
     private String status;
 
-    /**
-     * sku列表
-     */
+    @ApiModelProperty("sku列表")
     private List<GoodsSkuDto> skuList;
 
-    /**
-     * 规格列表
-     */
+    @ApiModelProperty("规格列表")
     private List<GoodsSpecDto> specList;
 
-    public Integer getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Integer goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getCateId() {
-        return cateId;
-    }
-
-    public void setCateId(Integer cateId) {
-        this.cateId = cateId;
-    }
-
-    public String getGoodsNo() {
-        return goodsNo;
-    }
-
-    public void setGoodsNo(String goodsNo) {
-        this.goodsNo = goodsNo;
-    }
-
-    public String getIsSingleSpec() {
-        return isSingleSpec;
-    }
-
-    public void setIsSingleSpec(String isSingleSpec) {
-        this.isSingleSpec = isSingleSpec;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public List<String> getImages() {
-        return images;
-    }
-
-    public void setImages(List<String> images) {
-        this.images = images;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public BigDecimal getLinePrice() {
-        return linePrice;
-    }
-
-    public void setLinePrice(BigDecimal linePrice) {
-        this.linePrice = linePrice;
-    }
-
-    public Integer getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public BigDecimal getWeight() {
-        return weight;
-    }
-
-    public void setWeight(BigDecimal weight) {
-        this.weight = weight;
-    }
-
-    public Integer getInitSale() {
-        return initSale;
-    }
-
-    public void setInitSale(Integer initSale) {
-        this.initSale = initSale;
-    }
-
-    public String getSalePoint() {
-        return salePoint;
-    }
-
-    public void setSalePoint(String salePoint) {
-        this.salePoint = salePoint;
-    }
-
-    public String getCanUsePoint() {
-        return canUsePoint;
-    }
-
-    public void setCanUsePoint(String canUsePoint) {
-        this.canUsePoint = canUsePoint;
-    }
-
-    public String getIsMemberDiscount() {
-        return isMemberDiscount;
-    }
-
-    public void setIsMemberDiscount(String isMemberDiscount) {
-        this.isMemberDiscount = isMemberDiscount;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public List<GoodsSkuDto> getSkuList() {
-        return skuList;
-    }
-
-    public void setSkuList(List<GoodsSkuDto> skuList) {
-        this.skuList = skuList;
-    }
-
-    public List<GoodsSpecDto> getSpecList() {
-        return specList;
-    }
-
-    public void setSpecList(List<GoodsSpecDto> specList) {
-        this.specList = specList;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsDto.java

@@ -1,9 +1,14 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.repository.model.MtGoodsCate;
 import com.fuint.repository.model.MtGoodsSku;
 import com.fuint.repository.model.MtGoodsSpec;
 import com.fuint.repository.model.MtStore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,354 +16,108 @@ import java.util.List;
 
 /**
  * 商品DTO
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class GoodsDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 所属店铺ID
-     * */
+    @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 
-    /**
-     * 所属店铺信息
-     * */
+    @ApiModelProperty("所属店铺信息")
     private MtStore storeInfo;
 
-    /**
-     * 商品名称
-     */
+    @ApiModelProperty("商品名称")
     private String name;
 
-    /**
-     * 商品类型
-     */
+    @ApiModelProperty("商品类型")
     private String type;
 
-    /**
-     * 分类ID
-     */
+    @ApiModelProperty("分类ID")
     private Integer cateId;
 
-    /**
-     * 分类信息
-     * */
+    @ApiModelProperty("分类信息")
     private MtGoodsCate cateInfo;
 
-    /**
-     * 商品条码
-     */
+    @ApiModelProperty("商品条码")
     private String goodsNo;
 
-    /**
-     * 可否单规格
-     */
+    @ApiModelProperty("可否单规格")
     private String isSingleSpec;
 
-    /**
-     * 主图地址
-     */
+    @ApiModelProperty("主图地址")
     private String logo;
 
-    /**
-     * 图片地址
-     */
+    @ApiModelProperty("图片地址")
     private String images;
 
-    /**
-     * 价格
-     */
+    @ApiModelProperty("价格")
     private BigDecimal price;
 
-    /**
-     * 划线价格
-     */
+    @ApiModelProperty("划线价格")
     private BigDecimal linePrice;
 
-    /**
-     * 库存
-     */
+    @ApiModelProperty("库存")
     private Integer stock;
 
-    /**
-     * 数量
-     */
+    @ApiModelProperty("数量")
     private Integer num;
 
-    /**
-     * 服务时长
-     */
+    @ApiModelProperty("服务时长")
     private Integer serviceTime;
 
-    /**
-     * 服务时长
-     */
+    @ApiModelProperty("卡券ID")
     private String couponIds;
 
-    /**
-     * 重量
-     */
+    @ApiModelProperty("重量")
     private BigDecimal weight;
 
-    /**
-     * 初始销量
-     */
+    @ApiModelProperty("初始销量")
     private Integer initSale;
 
-    /**
-     * 商品卖点
-     */
+    @ApiModelProperty("商品卖点")
     private String salePoint;
 
-    /**
-     * 可否使用积分抵扣
-     */
+    @ApiModelProperty("可否使用积分抵扣")
     private String canUsePoint;
 
-    /**
-     * 会员是否有折扣
-     */
+    @ApiModelProperty("会员是否有折扣")
     private String isMemberDiscount;
 
-    /**
-     * 排序
-     */
+    @ApiModelProperty("排序")
     private Integer sort;
 
-    /**
-     * 商品描述
-     */
+    @ApiModelProperty("商品描述")
     private String description;
 
-    /**
-     * 创建时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    /**
-     * A：正常；D：删除
-     */
+    @ApiModelProperty("状态，A：正常；D：删除")
     private String status;
 
-    /**
-     * sku
-     */
+    @ApiModelProperty("skuId")
     private Integer skuId;
 
-    /**
-     * sku列表
-     * */
+    @ApiModelProperty("sku列表")
     private List<MtGoodsSku> skuList;
 
-    /**
-     * 规格列表
-     * */
+    @ApiModelProperty("规格列表")
     private List<MtGoodsSpec> specList;
 
-
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public Integer getStoreId(){
-        return storeId;
-    }
-    public void setStoreId(Integer storeId){
-        this.storeId=storeId;
-    }
-    public MtStore getStoreInfo(){
-        return storeInfo;
-    }
-    public void setStoreInfo(MtStore storeInfo){
-        this.storeInfo=storeInfo;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getType(){
-        return type;
-    }
-    public void setType(String type){
-        this.type=type;
-    }
-    public Integer getCateId(){
-        return cateId;
-    }
-    public void setCateId(Integer cateId){
-        this.cateId=cateId;
-    }
-    public MtGoodsCate getCateInfo(){
-        return cateInfo;
-    }
-    public void setCateInfo(MtGoodsCate cateInfo){
-        this.cateInfo=cateInfo;
-    }
-    public String getGoodsNo(){
-        return goodsNo;
-    }
-    public void setGoodsNo(String goodsNo){
-        this.goodsNo=goodsNo;
-    }
-    public String getIsSingleSpec(){
-        return isSingleSpec;
-    }
-    public void setIsSingleSpec(String isSingleSpec){
-        this.isSingleSpec=isSingleSpec;
-    }
-    public String getLogo(){
-        return logo;
-    }
-    public void setLogo(String logo){
-        this.logo=logo;
-    }
-    public String getImages(){
-        return images;
-    }
-    public void setImages(String images){
-        this.images=images;
-    }
-    public BigDecimal getPrice(){
-        return price;
-    }
-    public void setPrice(BigDecimal price){
-        this.price=price;
-    }
-    public BigDecimal getLinePrice(){
-        return linePrice;
-    }
-    public void setLinePrice(BigDecimal linePrice){
-        this.linePrice=linePrice;
-    }
-    public Integer getServiceTime(){
-        return serviceTime;
-    }
-    public void setServiceTime(Integer serviceTime){
-        this.serviceTime=serviceTime;
-    }
-    public String getCouponIds(){
-        return couponIds;
-    }
-    public void setCouponIds(String couponIds){
-        this.couponIds=couponIds;
-    }
-    public Integer getStock(){
-        return stock;
-    }
-    public void setStock(Integer stock){
-        this.stock=stock;
-    }
-    public Integer getNum(){
-        return num;
-    }
-    public void setNum(Integer num){
-        this.num=num;
-    }
-    public BigDecimal getWeight(){
-        return weight;
-    }
-    public void setWeight(BigDecimal weight){
-        this.weight=weight;
-    }
-    public Integer getInitSale(){
-        return initSale;
-    }
-    public void setInitSale(Integer initSale){
-        this.initSale=initSale;
-    }
-    public String getSalePoint(){
-        return salePoint;
-    }
-    public void setSalePoint(String salePoint){
-        this.salePoint=salePoint;
-    }
-    public String getCanUsePoint(){
-        return canUsePoint;
-    }
-    public void setCanUsePoint(String canUsePoint){
-        this.canUsePoint=canUsePoint;
-    }
-    public String getIsMemberDiscount(){
-        return isMemberDiscount;
-    }
-    public void setIsMemberDiscount(String isMemberDiscount){
-        this.isMemberDiscount=isMemberDiscount;
-    }
-    public Integer getSort(){
-        return sort;
-    }
-    public void setSort(Integer sort){
-        this.sort=sort;
-    }
-    public String getDescription(){
-        return description;
-    }
-    public void setDescription(String description){
-        this.description=description;
-    }
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-        this.createTime=createTime;
-    }
-    public Date getUpdateTime(){
-        return updateTime;
-    }
-    public void setUpdateTime(Date updateTime){
-        this.updateTime=updateTime;
-    }
-    public String getOperator(){
-        return operator;
-    }
-    public void setOperator(String operator){
-        this.operator=operator;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status=status;
-    }
-
-    public Integer getSkuId(){
-        return skuId;
-    }
-    public void setSkuId(Integer skuId){
-        this.skuId=skuId;
-    }
-
-    public List<MtGoodsSku> getSkuList(){
-        return skuList;
-    }
-    public void setSkuList(List<MtGoodsSku> skuList){
-        this.skuList=skuList;
-    }
-    public List<MtGoodsSpec> getSpecList(){
-        return specList;
-    }
-    public void setSpecList(List<MtGoodsSpec> specList){
-        this.specList=specList;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsSkuDto.java

@@ -1,120 +1,52 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtGoodsSpec;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.util.List;
 import java.math.BigDecimal;
 
-public class GoodsSkuDto {
-
-    /**
-     * 自增ID
-     */
+/**
+ * 商品sku实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+public class GoodsSkuDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * sku编码
-     */
+    @ApiModelProperty("sku编码")
     private String skuNo;
 
-    /**
-     * 图片
-     */
+    @ApiModelProperty("图片")
     private String logo;
-    
-    
-    /**
-     * 商品ID
-     */
+
+    @ApiModelProperty("商品ID")
     private Integer goodsId;
 
-    /**
-     * 规格ID
-     */
+    @ApiModelProperty("规格ID")
     private String specIds;
 
-    /**
-     * 规格列表
-     */
+    @ApiModelProperty("规格列表")
     private List<MtGoodsSpec> specList;
 
-    /**
-     * 库存
-     */
+    @ApiModelProperty("库存")
     private Integer stock;
 
-    /**
-     * 价格
-     */
+    @ApiModelProperty("价格")
     private BigDecimal price;
 
-    /**
-     * 划线价格
-     */
+    @ApiModelProperty("划线价格")
     private BigDecimal linePrice;
 
-    /**
-     * 重量
-     */
+    @ApiModelProperty("重量")
     private BigDecimal weight;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public String getSkuNo(){
-        return skuNo;
-    }
-    public void setSkuNo(String skuNo){
-        this.skuNo=skuNo;
-    }
-    public String getLogo(){
-        return logo;
-    }
-    public void setLogo(String logo){
-        this.logo=logo;
-    }
-    public Integer getGoodsId(){
-        return goodsId;
-    }
-    public void setGoodsId(Integer goodsId){
-        this.goodsId=goodsId;
-    }
-    public String getSpecIds(){
-        return specIds;
-    }
-    public void setSpecIds(String specIds){
-        this.specIds=specIds;
-    }
-    public List<MtGoodsSpec> getSpecList(){
-        return specList;
-    }
-    public void setSpecList(List<MtGoodsSpec> specList){
-        this.specList=specList;
-    }
-    public Integer getStock(){
-        return stock;
-    }
-    public void setStock(Integer stock){
-        this.stock=stock;
-    }
-    public BigDecimal getPrice(){
-        return price;
-    }
-    public void setPrice(BigDecimal price){
-        this.price=price;
-    }
-    public BigDecimal getLinePrice(){
-        return linePrice;
-    }
-    public void setLinePrice(BigDecimal linePrice){
-        this.linePrice=linePrice;
-    }
-    public BigDecimal getWeight(){
-        return weight;
-    }
-    public void setWeight(BigDecimal weight){
-        this.weight=weight;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecChildDto.java

@@ -1,41 +1,29 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 
+/**
+ * 商品规格子类实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class GoodsSpecChildDto implements Serializable {
 
-   /**
-    * 自增ID
-    * */
+   @ApiModelProperty("自增ID")
    private Integer id;
 
-   /**
-    * 规格名称 
-    */
+   @ApiModelProperty("规格名称")
    private String name;
 
-   /**
-    * 是否选择
-    */
-    private boolean checked;
-
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-    this.id=id;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-    this.name=name;
-    }
-    public boolean getChecked(){
-        return checked;
-    }
-    public void setChecked(boolean checked){
-    this.checked=checked;
-    }
+   @ApiModelProperty("是否选择")
+   private boolean checked;
+
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecDto.java

@@ -1,47 +1,30 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * 商品规格实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class GoodsSpecDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer specId;
 
-    /**
-     * 规格名称
-     */
+    @ApiModelProperty("规格名称")
     private String name;
 
-    /**
-     * 规格值
-     */
+    @ApiModelProperty("规格值列表")
     private List<GoodsSpecValueDto> valueList;
 
-    public Integer getSpecId() {
-        return specId;
-    }
-
-    public void setSpecId(Integer specId) {
-        this.specId = specId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<GoodsSpecValueDto> getValueList() {
-        return valueList;
-    }
-
-    public void setValueList(List<GoodsSpecValueDto> valueList) {
-        this.valueList = valueList;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecItemDto.java

@@ -1,47 +1,30 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * 商品规格项实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class GoodsSpecItemDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 规格名称
-     */
+    @ApiModelProperty("规格名称")
     private String name;
 
-    /**
-     * 规格值
-     */
+    @ApiModelProperty("规格子类")
     private List<GoodsSpecChildDto> child;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<GoodsSpecChildDto> getChild() {
-        return child;
-    }
-
-    public void setChild(List<GoodsSpecChildDto> child) {
-        this.child = child;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecValueDto.java

@@ -1,49 +1,29 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 
 /**
- * 商品规格值
- * */
+ * 商品规格值实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class GoodsSpecValueDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("值ID")
     private Integer specValueId;
 
-    /**
-     * 规格名
-     */
+    @ApiModelProperty("规格名")
     private String specName;
 
-    /**
-     * 规格值
-     */
+    @ApiModelProperty("规格值")
     private String specValue;
 
-    public Integer getSpecValueId() {
-        return specValueId;
-    }
-
-    public void setSpecValueId(Integer specValueId) {
-        this.specValueId = specValueId;
-    }
-
-    public String getSpecValue() {
-        return specValue;
-    }
-
-    public void setSpecValue(String specValue) {
-        this.specValue = specValue;
-    }
-
-    public String getSpecName() {
-        return specName;
-    }
-
-    public void setSpecName(String specName) {
-        this.specName = specName;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GoodsTopDto.java

@@ -1,69 +1,36 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
  * 商品排行DTO
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class GoodsTopDto implements Serializable {
 
-    /**
-     * 商品ID
-     */
+    @ApiModelProperty("商品ID")
     private Integer id;
 
-    /**
-     * 商品名称
-     */
+    @ApiModelProperty("商品名称")
     private String name;
 
-    /**
-     * 商品条码
-     */
+    @ApiModelProperty("商品条码")
     private String goodsNo;
 
-    /**
-     * 销售金额
-     */
+    @ApiModelProperty("销售金额")
     private BigDecimal amount;
 
-    /**
-     * 销售数量
-     */
+    @ApiModelProperty("销售数量")
     private Integer num;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getGoodsNo(){
-        return goodsNo;
-    }
-    public void setGoodsNo(String goodsNo){
-        this.goodsNo=goodsNo;
-    }
-    public Integer getNum(){
-        return num;
-    }
-    public void setNum(Integer num){
-        this.num=num;
-    }
-    public BigDecimal getAmount(){
-        return amount;
-    }
-    public void setAmount(BigDecimal amount){
-        this.amount=amount;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/GroupDataDto.java

@@ -1,47 +1,33 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
 /**
- * 卡券分组数据
- * */
-public class GroupDataDto {
+ * 卡券分组数据DTO
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+public class GroupDataDto implements Serializable {
+
+    @ApiModelProperty("发放数量")
     private Integer sendNum;
 
+    @ApiModelProperty("未发放数量")
     private Integer unSendNum;
 
+    @ApiModelProperty("使用数量")
     private Integer useNum;
 
+    @ApiModelProperty("过期数量")
     private Integer expireNum;
 
+    @ApiModelProperty("取消数量")
     private Integer cancelNum;
-
-    public Integer getSendNum() { return sendNum; }
-    public void setSendNum(Integer sendNum) { this.sendNum = sendNum; }
-
-    public Integer getUnSendNum() {
-        return unSendNum;
-    }
-    public void setUnSendNum(Integer unSendNum) {
-        this.unSendNum = unSendNum;
-    }
-
-    public Integer getUseNum() {
-        return useNum;
-    }
-    public void setUseNum(Integer useNum) {
-        this.useNum = useNum;
-    }
-
-    public Integer getExpireNum() {
-        return expireNum;
-    }
-    public void setExpireNum(Integer expireNum) {
-        this.expireNum = expireNum;
-    }
-
-    public Integer getCancelNum() {
-        return cancelNum;
-    }
-    public void setCancelNum(Integer cancelNum) {
-        this.cancelNum = cancelNum;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/GroupDataListDto.java

@@ -1,24 +1,23 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 卡券分组数据DTO
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class GroupDataListDto {
 
+    @ApiModelProperty("键值")
     private String key;
 
+    @ApiModelProperty("数据")
     private GroupDataDto data;
 
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public GroupDataDto getData() {
-        return data;
-    }
-
-    public void setData(GroupDataDto data) {
-        this.data = data;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/GroupMemberDto.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 /**
  * 分组会员DTO
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */

fuint-application/src/main/java/com/fuint/common/dto/HangUpDto.java

@@ -1,82 +1,38 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.math.BigDecimal;
 
 /**
  * 收银挂单实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class HangUpDto {
 
-    /**
-     * 挂单号
-     */
+    @ApiModelProperty("挂单号")
     private String hangNo;
 
-    /**
-     * 是否空白
-     * */
-    private boolean isEmpty;
+    @ApiModelProperty("是否空白")
+    private Boolean isEmpty;
 
-    /**
-     * 会员信息
-     */
+    @ApiModelProperty("会员信息")
     private MtUser memberInfo;
 
-    /**
-     * 件数
-     */
+    @ApiModelProperty("件数")
     private Integer num;
 
-    /**
-     * 金额
-     */
+    @ApiModelProperty("金额")
     private BigDecimal amount;
 
-    /**
-     * 时间
-     */
+    @ApiModelProperty("时间")
     private String dateTime;
 
-    public String getHangNo() {
-        return hangNo;
-    }
-    public void setHangNo(String hangNo) {
-        this.hangNo = hangNo;
-    }
-
-    public boolean getIsEmpty() {
-        return isEmpty;
-    }
-    public void setIsEmpty(boolean isEmpty) {
-        this.isEmpty = isEmpty;
-    }
-
-    public MtUser getMemberInfo() {
-        return memberInfo;
-    }
-    public void setMemberInfo(MtUser memberInfo) {
-        this.memberInfo = memberInfo;
-    }
-
-    public BigDecimal getAmount(){
-        return amount;
-    }
-    public void setAmount(BigDecimal amount){
-        this.amount=amount;
-    }
-
-    public Integer getNum(){
-        return num;
-    }
-    public void setNum(Integer num){
-        this.num=num;
-    }
-
-    public String getDateTime() {
-        return dateTime;
-    }
-    public void setDateTime(String dateTime) {
-        this.dateTime = dateTime;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/Head.java

@@ -1,5 +1,8 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 
 /**
@@ -8,49 +11,21 @@ import java.io.Serializable;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class Head implements Serializable {
 
-    private static final long serialVersionUID = -4183589142746100110L;
-    //服务编号，用于确定唯一的服务
+    @ApiModelProperty("服务编号，用于确定唯一的服务")
     private String serviceId;
-    //授权Token信息
-    private String token;
-    //服务执行返回码(000000:正常)
-    private String returnCode;
-    //服务执行返回信息
-    private String returnDesc;
-
-    public String getServiceId() {
-        return serviceId;
-    }
 
-    public void setServiceId(String serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getReturnCode() {
-        return returnCode;
-    }
-
-    public void setReturnCode(String returnCode) {
-        this.returnCode = returnCode;
-    }
+    @ApiModelProperty("授权Token信息")
+    private String token;
 
-    public String getReturnDesc() {
-        return returnDesc;
-    }
+    @ApiModelProperty("服务执行返回码(000000:正常)")
+    private String returnCode;
 
-    public void setReturnDesc(String returnDesc) {
-        this.returnDesc = returnDesc;
-    }
+    @ApiModelProperty("服务执行返回信息")
+    private String returnDesc;
 
     @Override
     public String toString() {

fuint-application/src/main/java/com/fuint/common/dto/MemberGroupDto.java

@@ -7,7 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 会员分组
+ * 会员分组实体
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn

fuint-application/src/main/java/com/fuint/common/dto/MemberTopDto.java

@@ -1,69 +1,36 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
  * 会员排行DTO
+ *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class MemberTopDto implements Serializable {
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer id;
 
-    /**
-     * 会员名称
-     */
+    @ApiModelProperty("会员名称")
     private String name;
 
-    /**
-     * 会员号
-     */
+    @ApiModelProperty("会员号")
     private String userNo;
 
-    /**
-     * 消费金额
-     */
+    @ApiModelProperty("消费金额")
     private BigDecimal amount;
 
-    /**
-     * 购买数量
-     */
+    @ApiModelProperty("购买数量")
     private Integer num;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getUserNo(){
-        return userNo;
-    }
-    public void setUserNo(String userNo){
-        this.userNo=userNo;
-    }
-    public Integer getNum(){
-        return num;
-    }
-    public void setNum(Integer num){
-        this.num=num;
-    }
-    public BigDecimal getAmount(){
-        return amount;
-    }
-    public void setAmount(BigDecimal amount){
-        this.amount=amount;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/Message.java

@@ -1,51 +0,0 @@
-package com.fuint.common.dto;
-
-import java.io.Serializable;
-
-/**
- * 消息结构定义
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class Message implements Serializable{
-    private static final long serialVersionUID = -7956811510222855939L;
-
-    private Head head;//消息头信息
-    private Page page;//消息分页信息
-    private Body body;//消息体信息
-
-    public Head getHead() {
-        return head;
-    }
-
-    public void setHead(Head head) {
-        this.head = head;
-    }
-
-    public Page getPage() {
-        return page;
-    }
-
-    public void setPage(Page page) {
-        this.page = page;
-    }
-
-    public Body getBody() {
-        return body;
-    }
-
-    public void setBody(Body body) {
-        this.body = body;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder("Message{");
-        sb.append("head=").append(head);
-        sb.append(", page=").append(page);
-        sb.append(", body=").append(body);
-        sb.append('}');
-        return sb.toString();
-    }
-}

fuint-application/src/main/java/com/fuint/common/dto/MessageResDto.java

@@ -1,38 +1,26 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 /**
- * 短信发送返回
+ * 短信发送返回实体
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class MessageResDto {
 
+    @ApiModelProperty("发送ID")
     private String[] sendIds;
-    private Boolean result;
-    private String[] smsId;
-
-    public Boolean getResult() {
-        return result;
-    }
 
-    public void setResult(Boolean result) {
-        this.result = result;
-    }
-
-    public String[] getSendIds() {
-        return sendIds;
-    }
-
-    public void setSendIds(String[] sendIds) {
-        this.sendIds = sendIds;
-    }
+    @ApiModelProperty("发送结果")
+    private Boolean result;
 
-    public String[] getSmsId() {
-        return smsId;
-    }
+    @ApiModelProperty("短信ID")
+    private String[] smsId;
 
-    public void setSmsId(String[] smsId) {
-        this.smsId = smsId;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/MessageStatusEnum.java

@@ -1,41 +0,0 @@
-package com.fuint.common.dto;
-
-/**
- * 消息状态枚举
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public enum MessageStatusEnum {
-    SUCCESS("000000","成功"),
-    FAILD("999999","服务执行异常"),
-    NO_AUTHORIZE("unauthorized","没有权限访问"),
-
-    IN_PARAMETER_NULL("1001","入参不可为空"),
-    IN_PARAMETER_NULL_OR_LESS("1002","入参不可为空或者缺少参数");
-
-
-    private MessageStatusEnum(String returnCode, String returnDesc){
-        this.returnCode = returnCode;
-        this.returnDesc = returnDesc;
-    }
-
-    private String returnCode;
-    private String returnDesc;
-
-    public String getReturnCode() {
-        return returnCode;
-    }
-
-    public void setReturnCode(String returnCode) {
-        this.returnCode = returnCode;
-    }
-
-    public String getReturnDesc() {
-        return returnDesc;
-    }
-
-    public void setReturnDesc(String returnDesc) {
-        this.returnDesc = returnDesc;
-    }
-}

fuint-application/src/main/java/com/fuint/common/dto/MyCouponDto.java

@@ -2,6 +2,10 @@ package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtStore;
 import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -12,209 +16,59 @@ import java.util.Date;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class MyCouponDto implements Serializable {
 
-    /**
-     * 自增ID
-     * */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 卡券名称
-     * */
+    @ApiModelProperty("卡券名称")
     private String name;
 
-    /**
-     * 核销编码
-     */
+    @ApiModelProperty("核销编码")
     private String code;
 
-    /**
-     * 卡券类型
-     * */
+    @ApiModelProperty("卡券类型")
     private String type;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    /**
-     * 券ID
-     * */
+    @ApiModelProperty("卡券ID")
     private Integer couponId;
 
-    /**
-     * 使用规则
-     * */
+    @ApiModelProperty("使用规则")
     private String useRule;
 
-    /**
-     * 图片
-     * */
+    @ApiModelProperty("图片")
     private String image;
 
-    /**
-     * 面额
-     * */
+    @ApiModelProperty("面额")
     private BigDecimal amount;
 
-    /**
-     * 余额
-     * */
+    @ApiModelProperty("余额")
     private BigDecimal balance;
 
-    /**
-     * 是否可以使用(过期、状态等)
-     * */
+    @ApiModelProperty("是否可用")
     private boolean canUse;
 
-    /**
-     * 有效期
-     * */
+    @ApiModelProperty("有效期")
     private String effectiveDate;
 
-    /**
-     * 小提示
-     * */
+    @ApiModelProperty("提示信息")
     private String tips;
 
-    /**
-     * 使用时间
-     * */
+    @ApiModelProperty("使用时间")
     private Date usedTime;
 
-    /**
-     * 领券时间
-     * */
+    @ApiModelProperty("领券时间")
     private Date createTime;
 
-    /**
-     * 会员信息
-     * */
+    @ApiModelProperty("会员信息")
     private MtUser userInfo;
 
-    /**
-     * 使用店铺
-     * */
+    @ApiModelProperty("使用店铺")
     private MtStore storeInfo;
 
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode(){
-        return code;
-    }
-    public void setCode(String code){
-        this.code=code;
-    }
-
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Integer getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(Integer couponId) {
-        this.couponId = couponId;
-    }
-
-    public String getUseRule() {
-        return useRule;
-    }
-    public void setUseRule(String useRule) {
-        this.useRule = useRule;
-    }
-
-    public String getImage() {
-        return image;
-    }
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public boolean getCanUse() {
-        return canUse;
-    }
-    public void setCanUse(boolean canUse) {
-        this.canUse = canUse;
-    }
-
-    public String getEffectiveDate() {
-        return effectiveDate;
-    }
-    public void setEffectiveDate(String effectiveDate) {
-        this.effectiveDate = effectiveDate;
-    }
-
-    public String getTips() {
-        return tips;
-    }
-    public void setTips(String tips) {
-        this.tips = tips;
-    }
-
-    public Date getUsedTime(){
-        return usedTime;
-    }
-    public void setUsedTime(Date usedTime){
-        this.usedTime=usedTime;
-    }
-
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-        this.createTime=createTime;
-    }
-
-    public MtUser getUserInfo() {
-        return userInfo;
-    }
-    public void setUserInfo(MtUser userInfo) {
-        this.userInfo = userInfo;
-    }
-
-    public MtStore getStoreInfo() {
-        return storeInfo;
-    }
-    public void setStoreInfo(MtStore storeInfo) {
-        this.storeInfo = storeInfo;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/OpenGiftDto.java

@@ -3,6 +3,10 @@ package com.fuint.common.dto;
 import com.fuint.repository.model.MtCoupon;
 import com.fuint.repository.model.MtStore;
 import com.fuint.repository.model.MtUserGrade;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 
 /**
@@ -11,136 +15,39 @@ import java.io.Serializable;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class OpenGiftDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 店铺信息
-     */
+    @ApiModelProperty("店铺信息")
     private MtStore storeInfo;
 
-    /**
-     * 会员等级信息
-     */
+    @ApiModelProperty("会员等级信息")
     private MtUserGrade gradeInfo;
 
-    /**
-     * 赠送积分
-     */
+    @ApiModelProperty("赠送积分")
     private Integer point;
 
-    /**
-     * 卡券信息
-     */
+    @ApiModelProperty("卡券信息")
     private MtCoupon couponInfo;
 
-    /**
-     * 卡券数量
-     */
+    @ApiModelProperty("卡券数量")
     private Integer couponNum;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private String createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty("更新时间")
     private String updateTime;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty("状态")
     private String status;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public MtStore getStoreInfo() {
-        return storeInfo;
-    }
-
-    public void setStoreInfo(MtStore storeInfo) {
-        this.storeInfo = storeInfo;
-    }
-
-    public MtUserGrade getGradeInfo() {
-        return gradeInfo;
-    }
-
-    public void setGradeInfo(MtUserGrade gradeInfo) {
-        this.gradeInfo = gradeInfo;
-    }
-
-    public Integer getPoint() {
-        return point;
-    }
-
-    public void setPoint(Integer point) {
-        this.point = point;
-    }
-
-    public MtCoupon getCouponInfo() {
-        return couponInfo;
-    }
-
-    public void setCouponInfo(MtCoupon couponInfo) {
-        this.couponInfo = couponInfo;
-    }
-
-    public Integer getCouponNum() {
-        return couponNum;
-    }
-
-    public void setCouponNum(Integer couponNum) {
-        this.couponNum = couponNum;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/dto/OrderDto.java

@@ -1,428 +1,118 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * 订单实体类
- * */
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class OrderDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 订单类型
-     */
+    @ApiModelProperty("订单类型")
     private String type;
 
-    /**
-     * 下单平台
-     */
+    @ApiModelProperty("下单平台")
     private String platform;
 
-    /**
-     * 支付类型
-     */
+    @ApiModelProperty("支付类型")
     private String payType;
 
-    /**
-     * 订单类型名称
-     */
+    @ApiModelProperty("订单类型名称")
     private String orderMode;
 
-    /**
-     * 核销码
-     */
+    @ApiModelProperty("核销码")
     private String verifyCode;
 
-    /**
-     * 订单号
-     */
+    @ApiModelProperty("订单号")
     private String orderSn;
 
-    /**
-     * 卡券ID
-     */
+    @ApiModelProperty("卡券ID")
     private Integer couponId;
 
-    /**
-     * 购物车ID
-     */
+    @ApiModelProperty("购物车ID")
     private String cartIds;
 
-    /**
-     * 商品ID
-     */
+    @ApiModelProperty("商品ID")
     private Integer goodsId;
 
-    /**
-     * skuID
-     */
+    @ApiModelProperty("skuID")
     private Integer skuId;
 
-    /**
-     * 购买数量
-     */
+    @ApiModelProperty("购买数量")
     private Integer buyNum;
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 是否游客
-     */
+    @ApiModelProperty("是否游客")
     private String isVisitor;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 员工ID
-     */
+    @ApiModelProperty("员工ID")
     private Integer staffId;
 
-    /**
-     * 订单金额
-     */
+    @ApiModelProperty("订单金额")
     private BigDecimal amount;
 
-    /**
-     * 支付金额
-     */
+    @ApiModelProperty("支付金额")
     private BigDecimal payAmount;
 
-    /**
-     * 使用积分数量
-     */
+    @ApiModelProperty("使用积分数量")
     private Integer usePoint;
 
-    /**
-     * 积分金额
-     */
+    @ApiModelProperty("积分金额")
     private BigDecimal pointAmount;
 
-    /**
-     * 折扣金额
-     */
+    @ApiModelProperty("折扣金额")
     private BigDecimal discount;
 
-    /**
-     * 配送费用
-     */
+    @ApiModelProperty("配送费用")
     private BigDecimal deliveryFee;
 
-    /**
-     * 物流信息
-     * */
+    @ApiModelProperty("物流信息")
     private ExpressDto expressInfo;
 
-    /**
-     * 订单参数
-     */
+    @ApiModelProperty("订单参数")
     private String param;
 
-    /**
-     * 用户备注
-     */
+    @ApiModelProperty("用户备注")
     private String remark;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 支付时间
-     */
+    @ApiModelProperty("支付时间")
     private Date payTime;
 
-    /**
-     * 订单状态
-     */
+    @ApiModelProperty("订单状态")
     private String status;
 
-    /**
-     * 支付状态
-     */
+    @ApiModelProperty("支付状态")
     private String payStatus;
-
-    /**
-     * 最后操作人
-     */
+    
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getPlatform() {
-        return platform;
-    }
-
-    public void setPlatform(String platform) {
-        this.platform = platform;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public String getOrderMode() {
-        return orderMode;
-    }
-
-    public void setOrderMode(String orderMode) {
-        this.orderMode = orderMode;
-    }
-
-    public String getVerifyCode() {
-        return verifyCode;
-    }
-
-    public void setVerifyCode(String verifyCode) {
-        this.verifyCode = verifyCode;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public Integer getCouponId() {
-        return couponId;
-    }
-
-    public void setCouponId(Integer couponId) {
-        this.couponId = couponId;
-    }
-
-    public String getCartIds() {
-        return cartIds;
-    }
-
-    public void setCartIds(String cartIds) {
-        this.cartIds = cartIds;
-    }
-
-    public Integer getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Integer goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public Integer getSkuId() {
-        return skuId;
-    }
-
-    public void setSkuId(Integer skuId) {
-        this.skuId = skuId;
-    }
-
-    public Integer getBuyNum() {
-        return buyNum;
-    }
-
-    public void setBuyNum(Integer buyNum) {
-        this.buyNum = buyNum;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public String getIsVisitor() {
-        return isVisitor;
-    }
-
-    public void setIsVisitor(String isVisitor) {
-        this.isVisitor = isVisitor;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public Integer getStaffId() {
-        return staffId;
-    }
-
-    public void setStaffId(Integer staffId) {
-        this.staffId = staffId;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public BigDecimal getPointAmount() {
-        return pointAmount;
-    }
-
-    public void setPointAmount(BigDecimal pointAmount) {
-        this.pointAmount = pointAmount;
-    }
-
-    public Integer getUsePoint() {
-        return usePoint;
-    }
-
-    public void setUsePoint(Integer usePoint) {
-        this.usePoint = usePoint;
-    }
-
-    public BigDecimal getDiscount() {
-        return discount;
-    }
-
-    public void setDiscount(BigDecimal discount) {
-        this.discount = discount;
-    }
-
-    public BigDecimal getDeliveryFee() {
-        return deliveryFee;
-    }
-
-    public void setDeliveryFee(BigDecimal deliveryFee) {
-        this.deliveryFee = deliveryFee;
-    }
-
-    public ExpressDto getExpressInfo() {
-        return expressInfo;
-    }
-
-    public void setExpressInfo(ExpressDto expressInfo) {
-        this.expressInfo = expressInfo;
-    }
-
-    public String getParam() {
-        return param;
-    }
-
-    public void setParam(String param) {
-        this.param = param;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(String payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java

@@ -108,6 +108,8 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
              if (mtStore != null) {
                  accountDto.setStoreName(mtStore.getName());
              }
+             accountDto.setSalt(null);
+             accountDto.setPassword(null);
              dataList.add(accountDto);
         }
 

fuint-application/src/main/java/com/fuint/common/service/impl/CouponServiceImpl.java

@@ -372,8 +372,8 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     /**
      * 删除卡券
      *
-     * @param id       券ID
-     * @param operator 操作人
+     * @param  id       券ID
+     * @param  operator 操作人
      * @throws BusinessCheckException
      */
     @Override
@@ -384,18 +384,12 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         if (null == couponInfo) {
             return;
         }
-
         couponInfo.setStatus(StatusEnum.DISABLE.getKey());
-
         // 修改时间
         couponInfo.setUpdateTime(new Date());
-
         // 操作人
         couponInfo.setOperator(operator);
-
         mtCouponMapper.updateById(couponInfo);
-
-        return;
     }
 
     /**
@@ -412,7 +406,6 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         Integer userId = couponListParam.getUserId() == null ? 0 : couponListParam.getUserId();
         Integer needPoint = couponListParam.getNeedPoint() == null ? 0 : couponListParam.getNeedPoint();
         String sendWay = couponListParam.getSendWay() == null ? "front" : couponListParam.getSendWay();
-        String sortType = couponListParam.getSortType() == null ? "createTime" : couponListParam.getSortType();
 
         Page<MtCoupon> pageHelper = PageHelper.startPage(pageNumber, pageSize);
         LambdaQueryWrapper<MtCoupon> lambdaQueryWrapper = Wrappers.lambdaQuery();

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -592,23 +592,23 @@ public class BackendGoodsController extends BaseController {
         List<MtGoodsSpec> dataList = mtGoodsSpecMapper.selectByMap(paramSearch);
 
         Integer targetId;
+        MtGoodsSpec mtGoodsSpec;
         if (dataList.size() < 1) {
-            MtGoodsSpec mtGoodsSpec = new MtGoodsSpec();
+            mtGoodsSpec = new MtGoodsSpec();
             mtGoodsSpec.setGoodsId(Integer.parseInt(goodsId));
             mtGoodsSpec.setName(name);
             mtGoodsSpec.setValue("");
             mtGoodsSpec.setStatus(StatusEnum.ENABLED.getKey());
             mtGoodsSpecMapper.insert(mtGoodsSpec);
-            targetId = mtGoodsSpec.getId();
         } else {
-            MtGoodsSpec mtGoodsSpec = dataList.get(0);
+            mtGoodsSpec = dataList.get(0);
             if (!mtGoodsSpec.getStatus().equals(StatusEnum.ENABLED.getKey())) {
                 mtGoodsSpec.setStatus(StatusEnum.ENABLED.getKey());
                 mtGoodsSpec.setValue("");
                 mtGoodsSpecMapper.updateById(mtGoodsSpec);
             }
-            targetId = mtGoodsSpec.getId();
         }
+        targetId = mtGoodsSpec.getId();
 
         Map<String, Object> outParams = new HashMap();
         outParams.put("id", targetId);