基本重构订单功能

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppletIndexCategoriesController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
@@ -50,6 +51,7 @@ public class SysAppletIndexCategoriesController extends BaseController {
      * 修改分类
      */
     @Log(title = "精选分类管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysAppletIndexCategoriesBo bo) {
         categoriesService.updateByBo(bo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppletIndexSlideshowController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
@@ -52,6 +53,7 @@ public class SysAppletIndexSlideshowController extends BaseController {
      * 新增轮播图
      */
     @Log(title = "轮播图管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
     @PostMapping
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SysAppletIndexSlideshowBo bo) {
         slideshowService.insertByBo(bo);
@@ -62,6 +64,7 @@ public class SysAppletIndexSlideshowController extends BaseController {
      * 修改轮播图
      */
     @Log(title = "轮播图管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysAppletIndexSlideshowBo bo) {
         slideshowService.updateByBo(bo);
@@ -72,6 +75,7 @@ public class SysAppletIndexSlideshowController extends BaseController {
      * 删除轮播图
      */
     @Log(title = "轮播图管理", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
         slideshowService.deleteByIds(List.of(ids));

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysComplaintController.java

@@ -89,6 +89,7 @@ public class SysComplaintController extends BaseController {
      */
 //     @SaCheckPermission("system:complaint:remove")
     @Log(title = "投诉建议", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysEmployeeController.java

@@ -110,6 +110,7 @@ public class SysEmployeeController extends BaseController {
      * @param ids 主键串
      */
     @Log(title = "员工管理", businessType = BusinessType.DELETE)
+    @RepeatSubmit()
     @DeleteMapping("/{ids}")
     public R<Void> remove(@PathVariable List<Long> ids) {
         return toAjax(sysEmployeeService.deleteWithValidByIds(ids, true));
@@ -137,6 +138,7 @@ public class SysEmployeeController extends BaseController {
      * 修改员工状态（启用/禁用）
      */
     @Log(title = "员工管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping("/changeStatus")
     public R<Void> changeStatus(@NotNull(message = "员工ID不能为空") Long id,
                                 @NotNull(message = "状态不能为空") String status) {

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPhoneController.java

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
@@ -41,6 +42,7 @@ public class SysPhoneController extends BaseController {
      * 修改联系电话
      */
     @Log(title = "联系电话管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysPhoneBo bo) {
         sysPhoneService.updateByBo(bo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysAppletIndexSlideshowVo.java

@@ -32,8 +32,36 @@ public class SysAppletIndexSlideshowVo implements Serializable {
     @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "ossId")
     private String ossUrl;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "updateBy")
+    private String updateByName;
+
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
 }

ruoyi-modules/yingpaipay-erp/pom.xml

@@ -18,6 +18,11 @@
     <dependencies>
 
         <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-core</artifactId>

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/controller/ErpOrderController.java

@@ -2,6 +2,7 @@ package org.dromara.erp.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -80,6 +81,7 @@ public class ErpOrderController {
     /**
      * 新增订单
      */
+    @RepeatSubmit()
     @PostMapping("/add")
     public R<String> add(@RequestBody org.dromara.erp.domain.bo.ErpOrderBo bo) {
         String rowId = erpOrderService.insert(bo);
@@ -89,6 +91,7 @@ public class ErpOrderController {
     /**
      * 撤销订单（单纯修改订单状态为已撤销）
      */
+    @RepeatSubmit()
     @PostMapping("/cancel/{rowId}")
     public R<Void> cancel(@PathVariable("rowId") String rowId) {
         return erpOrderService.cancelOrder(rowId) ? R.ok() : R.fail();
@@ -98,6 +101,7 @@ public class ErpOrderController {
      * 加急订单
      * @Author: Trae
      */
+    @RepeatSubmit()
     @PostMapping("/urgent/{rowId}")
     public R<Void> markUrgent(@PathVariable("rowId") String rowId) {
         return erpOrderService.markUrgent(rowId) ? R.ok() : R.fail();

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/controller/ErpOrderDetailController.java

@@ -2,6 +2,7 @@ package org.dromara.erp.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.erp.domain.query.ErpOrderDetailQuery;
 import org.dromara.erp.domain.vo.ErpOrderDetailVo;
 import org.dromara.erp.service.IErpOrderDetailService;
@@ -42,6 +43,7 @@ public class ErpOrderDetailController {
     /**
      * 新增订单明细
      */
+    @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@RequestBody org.dromara.erp.domain.bo.ErpOrderDetailBo bo) {
         return erpOrderDetailService.insert(bo) ? R.ok() : R.fail();
@@ -50,6 +52,7 @@ public class ErpOrderDetailController {
     /**
      * 修改订单明细
      */
+    @RepeatSubmit()
     @PutMapping("/edit")
     public R<Void> edit(@RequestBody org.dromara.erp.domain.bo.ErpOrderDetailBo bo) {
         return erpOrderDetailService.update(bo) ? R.ok() : R.fail();
@@ -58,6 +61,7 @@ public class ErpOrderDetailController {
     /**
      * 删除订单明细
      */
+    @RepeatSubmit()
     @DeleteMapping("/{rowId}")
     public R<Void> remove(@PathVariable("rowId") String rowId) {
         return erpOrderDetailService.deleteById(rowId) ? R.ok() : R.fail();
@@ -68,6 +72,7 @@ public class ErpOrderDetailController {
      *
      * @Author: Trae
      */
+    @RepeatSubmit()
     @PutMapping("/batchUpdate")
     public R<Void> batchUpdate(@RequestBody org.dromara.erp.domain.bo.ErpOrderDetailBatchUpdateBo bo) {
         return erpOrderDetailService.batchUpdate(bo) ? R.ok() : R.fail();

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/ErpOrderDetail.java

@@ -38,6 +38,18 @@ public class ErpOrderDetail implements Serializable {
     @TableField("FOrderID")
     private String orderId;
 
+    /**
+     * 下单人
+     */
+    @TableField("FPlacer")
+    private Long placer;
+
+    /**
+     * 下单客户ID
+     */
+    @TableField("FClientID")
+    private String clientId;
+
     /**
      * 型材ID
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/bo/ErpOrderDetailBo.java

@@ -24,6 +24,10 @@ public class ErpOrderDetailBo implements Serializable {
 
     private String orderId;
 
+    private Long placer;
+
+    private String clientId;
+
     private String modelId;
 
     private String modelNum;

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/query/ErpOrderDetailQuery.java

@@ -15,6 +15,16 @@ public class ErpOrderDetailQuery {
      */
     private String orderId;
 
+    /**
+     * 下单人
+     */
+    private Long placer;
+
+    /**
+     * 下单客户ID
+     */
+    private String clientId;
+
     /**
      * 单据编号
      * @Author: Antigravity

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/domain/vo/ErpOrderDetailVo.java

@@ -25,6 +25,10 @@ public class ErpOrderDetailVo implements Serializable {
 
     private String orderId;
 
+    private Long placer;
+
+    private String clientId;
+
     private String modelId;
 
     private String modelNum;

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/impl/ErpOrderDetailServiceImpl.java

@@ -36,6 +36,12 @@ public class ErpOrderDetailServiceImpl implements IErpOrderDetailService {
         } else {
             lqw.isNull(ErpOrderDetail::getOrderId);
         }
+        if (ObjectUtil.isNotEmpty(query.getPlacer())) {
+            lqw.eq(ErpOrderDetail::getPlacer, query.getPlacer());
+        }
+        if (ObjectUtil.isNotEmpty(query.getClientId())) {
+            lqw.eq(ErpOrderDetail::getClientId, query.getClientId());
+        }
         lqw.orderByDesc(ErpOrderDetail::getCreateTime);
         return baseMapper.selectVoList(lqw);
     }

script/sql/sqlserver/v1/HTSail_CS-create.sql

@@ -57,6 +57,10 @@ CREATE TABLE [dbo].[t_Applet_Order_Details] (
   [FRowID] [dbo].[RowID] NOT NULL,
   [FOrderID] [dbo].[RowID] NULL,
 
+  -- 下单人 & 客户信息
+  [FPlacer] bigint NULL,
+  [FClientID] varchar(50) NULL,
+
   -- 型材信息
   [ModelID] [dbo].[RowID] NULL,
   [ModelNum] [dbo].[FNum] NULL,
@@ -97,6 +101,10 @@ EXEC sp_addextendedproperty 'MS_Description', N'记录主键', 'SCHEMA', N'dbo',
 GO
 EXEC sp_addextendedproperty 'MS_Description', N'主订单ID', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'FOrderID'
 GO
+EXEC sp_addextendedproperty 'MS_Description', N'下单人', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'FPlacer'
+GO
+EXEC sp_addextendedproperty 'MS_Description', N'下单客户ID', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'FClientID'
+GO
 EXEC sp_addextendedproperty 'MS_Description', N'型材ID', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'ModelID'
 GO
 EXEC sp_addextendedproperty 'MS_Description', N'型材编号', 'SCHEMA', N'dbo', 'TABLE', N't_Applet_Order_Details', 'COLUMN', N'ModelNum'