From 2ca926771c4b5314d6dddd2949a2b37d8a941ec1 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 20 Jun 2025 08:41:26 +0800
Subject: [PATCH] =?UTF-8?q?test(controller):=20=E6=B7=BB=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加测试用例验证CabinetController中通过身份证号拉取用户信息的功能
```

```msg
refactor(approval): 优化退货审批服务的商品更新逻辑

将审批商品表的批量更新操作从审批通过方法移动到更合适的位置，避免重复更新
移除审批商品数量重置为0的不必要操作
---
 .../agileboot/api/controller/CabinetControllerTest.java  | 9 +++++++++
 .../shop/approval/ReturnApprovalApplicationService.java  | 9 +++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/agileboot-api/src/test/java/com/agileboot/api/controller/CabinetControllerTest.java b/agileboot-api/src/test/java/com/agileboot/api/controller/CabinetControllerTest.java
index b308c60..db0f9e1 100644
--- a/agileboot-api/src/test/java/com/agileboot/api/controller/CabinetControllerTest.java
+++ b/agileboot-api/src/test/java/com/agileboot/api/controller/CabinetControllerTest.java
@@ -4,6 +4,8 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.agileboot.common.constant.OpenApiConstants;
 import com.agileboot.common.core.dto.ResponseDTO;
+import com.agileboot.domain.ab98.api.Ab98ApiUtil;
+import com.agileboot.domain.ab98.api.Ab98UserDto;
 import com.agileboot.domain.shop.payment.SignUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -44,4 +46,11 @@ public class CabinetControllerTest {
         // 5. 验证响应
         System.out.println("Response: " + res);
     }
+
+    @Test
+    public void testPullUserInfoByIdnum() {
+        String IdNum = "452526196206215829";
+        Ab98UserDto ab98UserDto = Ab98ApiUtil.pullUserInfoByIdnum("wxshop", "34164e41f0c6694be6bbbba0dc50c14a", IdNum);
+        log.info("ab98UserDto:{}", JSONUtil.toJsonStr(ab98UserDto));
+    }
 }
\ No newline at end of file
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 8baab18..910e309 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
@@ -425,6 +425,9 @@ public class ReturnApprovalApplicationService {
         model.setStatus(4); // 2表示审核通过状态
         model.updateById();
 
+        // 批量更新审批商品表
+        approvalGoodsList.forEach(ApprovalGoodsEntity::updateById);
+
         // 批量插入审批商品格口关联表
         approvalGoodsCellService.saveBatch(addApprovalGoodsCellList);
     }
@@ -450,9 +453,6 @@ public class ReturnApprovalApplicationService {
         if (approvalGoodsList == null || approvalGoodsList.isEmpty()) {
             throw new RuntimeException("未找到关联的订单商品");
         }
-        approvalGoodsList.forEach(approvalGoods -> {
-            approvalGoods.setApprovalQuantity(0);
-        });
 
         List<ApprovalGoodsCellEntity> approvalGoodsCellEntities = approvalGoodsCellService.selectByApprovalId(model.getApprovalId());
 
@@ -521,9 +521,6 @@ public class ReturnApprovalApplicationService {
 
         // 批量更新格口库存
         cabinetCellList.forEach(CabinetCellEntity::updateById);
-
-        // 批量更新审批商品表
-        approvalGoodsList.forEach(ApprovalGoodsEntity::updateById);
     }