分销商折扣管理

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/dal/dataobject/otclevel/OtcLevelDO.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.otc.dal.dataobject.otclevel;
 
 import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;

ship-module-product/ship-module-product-api/src/main/java/com/yc/ship/module/product/enums/ErrorCodeConstants.java

@@ -1,8 +1,8 @@
-package com.yc.ship.module.ota.enums;
+package com.yc.ship.module.product.enums;
 
 
 import com.yc.ship.framework.common.exception.ErrorCode;
 
 public interface ErrorCodeConstants {
-
+    ErrorCode DISTRIBUTO_DISCOUNT_NOT_EXISTS = new ErrorCode(600_001, "分销商专属折扣不存在");
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/DistributorDiscountController.java

@@ -0,0 +1,91 @@
+package com.yc.ship.module.product.controller.admin.distributorDiscount;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.sun.xml.internal.fastinfoset.util.StringArray;
+import com.yc.ship.framework.apilog.core.annotation.ApiAccessLog;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.collection.ArrayUtils;
+import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountRespVO;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountSaveReqVO;
+import com.yc.ship.module.product.dal.dataobject.distributorDiscount.DistributorDiscountDO;
+import com.yc.ship.module.product.service.distributorDiscount.DistributorDiscountService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static com.yc.ship.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 分销商专属折扣")
+@RestController
+@RequestMapping("/distributor-discount")
+@Validated
+public class DistributorDiscountController {
+
+    @Resource
+    private DistributorDiscountService distributorDiscountService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建分销商专属折扣")
+    public CommonResult<Long> createDistributorDiscount(@Valid @RequestBody DistributorDiscountSaveReqVO createReqVO) {
+        return success(distributorDiscountService.createDistributorDiscount(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新分销商专属折扣")
+    public CommonResult<Boolean> updateDistributorDiscount(@Valid @RequestBody DistributorDiscountSaveReqVO updateReqVO) {
+        distributorDiscountService.updateDistributorDiscount(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除分销商专属折扣")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deleteDistributorDiscount(@RequestParam("id") Long id) {
+        distributorDiscountService.deleteDistributorDiscount(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得分销商专属折扣")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DistributorDiscountRespVO> getDistributorDiscount(@RequestParam("id") Long id) {
+        DistributorDiscountDO distributorDiscount = distributorDiscountService.getDistributorDiscount(id);
+        DistributorDiscountRespVO bean = BeanUtils.toBean(distributorDiscount, DistributorDiscountRespVO.class);
+        return success(bean);
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得分销商专属折扣分页")
+    public CommonResult<PageResult<DistributorDiscountRespVO>> getDistributorDiscountPage(@Valid DistributorDiscountPageReqVO pageReqVO) {
+        PageResult<DistributorDiscountDO> pageResult = distributorDiscountService.getDistributorDiscountPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, DistributorDiscountRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出分销商专属折扣 Excel")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportDistributorDiscountExcel(@Valid DistributorDiscountPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<DistributorDiscountDO> list = distributorDiscountService.getDistributorDiscountPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "分销商专属折扣.xls", "数据", DistributorDiscountRespVO.class,
+                        BeanUtils.toBean(list, DistributorDiscountRespVO.class));
+    }
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/vo/DistributorDiscountPageReqVO.java

@@ -0,0 +1,36 @@
+package com.yc.ship.module.product.controller.admin.distributorDiscount.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.yc.ship.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 分销商专属折扣分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DistributorDiscountPageReqVO extends PageParam {
+
+    @Schema(description = "折扣名称", example = "王五")
+    private String discountName;
+
+    @Schema(description = "分销商Id", example = "王五")
+    private String distributorId;
+
+    @Schema(description = "分销商名称", example = "王五")
+    private String distributorName;
+
+    @Schema(description = "适用区域", example = "22671")
+    private String areaId;
+
+    @Schema(description = "适用游轮", example = "14940")
+    private Long shipId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/vo/DistributorDiscountRespVO.java

@@ -0,0 +1,64 @@
+package com.yc.ship.module.product.controller.admin.distributorDiscount.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yc.ship.framework.excel.core.annotations.DictFormat;
+import com.yc.ship.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 分销商专属折扣 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DistributorDiscountRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "11469")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "折扣名称", example = "王五")
+    @ExcelProperty("折扣名称")
+    private String discountName;
+
+    @Schema(description = "分销商ID", example = "15889")
+    @ExcelProperty("分销商ID")
+    private Long distributorId;
+
+    @Schema(description = "分销商名称", example = "王五")
+    @ExcelProperty("分销商名称")
+    private String distributorName;
+
+    @Schema(description = "开始时间")
+    @ExcelProperty("开始时间")
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间")
+    @ExcelProperty("结束时间")
+    private LocalDateTime endTime;
+
+    @Schema(description = "折扣比例")
+    @ExcelProperty(value = "折扣比例", converter = DictConvert.class)
+    @DictFormat("regional_division") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Long discountNum;
+
+    @Schema(description = "适用区域", example = "22671")
+    @ExcelProperty("适用区域")
+    private List<Long> areaId;
+
+    @Schema(description = "试用游轮", example = "14940")
+    @ExcelProperty("试用游轮")
+    private Long shipId;
+
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/distributorDiscount/vo/DistributorDiscountSaveReqVO.java

@@ -0,0 +1,43 @@
+package com.yc.ship.module.product.controller.admin.distributorDiscount.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 分销商专属折扣新增/修改 Request VO")
+@Data
+public class DistributorDiscountSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "22466")
+    private Long id;
+
+    @Schema(description = "折扣名称", example = "王五")
+    private String discountName;
+
+    @Schema(description = "分销商ID", example = "15889")
+    private Long distributorId;
+
+    @Schema(description = "分销商名称", example = "王五")
+    private String distributorName;
+
+    @Schema(description = "开始时间")
+    private LocalDateTime startTime;
+
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
+
+    @Schema(description = "折扣比例")
+    private Long discountNum;
+
+    @Schema(description = "适用区域", example = "22671")
+    private List<Long> areaId;
+
+    @Schema(description = "试用游轮", example = "14940")
+    private Long shipId;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/distributorDiscount/DistributorDiscountDO.java

@@ -0,0 +1,72 @@
+package com.yc.ship.module.product.dal.dataobject.distributorDiscount;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 分销商专属折扣 DO
+ *
+ * @author lsq
+ */
+@TableName("distributor_discount")
+@KeySequence("distributor_discount_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DistributorDiscountDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 折扣名称
+     */
+    private String discountName;
+    /**
+     * 分销商ID
+     */
+    private Long distributorId;
+    /**
+     * 分销商名称
+     */
+    private String distributorName;
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+    /**
+     * 折扣比例
+     *
+     * 枚举 {@link }
+     */
+    private Long discountNum;
+    /**
+     * 适用区域
+     */
+    private String areaId;
+    /**
+     * 试用游轮
+     */
+    private Long shipId;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/distributorDiscount/DistributorDiscountMapper.java

@@ -0,0 +1,28 @@
+package com.yc.ship.module.product.dal.mysql.distributorDiscount;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
+import com.yc.ship.module.product.dal.dataobject.distributorDiscount.DistributorDiscountDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分销商专属折扣 Mapper
+ *
+ * @author lsq
+ */
+@Mapper
+public interface DistributorDiscountMapper extends BaseMapperX<DistributorDiscountDO> {
+
+    default PageResult<DistributorDiscountDO> selectPage(DistributorDiscountPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<DistributorDiscountDO>()
+                .likeIfPresent(DistributorDiscountDO::getDistributorId, reqVO.getDistributorId())
+                .likeIfPresent(DistributorDiscountDO::getDistributorName, reqVO.getDistributorName())
+                .eqIfPresent(DistributorDiscountDO::getAreaId, reqVO.getAreaId())
+                .eqIfPresent(DistributorDiscountDO::getShipId, reqVO.getShipId())
+                .betweenIfPresent(DistributorDiscountDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(DistributorDiscountDO::getId));
+    }
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountService.java

@@ -0,0 +1,55 @@
+package com.yc.ship.module.product.service.distributorDiscount;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountSaveReqVO;
+import com.yc.ship.module.product.dal.dataobject.distributorDiscount.DistributorDiscountDO;
+
+import javax.validation.Valid;
+
+/**
+ * 分销商专属折扣 Service 接口
+ *
+ * @author lsq
+ */
+public interface DistributorDiscountService {
+
+    /**
+     * 创建分销商专属折扣
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createDistributorDiscount(@Valid DistributorDiscountSaveReqVO createReqVO);
+
+    /**
+     * 更新分销商专属折扣
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateDistributorDiscount(@Valid DistributorDiscountSaveReqVO updateReqVO);
+
+    /**
+     * 删除分销商专属折扣
+     *
+     * @param id 编号
+     */
+    void deleteDistributorDiscount(Long id);
+
+    /**
+     * 获得分销商专属折扣
+     *
+     * @param id 编号
+     * @return 分销商专属折扣
+     */
+    DistributorDiscountDO getDistributorDiscount(Long id);
+
+    /**
+     * 获得分销商专属折扣分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 分销商专属折扣分页
+     */
+    PageResult<DistributorDiscountDO> getDistributorDiscountPage(DistributorDiscountPageReqVO pageReqVO);
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/distributorDiscount/DistributorDiscountServiceImpl.java

@@ -0,0 +1,75 @@
+package com.yc.ship.module.product.service.distributorDiscount;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountPageReqVO;
+import com.yc.ship.module.product.controller.admin.distributorDiscount.vo.DistributorDiscountSaveReqVO;
+import com.yc.ship.module.product.dal.dataobject.distributorDiscount.DistributorDiscountDO;
+import com.yc.ship.module.product.dal.mysql.distributorDiscount.DistributorDiscountMapper;
+import jodd.util.StringUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
+
+/**
+ * 分销商专属折扣 Service 实现类
+ *
+ * @author lsq
+ */
+@Service
+@Validated
+public class DistributorDiscountServiceImpl implements DistributorDiscountService {
+
+    @Resource
+    private DistributorDiscountMapper distributorDiscountMapper;
+
+    @Override
+    public Long createDistributorDiscount(DistributorDiscountSaveReqVO createReqVO) {
+        // 插入
+        DistributorDiscountDO distributorDiscount = BeanUtils.toBean(createReqVO, DistributorDiscountDO.class);
+        distributorDiscount.setId(IdWorker.getId(distributorDiscount));
+        distributorDiscount.setAreaId(createReqVO.getAreaId().toString()) ;
+        distributorDiscountMapper.insert(distributorDiscount);
+        // 返回
+        return distributorDiscount.getId();
+    }
+
+    @Override
+    public void updateDistributorDiscount(DistributorDiscountSaveReqVO updateReqVO) {
+        // 校验存在
+        validateDistributorDiscountExists(updateReqVO.getId());
+        // 更新
+        DistributorDiscountDO updateObj = BeanUtils.toBean(updateReqVO, DistributorDiscountDO.class);
+        updateObj.setAreaId(updateReqVO.getAreaId().toString()) ;
+        distributorDiscountMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteDistributorDiscount(Long id) {
+        // 校验存在
+        validateDistributorDiscountExists(id);
+        // 删除
+        distributorDiscountMapper.deleteById(id);
+    }
+
+    private void validateDistributorDiscountExists(Long id) {
+        if (distributorDiscountMapper.selectById(id) == null) {
+            throw exception0(600_01,"分销商专属折扣不存在");
+        }
+    }
+
+    @Override
+    public DistributorDiscountDO getDistributorDiscount(Long id) {
+        return distributorDiscountMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<DistributorDiscountDO> getDistributorDiscountPage(DistributorDiscountPageReqVO pageReqVO) {
+        return distributorDiscountMapper.selectPage(pageReqVO);
+    }
+
+}

ship-module-product/ship-module-product-biz/src/main/resources/mapper/distributorDiscount/DistributorDiscountMapper.xml

@@ -0,0 +1,12 @@
+<?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.yc.ship.module.product.dal.mysql.distributorDiscount.DistributorDiscountMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

ship-server-web/src/main/java/com/yc/ship/server/controller/DefaultController.java

@@ -33,13 +33,13 @@ public class DefaultController {
                 "[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
     }
 
-    @RequestMapping(value = { "/admin-api/product/**", // 商品中心
-            "/admin-api/trade/**", // 交易中心
-            "/admin-api/promotion/**" }) // 营销中心
-    public CommonResult<Boolean> mall404() {
-        return CommonResult.error(NOT_IMPLEMENTED.getCode(),
-                "[商城系统 yudao-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
-    }
+//    @RequestMapping(value = { "/admin-api/product/**", // 商品中心
+//            "/admin-api/trade/**", // 交易中心
+//            "/admin-api/promotion/**" }) // 营销中心
+//    public CommonResult<Boolean> mall404() {
+//        return CommonResult.error(NOT_IMPLEMENTED.getCode(),
+//                "[商城系统 yudao-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
+//    }
 
     @RequestMapping("/admin-api/erp/**")
     public CommonResult<Boolean> erp404() {

ship-server-web/src/main/resources/logback-spring.xml

@@ -65,7 +65,7 @@
         </root>
     </springProfile>
     <!-- 其它环境 -->
-    <springProfile name="dev,test,stage,prod,default">
+    <springProfile name="dev,test,stage,prod,default,lsq">
         <root level="INFO">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="ASYNC"/>