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