增加优惠券库存调整接口

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponInfoController.java

@@ -4,30 +4,32 @@ package com.yonge.cooleshow.admin.controller.coupon;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.admin.io.request.coupon.CouponInfoVO;
+import com.yonge.cooleshow.admin.io.request.coupon.CouponInventoryVO;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponInventoryQuery;
 import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponInventoryWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.EStatus;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
@@ -122,11 +124,9 @@ public class CouponInfoController extends BaseController {
     /**
      * 启用/停用 优惠券
      */
-    @GetMapping("/updateState")
+    @PostMapping("/updateState")
     @ApiOperation(value = "优惠券状态启/停用")
-    public HttpResponseResult<Boolean> updateCouponStateInfo(
-            @ApiParam(value = "优惠券ID", required = true) @RequestParam("couponId") Long couponId,
-            @ApiParam(value = "状态 0 停用 1 启用", required = true) @RequestParam("state") Integer state) {
+    public HttpResponseResult<Boolean> updateCouponStateInfo(@RequestBody CouponInfoVO.CouponInfo request) {
 
         // 获取当前登录用户信息
         SysUser user = sysUserFeignService.queryUserInfo();
@@ -134,10 +134,16 @@ public class CouponInfoController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
 
+        if (Objects.isNull(request)
+                || Objects.isNull(request.getId())
+                || EStatus.invalid(request.getStatus())) {
+            throw new BizException("无效请求参数");
+        }
+
         // 更新数据信息
         CouponInfoVO.CouponInfo info = CouponInfoVO.CouponInfo.builder()
-                .id(couponId)
-                .status(state)
+                .id(request.getId())
+                .status(request.getStatus())
                 .updatedBy(user.getId())
                 .updateTime(DateTime.now().getMillis())
                 .build();
@@ -145,8 +151,85 @@ public class CouponInfoController extends BaseController {
         CouponInfo couponInfo = couponInfoService.saveOrUpdateCouponInfo(JSON.parseObject(info.jsonString(), CouponInfo.class));
 
         // 校验状态更新结果
-        return status(couponInfo.getStatus().intValue() == state);
+        return status(couponInfo.getStatus().intValue() == request.getStatus());
+    }
+
+    /**
+     * 优惠券库存量信息
+     * @param request CouponInventoryVO.PageRequest
+     * @return HttpResponseResult<PageInfo<CouponInventoryVO.PageInfo>>
+     */
+    @PostMapping(value = "/inventory/page", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "查询库存量调整分页信息", notes = "传入CouponInventoryVO.PageRequest")
+    public HttpResponseResult<PageInfo<CouponInventoryVO.PageInfo>> queryCouponInventoryPageInfo(@RequestBody CouponInventoryVO.PageRequest request) {
+
+        // 校验请求参数
+        if (request.invalidRequestParam()) {
+            throw new BizException("无效的优惠券ID");
+        }
+
+        // 优惠券信息
+        IPage<CouponInventoryWrapper> wrapper = couponInfoService.queryCouponInventoryPageInfo(PageUtil.getPage(request),
+                CouponInventoryQuery.from(request.jsonString()));
+
+        // 数据转换
+        List<CouponInventoryVO.PageInfo> pageInfos = JSON.parseArray(JSON.toJSONString(wrapper.getRecords()),
+                CouponInventoryVO.PageInfo.class);
+
+        // 分页数据信息
+        return succeed(PageUtil.getPageInfo(wrapper, pageInfos));
+    }
+
+    /**
+     * 调整新优惠券库存量信息
+     * @param info CouponInfoVO.CouponInfo
+     * @return HttpResponseResult<CouponInfoVO.CouponInfo>
+     */
+    @PostMapping(value = "/inventory/update", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "优惠券库存量更新", notes = "CouponInventoryVO.InventoryInfo")
+    public HttpResponseResult<Boolean> saveOrUpdate(@Valid @RequestBody CouponInventoryVO.InventoryInfo info) {
+
+        // 获取当前登录用户信息
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (Objects.isNull(user) || Objects.isNull(user.getId())) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+
+        // 校验参数合法性
+        if (info.invalidRequestParam(user.getId())) {
+            throw new BizException("无效的请求参数");
+        }
+
+        // 新增或更新信息
+        int rows = couponInfoService.saveOrUpdateCouponInventoryInfo(JSON.parseObject(info.jsonString(),
+                CouponInventory.class));
+
+        return status(rows > 0);
     }
 
+    /**
+     * 库存调整用户信息
+     * @param request CouponInventoryVO.PageRequest
+     * @return HttpResponseResult<PageInfo<CouponInventoryVO.PageInfo>>
+     */
+    @PostMapping(value = "/inventory/user", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "查询库存调整用户信息分页", notes = "CouponInventoryVO.PageRequest")
+    public HttpResponseResult<PageInfo<CouponInventoryVO.PageUserInfo>> queryInventoryUserPageInfo(@RequestBody CouponInventoryVO.PageRequest request) {
+
+        // 校验请求参数
+        if (Objects.isNull(request) || Objects.isNull(request.getCouponId())) {
+            throw new BizException("无效的优惠券ID");
+        }
+
+        // 优惠券信息
+        IPage<CouponInventoryWrapper> wrapper = couponInfoService.queryCouponInventoryPageInfo(PageUtil.getPage(request),
+                CouponInventoryQuery.from(request.jsonString()).groupByUser(true));
 
+        // 数据转换
+        List<CouponInventoryVO.PageUserInfo> pageInfos = JSON.parseArray(JSON.toJSONString(wrapper.getRecords()),
+                CouponInventoryVO.PageUserInfo.class);
+
+        // 分页数据信息
+        return succeed(PageUtil.getPageInfo(wrapper, pageInfos));
+    }
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponValidTypeEnum;
 import com.yonge.cooleshow.common.enums.EStatus;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.QueryInfo;
@@ -34,7 +35,7 @@ public class CouponInfoVO {
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @ApiModel(value = "优惠券信息分页请求", description = "优惠券信息分页")
+    @ApiModel("优惠券信息分页请求信息")
     public static class PageRequest extends QueryInfo {
 
         @ApiModelProperty("优惠券名称")
@@ -68,7 +69,7 @@ public class CouponInfoVO {
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @ApiModel(value = "优惠券信息分页信息", description = "优惠券信息分页信息")
+    @ApiModel("优惠券信息分页响应信息")
     public static class CouponPageInfo implements Serializable {
 
         @ApiModelProperty("优惠券ID")
@@ -146,6 +147,9 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券类型")
         private CouponTypeEnum couponType;
 
+        @ApiModelProperty("有效期类型: DAY(固定有效天数) TIME_PERIOD(固定时间段)")
+        private CouponValidTypeEnum validType;
+
         @ApiModelProperty("有效天数")
         private Integer validDay;
 
@@ -214,6 +218,9 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private CouponTypeEnum couponType;
 
+        @ApiModelProperty("有效期类型: DAY(固定有效天数) TIME_PERIOD(固定时间段)")
+        private CouponValidTypeEnum validType;
+
         @ApiModelProperty("有效天数")
         private Integer validDay;
 
@@ -229,7 +236,7 @@ public class CouponInfoVO {
         @ApiModelProperty("领取次数限制")
         private Integer quantityLimit;
 
-        @ApiModelProperty(value = "启禁状态", hidden = true)
+        @ApiModelProperty(value = "启禁状态, 0 停用 1 启用")
         private Integer status;
 
         @ApiModelProperty(value = "更新用户", hidden = true)
@@ -271,6 +278,10 @@ public class CouponInfoVO {
                     throw new BizException("满减金额未设置");
                 }
 
+                if (Objects.isNull(getValidType())) {
+                    throw new BizException("有效期类型不能为空");
+                }
+
                 if (Optional.ofNullable(getValidDay()).orElse(0) <= 0
                         && (Optional.ofNullable(getStartTime()).orElse(0L) == 0
                             || Optional.ofNullable(getEndTime()).orElse(0L) == 0)) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInventoryVO.java

@@ -0,0 +1,225 @@
+package com.yonge.cooleshow.admin.io.request.coupon;
+
+import com.alibaba.fastjson.JSON;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
+import com.yonge.cooleshow.common.enums.EStatus;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.page.QueryInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * 优惠券库存量
+ * Created by Eric.Shang on 2022/9/5.
+ */
+public class CouponInventoryVO {
+
+
+    /**
+     * 优惠券库存调整分页请求信息
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(value = "优惠券库存调整分页请求", description = "优惠券库存调整分页")
+    public static class PageRequest extends QueryInfo {
+
+        @ApiModelProperty("优惠券ID")
+        private Long couponId;
+
+        @ApiModelProperty("操作人")
+        private Long userId;
+
+        @ApiModelProperty("数据类型: ADDITION(添加) REDUCE(减少)")
+        private CouponInventoryEnum dataType;
+
+        @ApiModelProperty("开始时间, yyyy-MM-dd HH:mm:ss")
+        private String startQueryTime;
+
+        @ApiModelProperty("结束时间, yyyy-MM-dd HH:mm:ss")
+        private String endQueryTime;
+
+        @ApiModelProperty(value = "结束时间", hidden = true)
+        private Long startTime;
+        @ApiModelProperty(value = "结束时间", hidden = true)
+        private Long endTime;
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public boolean invalidRequestParam() {
+
+            // 优惠券ID不能为空
+            return Optional.ofNullable(getCouponId()).orElse(0L) <= 0;
+        }
+
+        public Long getUserId() {
+
+            if (Optional.ofNullable(this.userId).orElse(0L) > 0) {
+                return this.userId;
+            }
+
+            return null;
+        }
+
+        public Long getStartTime() {
+            if (StringUtils.isNotEmpty(getStartQueryTime())) {
+                return DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").parseDateTime(getStartQueryTime()).getMillis() / 1000;
+            }
+            return startTime;
+        }
+
+        public Long getEndTime() {
+            if (StringUtils.isNotEmpty(getEndQueryTime())) {
+                return DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").parseDateTime(getEndQueryTime()).getMillis() / 1000;
+            }
+            return endTime;
+        }
+    }
+
+    /**
+     * 库存量调整分页数据
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class PageInfo implements Serializable {
+
+        @ApiModelProperty("发放ID")
+        private Long id;
+
+        @ApiModelProperty("用户ID")
+        private Long userId;
+
+        @ApiModelProperty("操作人")
+        private String username;
+
+        @ApiModelProperty("优惠券ID")
+        private Long couponId;
+
+        @ApiModelProperty("数据类型: ADDITION(添加) REDUCE(减少)")
+        private CouponInventoryEnum dataType;
+
+        @ApiModelProperty("变化量")
+        private Integer number;
+
+        @ApiModelProperty("备注")
+        private String remark;
+
+        @ApiModelProperty("创建时间")
+        private Date createdTime;
+
+    }
+
+    /**
+     * 库存量调整记录
+     */
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class InventoryInfo implements Serializable {
+
+        @ApiModelProperty(value = "发放ID", hidden = true)
+        private Long id;
+
+        @ApiModelProperty(value = "用户ID", hidden = true)
+        private Long userId;
+
+        @ApiModelProperty("优惠券ID")
+        private Long couponId;
+
+        @ApiModelProperty("数据类型: ADDITION(添加) REDUCE(减少)")
+        private CouponInventoryEnum dataType;
+
+        @ApiModelProperty("变化量")
+        private Integer number;
+
+        @ApiModelProperty(value = "备注", hidden = true)
+        private String remark;
+
+        @ApiModelProperty(value = "启/禁状态", hidden = true)
+        private Integer status;
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public boolean invalidRequestParam(Long userId) {
+
+            if (Optional.ofNullable(getCouponId()).orElse(0L) <= 0) {
+                throw new BizException("优惠券ID不能为空");
+            }
+
+            if (Objects.isNull(getDataType())) {
+                throw new BizException("类型不能为空");
+            }
+
+            if (Optional.ofNullable(getNumber()).orElse(0) <= 0) {
+                throw new BizException("变化量不能为空");
+            }
+
+            // 设置保存参数
+            this.userId(userId).initSaveParam();
+
+            return false;
+        }
+
+        public InventoryInfo initSaveParam() {
+
+            return this.remark("").status(EStatus.ENABLE.getValue());
+        }
+
+
+        public InventoryInfo id(Long id) {
+            this.id = id;
+            return this;
+        }
+
+        public InventoryInfo userId(Long userId) {
+            this.userId = userId;
+            return this;
+        }
+
+        public InventoryInfo remark(String remark) {
+            this.remark = remark;
+            return this;
+        }
+
+        public InventoryInfo status(Integer status) {
+            this.status = status;
+            return this;
+        }
+    }
+
+    /**
+     * 库存量调整用户分页数据
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class PageUserInfo implements Serializable {
+
+        @ApiModelProperty("用户ID")
+        private Long userId;
+
+        @ApiModelProperty("操作人")
+        private String username;
+
+        @ApiModelProperty("优惠券ID")
+        private Long couponId;
+
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CouponInfo.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponValidTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -65,6 +66,10 @@ public class CouponInfo implements Serializable {
     @TableField("coupon_type_")
     private String couponType;
 
+    @ApiModelProperty("有效期类型")
+    @TableField("valid_type_")
+    private CouponValidTypeEnum validType;
+
     @ApiModelProperty("有效天数")
     @TableField("valid_day_")
     private Integer validDay;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/CouponInventory.java

@@ -0,0 +1,65 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 优惠券库存变化
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-05
+ */
+@Getter
+@Setter
+@TableName("coupon_inventory")
+@ApiModel(value = "CouponInventory对象", description = "优惠券库存变化")
+public class CouponInventory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("发放ID")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("用户ID")
+    @TableField("user_id_")
+    private Long userId;
+
+    @ApiModelProperty("优惠券ID")
+    @TableField("coupon_id_")
+    private Long couponId;
+
+    @ApiModelProperty("数据类型")
+    @TableField("data_type_")
+    private CouponInventoryEnum dataType;
+
+    @ApiModelProperty("变化量")
+    @TableField("number_")
+    private Integer number;
+
+    @ApiModelProperty("备注")
+    @TableField("remark_")
+    private String remark;
+
+    @ApiModelProperty("启禁状态")
+    @TableField("status_")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    @TableField("created_time_")
+    private Date createdTime;
+
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MK.java

@@ -10,4 +10,6 @@ public interface MK {
     String EXP_MOBILE_NUMBER = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$";
     // 正型
     String EXP_INT = "^\\d+$";
+    // 时间格式
+    String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/coupon/CouponInventoryEnum.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.enums.coupon;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 优惠券库存调整类型
+ * @author: Eric
+ * @date: 2022-03-30
+ */
+public enum CouponInventoryEnum implements BaseEnum<String, CouponInventoryEnum> {
+
+    ADDITION("添加"),
+    REDUCE("减少"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    CouponInventoryEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/coupon/CouponValidTypeEnum.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.enums.coupon;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 优惠券有效期类型
+ * @author: Eric
+ * @date: 2022-03-30
+ */
+public enum CouponValidTypeEnum implements BaseEnum<String, CouponValidTypeEnum> {
+
+    DAY("固定有效天数"),
+    TIME_PERIOD("固定时间段"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    CouponValidTypeEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return this.msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/CouponInfoMapper.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponInventoryQuery;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponInventoryWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -38,4 +40,12 @@ public interface CouponInfoMapper extends BaseMapper<CouponInfo> {
      * @return List<StatGroupWrapper>
      */
     List<StatGroupWrapper> selectCouponIssueStatInfo(@Param("couponIds") List<Long> couponIds, @Param("record") CouponInfoQuery.IssueStatQuery query);
+
+    /**
+     * 优惠券库存量调整信息
+     * @param page IPage<CouponInventoryWrapper>
+     * @param query CouponInventoryQuery
+     * @return List<CouponInventoryWrapper>
+     */
+    List<CouponInventoryWrapper> selectCouponInventoryPageInfo(@Param("page") IPage<CouponInventoryWrapper> page, @Param("record") CouponInventoryQuery query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/CouponInventoryMapper.java

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 优惠券库存变化 Mapper 接口
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-05
+ */
+public interface CouponInventoryMapper extends BaseMapper<CouponInventory> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponInfoQuery.java

@@ -11,7 +11,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 优惠券查询条件

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponInventoryQuery.java

@@ -0,0 +1,46 @@
+package com.yonge.cooleshow.biz.dal.queryInfo;
+
+import com.alibaba.fastjson.JSON;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 优惠券查询条件
+ * Created by Eric.Shang on 2022/9/2.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CouponInventoryQuery implements Serializable {
+
+    // 优惠券ID
+    private Long couponId;
+    // 操作人ID
+    private Long userId;
+    // 调整类型
+    private CouponInventoryEnum dataType;
+    // 按用户分组
+    private Boolean groupByUser;
+
+    // 开始时间
+    private Long startTime;
+    // 结束时间
+    private Long endTime;
+
+    public static CouponInventoryQuery from(String recv) {
+
+        return JSON.parseObject(recv, CouponInventoryQuery.class);
+    }
+
+
+    public CouponInventoryQuery groupByUser(Boolean groupByUser) {
+        this.groupByUser = groupByUser;
+        return this;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponInfoService.java

@@ -3,8 +3,11 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponInventoryQuery;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponInventoryWrapper;
 
 /**
  * <p>
@@ -18,7 +21,7 @@ public interface CouponInfoService extends IService<CouponInfo> {
 
     /**
      * 分页查询优惠券信息
-     * @param page IPage<Object>
+     * @param page IPage<CouponInfoWrapper>
      * @param query CouponInfoQuery
      * @return IPage<CouponInfoWrapper>
      */
@@ -37,4 +40,19 @@ public interface CouponInfoService extends IService<CouponInfo> {
      * @return CouponInfo
      */
     CouponInfo saveOrUpdateCouponInfo(CouponInfo couponInfo);
+
+    /**
+     * 优惠券库存量调整信息
+     * @param page IPage<CouponInventoryWrapper>
+     * @param query CouponInventoryQuery
+     * @return IPage<CouponInventoryWrapper>
+     */
+    IPage<CouponInventoryWrapper> queryCouponInventoryPageInfo(IPage<CouponInventoryWrapper> page, CouponInventoryQuery query);
+
+    /**
+     * 新增优惠券库存量调整信息
+     * @param inventory CouponInventory
+     * @return int 入库行数
+     */
+    int saveOrUpdateCouponInventoryInfo(CouponInventory inventory);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponInventoryService.java

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 优惠券库存变化 服务类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-05
+ */
+public interface CouponInventoryService extends IService<CouponInventory> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponInfoServiceImp.java

@@ -1,23 +1,29 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.biz.dal.entity.CouponInfo;
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
 import com.yonge.cooleshow.biz.dal.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.cooleshow.biz.dal.mapper.CouponInfoMapper;
+import com.yonge.cooleshow.biz.dal.mapper.CouponInventoryMapper;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
+import com.yonge.cooleshow.biz.dal.queryInfo.CouponInventoryQuery;
 import com.yonge.cooleshow.biz.dal.service.CouponInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponInventoryWrapper;
 import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -37,6 +43,8 @@ public class CouponInfoServiceImp extends ServiceImpl<CouponInfoMapper, CouponIn
 
     @Autowired
     private SysUserMapper sysUserMapper;
+    @Autowired
+    private CouponInventoryMapper couponInventoryMapper;
 
     /**
      * 分页查询优惠券信息
@@ -133,4 +141,71 @@ public class CouponInfoServiceImp extends ServiceImpl<CouponInfoMapper, CouponIn
 
         return getById(couponInfo.getId());
     }
+
+    /**
+     * 优惠券库存量调整信息
+     *
+     * @param page  IPage<CouponInventoryWrapper>
+     * @param query CouponInventoryQuery
+     * @return IPage<CouponInventoryWrapper>
+     */
+    @Override
+    public IPage<CouponInventoryWrapper> queryCouponInventoryPageInfo(IPage<CouponInventoryWrapper> page, CouponInventoryQuery query) {
+
+        // 优惠券库存调整信息
+        List<CouponInventoryWrapper> wrappers = getBaseMapper().selectCouponInventoryPageInfo(page, query);
+
+        if (CollectionUtils.isEmpty(wrappers)) {
+            // 没有数据，直接返回
+            return page.setRecords(Lists.newArrayList());
+        }
+
+        return page.setRecords(wrappers);
+    }
+
+    /**
+     * 新增优惠券库存量调整信息
+     *
+     * @param inventory CouponInventory
+     * @return int 入库行数
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int saveOrUpdateCouponInventoryInfo(CouponInventory inventory) {
+
+        // 优惠券信息
+        CouponInfo couponInfo = getBaseMapper().selectById(inventory.getCouponId());
+
+        if (Objects.isNull(couponInfo)) {
+            throw new BizException("无效的优惠券ID");
+        }
+
+        // 比较当前库存量是否有效
+        if (CouponInventoryEnum.REDUCE == inventory.getDataType()
+                && couponInfo.getInventory() < inventory.getNumber()) {
+
+            throw new BizException("当前优惠券库存为: " + couponInfo.getInventory());
+        }
+
+        int ret = couponInfo.getInventory();
+        switch (inventory.getDataType()) {
+            case ADDITION:
+                ret += inventory.getNumber();
+                break;
+            case REDUCE:
+                 ret -= inventory.getNumber();
+                break;
+            default:
+                break;
+        }
+
+        // 调整优惠券库存量信息
+        CouponInfo updateInfo = new CouponInfo();
+        updateInfo.setId(couponInfo.getId());
+        updateInfo.setInventory(ret);
+        getBaseMapper().updateById(updateInfo);
+
+        // 新增优惠券库存量记录
+        return couponInventoryMapper.insert(inventory);
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponInventoryServiceImp.java

@@ -0,0 +1,20 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.biz.dal.entity.CouponInventory;
+import com.yonge.cooleshow.biz.dal.mapper.CouponInventoryMapper;
+import com.yonge.cooleshow.biz.dal.service.CouponInventoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 优惠券库存变化 服务实现类
+ * </p>
+ *
+ * @author Eric
+ * @since 2022-09-05
+ */
+@Service
+public class CouponInventoryServiceImp extends ServiceImpl<CouponInventoryMapper, CouponInventory> implements CouponInventoryService {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/coupon/CouponInventoryWrapper.java

@@ -0,0 +1,43 @@
+package com.yonge.cooleshow.biz.dal.wrapper.coupon;
+
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponInventoryEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 优惠券库存量调整
+ * Created by Eric.Shang on 2022/9/5.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CouponInventoryWrapper implements Serializable {
+
+    private Long id;
+    private Long userId;
+    private Long couponId;
+    private CouponInventoryEnum dataType;
+    private Integer number;
+    private String remark;
+    private Integer status;
+    private Date createdTime;
+
+    private String username;
+    private String realName;
+
+    public String getUsername() {
+        if (StringUtils.isEmpty(this.username)
+                && StringUtils.isNotEmpty(getRealName())) {
+
+            return getRealName();
+        }
+        return username;
+    }
+}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponInfoMapper.xml

@@ -66,4 +66,37 @@
     </select>
     <!--优惠券分页查询-->
 
+    <!--优惠券库存调整信息-->
+    <resultMap id="CouponInventoryPageInfoResultMap" type="com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponInventoryWrapper">
+        <id column="id_" property="id" />
+        <result column="user_id_" property="userId" />
+        <result column="coupon_id_" property="couponId" />
+        <result column="data_type_" property="dataType" />
+        <result column="number_" property="number" />
+        <result column="remark_" property="remark" />
+        <result column="created_time_" property="createdTime" />
+
+        <result column="username_" property="username" />
+        <result column="real_name_" property="realName" />
+    </resultMap>
+    <select id="selectCouponInventoryPageInfo" resultMap="CouponInventoryPageInfoResultMap">
+        SELECT t1.id_, t1.user_id_, t1.coupon_id_, t1.data_type_, t1.number_, t1.remark_, t1.created_time_, t2.username_, t2.real_name_
+        FROM coupon_inventory t1 JOIN sys_user t2 ON t1.user_id_ = t2.id_
+        <where>
+            <if test="record.couponId != null">
+                AND t1.coupon_id_ = #{record.couponId}
+            </if>
+            <if test="record.dataType != null">
+                AND t1.data_type_ = #{record.dataType}
+            </if>
+            <if test="record.userId != null">
+                AND t1.user_id_ = #{record.userId}
+            </if>
+            <if test="record.startTime != null and record.endTime != null">
+                AND (#{record.startTime} &lt;= UNIX_TIMESTAMP(t1.created_time_) AND UNIX_TIMESTAMP(t1.created_time_) &lt;= #{record.endTime})
+            </if>
+        </where>
+        <if test="record.groupByUser != null">GROUP BY t1.user_id_</if>
+    </select>
+    <!--优惠券库存调整信息-->
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponInventoryMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yonge.cooleshow.biz.dal.mapper.CouponInventoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.CouponInventory">
+        <id column="id_" property="id" />
+        <result column="user_id_" property="userId" />
+        <result column="coupon_id_" property="couponId" />
+        <result column="data_type_" property="dataType" />
+        <result column="number_" property="number" />
+        <result column="remark_" property="remark" />
+        <result column="status_" property="status" />
+        <result column="created_time_" property="createdTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id_, user_id_, coupon_id_, data_type_, number_, remark_, status_, created_time_
+    </sql>
+
+</mapper>