From 74cc7f3201c708c9c5b0a2b1f7cacfdce76ca30b Mon Sep 17 00:00:00 2001 From: dzq Date: Wed, 11 Jun 2025 16:25:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=92=8C=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E4=BC=81=E4=B8=9AUserID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在退货审批流程中新增apply_userid和audit_userid字段，用于记录申请人和审批人的企业微信UserID 修改相关DTO、Entity、Service及查询类，支持新字段的存储和查询 调整固资通服务调用参数，使用新字段进行用户标识 --- .../shop/approval/ReturnApprovalApplicationService.java | 4 +++- .../domain/shop/approval/db/ReturnApprovalEntity.java | 8 ++++++++ .../domain/shop/approval/dto/ReturnApprovalDTO.java | 6 ++++++ .../shop/approval/query/SearchApiReturnApprovalQuery.java | 4 ++++ .../shop/approval/query/SearchReturnApprovalQuery.java | 4 ++++ .../domain/shop/order/OrderApplicationService.java | 1 + sql/20250611.sql | 8 ++++++++ 7 files changed, 34 insertions(+), 1 deletion(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java index e9b4ffe..758f150 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java @@ -245,6 +245,7 @@ public class ReturnApprovalApplicationService { model.setAuditImages(command.getAuditImages()); model.setAuditRemark(command.getAuditRemark()); model.setReturnAmount(command.getReturnAmount()); + model.setAuditUserid(command.getAuditUserid()); model.setApprovalTime(new Date()); model.setStatus(2); // 2表示审核通过状态 model.updateById(); @@ -330,10 +331,11 @@ public class ReturnApprovalApplicationService { model.validateApprovalStatus(); model.setAuditImages(command.getAuditImages()); model.setAuditRemark(command.getAuditRemark()); + model.setAuditUserid(command.getAuditUserid()); model.setApprovalTime(new Date()); // 调用固资通服务的出库方法 - assetApplicationService.consumeOutput(model.getCorpid(), model.getUserid(), command.getUserid(), + assetApplicationService.consumeOutput(model.getCorpid(), model.getApplyUserid(), model.getAuditUserid(), model, shopOrderGoodsList, goodsModelList); // 开始执行数据库操作 diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java index b13c56f..3789c01 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java @@ -58,6 +58,14 @@ public class ReturnApprovalEntity extends BaseEntity { @TableField("corpid") private String corpid; + @ApiModelProperty("申请人企业UserID") + @TableField("apply_userid") + private String applyUserid; + + @ApiModelProperty("审批人企业UserID") + @TableField("audit_userid") + private String auditUserid; + @ApiModelProperty("申请数量") @TableField("apply_quantity") private Integer applyQuantity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java index eaf9530..18b1937 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java @@ -53,6 +53,12 @@ public class ReturnApprovalDTO { @ExcelColumn(name = "企业微信id") private String corpid; + @ExcelColumn(name = "申请人企业UserID") + private String applyUserid; + + @ExcelColumn(name = "审批人企业UserID") + private String auditUserid; + @ExcelColumn(name = "申请数量") private Integer applyQuantity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java index 240698f..159528c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java @@ -19,6 +19,8 @@ public class SearchApiReturnApprovalQuery extends AbstractPageQuery { private Long externalGoodsId; private Long externalApprovalId; private String corpid; + private String applyUserid; + private String auditUserid; private Integer applyQuantity; private Integer approvalType; private String applyRemark; @@ -40,6 +42,8 @@ public class SearchApiReturnApprovalQuery extends AbstractPageQuery { .eq(externalApprovalId != null, "ra.external_approval_id", externalApprovalId) .eq(approvalType != null, "ra.approval_type", approvalType) .eq(StrUtil.isNotEmpty(corpid), "ra.corpid", corpid) + .eq(StrUtil.isNotEmpty(applyUserid), "ra.apply_userid", applyUserid) + .eq(StrUtil.isNotEmpty(auditUserid), "ra.audit_userid", auditUserid) .like(StrUtil.isNotEmpty(goodsName), "sog.goods_name", goodsName) .between(startTime != null && endTime != null, "ra.create_time", startTime, endTime) .orderByDesc("ra.approval_id"); diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java index 1a581a2..1056878 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java @@ -19,6 +19,8 @@ public class SearchReturnApprovalQuery extends AbstractPageQuery { private Long externalGoodsId; private Long externalApprovalId; private String corpid; + private String applyUserid; + private String auditUserid; private Integer applyQuantity; private Integer approvalType; private String applyRemark; @@ -42,6 +44,8 @@ public class SearchReturnApprovalQuery extends AbstractPageQuery { .eq(externalApprovalId != null, "ra.external_approval_id", externalApprovalId) .eq(approvalType != null, "ra.approval_type", approvalType) .eq(StrUtil.isNotEmpty(corpid), "ra.corpid", corpid) + .eq(StrUtil.isNotEmpty(applyUserid), "ra.apply_userid", applyUserid) + .eq(StrUtil.isNotEmpty(auditUserid), "ra.audit_userid", auditUserid) .like(StrUtil.isNotEmpty(returnRemark), "ra.return_remark", returnRemark) .like(StrUtil.isNotEmpty(auditRemark), "ra.audit_remark", auditRemark) .like(StrUtil.isNotEmpty(paymentMethod), "so.payment_method", paymentMethod) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java index 46bbd65..6ac98d7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java @@ -232,6 +232,7 @@ public class OrderApplicationService { command.setCorpid(submitOrderCommand.getCorpid()); command.setGoodsId(firstOrderGoods.getGoodsId()); command.setOrderId(orderModel.getOrderId()); + command.setApplyUserid(orderModel.getUserid()); command.setApplyRemark(submitOrderCommand.getApplyRemark()); command.setApprovalType(1); command.setStatus(1); diff --git a/sql/20250611.sql b/sql/20250611.sql index 3bd73d4..fb79c8c 100644 --- a/sql/20250611.sql +++ b/sql/20250611.sql @@ -1,3 +1,11 @@ ALTER TABLE `shop` ADD COLUMN `belong_type` tinyint NOT NULL DEFAULT 0 COMMENT '归属类型（0-借还柜 1-固资通）' +AFTER `corpid`; + +ALTER TABLE `return_approval` +ADD COLUMN `apply_userid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '申请人企业UserID' +AFTER `corpid`; + +ALTER TABLE `return_approval` +ADD COLUMN `audit_userid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '审批人企业UserID' AFTER `corpid`; \ No newline at end of file