admin123
/
shop-back-end
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(审批流程): 添加申请人和审批人企业UserID字段 

在退货审批流程中新增apply_userid和audit_userid字段，用于记录申请人和审批人的企业微信UserID
修改相关DTO、Entity、Service及查询类，支持新字段的存储和查询
调整固资通服务调用参数，使用新字段进行用户标识
This commit is contained in:
dzq 2025-06-11 16:25:17 +08:00
parent 353fe774d8
commit 74cc7f3201
7 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java
View File

@ -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);
// 开始执行数据库操作

8
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/db/ReturnApprovalEntity.java
View File

@ -58,6 +58,14 @@ public class ReturnApprovalEntity extends BaseEntity<ReturnApprovalEntity> {
@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;

6
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/dto/ReturnApprovalDTO.java
View File

@ -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;

4
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java
View File

@ -19,6 +19,8 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
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<T> extends AbstractPageQuery<T> {
.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");

4
agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java
View File

@ -19,6 +19,8 @@ public class SearchReturnApprovalQuery<T> extends AbstractPageQuery<T> {
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<T> extends AbstractPageQuery<T> {
.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)

1
agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java
View File

@ -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);

8
sql/20250611.sql
View File

@ -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`;