From a4f79e3e28d4572a287b60ba302628ba4c32951a Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Tue, 10 Jun 2025 10:12:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0c?=
 =?UTF-8?q?orpid=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单创建和退货审批流程中添加corpid字段，用于支持企业微信相关的用户查询和余额操作
---
 .../approval/ReturnApprovalApplicationService.java    | 11 +++++------
 .../domain/shop/order/OrderApplicationService.java    |  5 +++++
 2 files changed, 10 insertions(+), 6 deletions(-)

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 5c14e86..5f3ff37 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
@@ -188,9 +188,9 @@ public class ReturnApprovalApplicationService {
         } else if (Objects.equals(orderModel.getPaymentMethod(), "balance")) {
             // 余额退款
             try {
-                QyAccessTokenEntity accessToken = accessTokenApplicationService.getByAppid("QWTONG_YS_WXSHOP", command.getCorpid());
+                QyAccessTokenEntity accessToken = accessTokenApplicationService.getByAppid("QWTONG_YS_WXSHOP", model.getCorpid());
                 String userid = QywxApiUtil.convertToUserid(accessToken.getAccessToken(), orderModel.getOpenid()).getUserid();
-                QyUserEntity qyUser = userService.getUserByUserIdAndCorpid(userid, command.getCorpid());
+                QyUserEntity qyUser = userService.getUserByUserIdAndCorpid(userid, model.getCorpid());
                 if (null != qyUser) {
                     qyUser.setBalance(qyUser.getBalance().add(command.getReturnAmount()));
                     qyUser.setUseBalance(qyUser.getUseBalance().subtract(command.getReturnAmount()));
@@ -205,7 +205,7 @@ public class ReturnApprovalApplicationService {
         if (StringUtils.isNotBlank(command.getAuditName())) {
             model.setAuditName(command.getAuditName());
         } else if (StringUtils.isNotBlank(command.getUserid())) {
-            QyUserEntity qyUserEntity = qyUserService.getUserByUserIdAndCorpid(command.getUserid(), command.getCorpid());
+            QyUserEntity qyUserEntity = qyUserService.getUserByUserIdAndCorpid(command.getUserid(), model.getCorpid());
             if (null != qyUserEntity) {
                 model.setAuditName(qyUserEntity.getName());
             }
@@ -256,7 +256,7 @@ public class ReturnApprovalApplicationService {
         if (StringUtils.isNotBlank(command.getAuditName())) {
             model.setAuditName(command.getAuditName());
         } else if (StringUtils.isNotBlank(command.getUserid())) {
-            QyUserEntity qyUserEntity = qyUserService.getUserByUserIdAndCorpid(command.getUserid(), command.getCorpid());
+            QyUserEntity qyUserEntity = qyUserService.getUserByUserIdAndCorpid(command.getUserid(), model.getCorpid());
             if (null != qyUserEntity) {
                 model.setAuditName(qyUserEntity.getName());
             }
@@ -337,8 +337,6 @@ public class ReturnApprovalApplicationService {
         command.setGoodsId(orderGoods.getGoodsId());
         command.setOrderId(orderGoods.getOrderId());
         command.setGoodsPrice(orderGoods.getTotalAmount());
-        command.setReturnImages(command.getReturnImages());
-        command.setReturnRemark(command.getReturnRemark());
         command.setStatus(1);
         command.setCreatorId(0L);
         command.setCreateTime(new Date());
@@ -358,6 +356,7 @@ public class ReturnApprovalApplicationService {
         // 如果商品免审批，则自动审批
         if (goodsModel.getAutoApproval().equals(1)) {
             UpdateReturnApprovalCommand approveCommand = new UpdateReturnApprovalCommand();
+            approveCommand.setCorpid(command.getCorpid());
             approveCommand.setApprovalId(returnApprovalModel.getApprovalId());
             approveCommand.setReturnAmount(orderGoods.getTotalAmount());
             approveCommand.setAuditName("自动审批");
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 f2efb1e..46bbd65 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
@@ -163,6 +163,7 @@ public class OrderApplicationService {
         OrderModel orderModel = orderModelFactory.create();
 
         orderModel.setOpenid(command.getOpenid());
+        orderModel.setCorpid(command.getCorpid());
         orderModel.setCreatorId(1L);
         orderModel.setCreateTime(new Date());
         orderModel.setUpdaterId(1L);
@@ -179,6 +180,9 @@ public class OrderApplicationService {
         orderModel.setIsDeductStock(0);
         orderModel.insert();
 
+        goodsList.forEach(goods -> {
+            goods.setCorpid(command.getCorpid());
+        });
         processOrderGoods(orderModel, goodsList);
 
         if (Objects.equals(command.getPaymentType(), "wechat")) {
@@ -225,6 +229,7 @@ public class OrderApplicationService {
         // 设置商品价格并初始化审批状态
         AddReturnApprovalCommand command = new AddReturnApprovalCommand();
         command.initBaseEntity();
+        command.setCorpid(submitOrderCommand.getCorpid());
         command.setGoodsId(firstOrderGoods.getGoodsId());
         command.setOrderId(orderModel.getOrderId());
         command.setApplyRemark(submitOrderCommand.getApplyRemark());