From c384e04f81caf681647c602d5896cc10b289582e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 14:59:16 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
index cfc54b2..262523f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
@@ -52,6 +52,7 @@
     @Autowired
     private WithdrawRecordMapper withdrawRecordMapper;
 
+
     @Autowired
     private ShopMapper shopMapper;
 
@@ -101,7 +102,7 @@
      */
     @Override
     @Transactional
-    public void updateById(WithdrawRecord withdrawRecord) {
+    public void updateById(WithdrawRecord withdrawRecord, IntegralService integralService) {
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(!Constants.equalsObject(withdrawRecord.getStatus(),Constants.ONE)
                 && !Constants.equalsObject(withdrawRecord.getStatus(),Constants.TWO)){
@@ -126,7 +127,20 @@
         model.setPayBank(withdrawRecord.getPayBank());
         withdrawRecordMapper.updateById(model);
         dealBatchMultiFiles(model,withdrawRecord.getPayFileList());
+
+        //瀹℃壒鏈�氳繃 閫�鍥炴彁鐜伴噾棰�
+        if (Constants.equalsObject(model.getStatus(), Constants.TWO)) {
+            DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
+            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.WITHDRAW_APPLY_BACK);
+            dealIntegralRequest.setIntegralNum(model.getAmount());
+            dealIntegralRequest.setObjId(withdrawRecord.getId());
+            dealIntegralRequest.setOrderCode(withdrawRecord.getCode()!=null?withdrawRecord.getCode().toString():"");
+            dealIntegralRequest.setMemberId(model.getMemberId());
+            dealIntegralRequest.setDealType(Constants.ZERO);
+            integralService.dealShopAmount(dealIntegralRequest);
+        }
     }
+
     public void dealBatchMultiFiles(WithdrawRecord model, List<Multifile> fileList  ) {
         //娓呯┖鍘熸湁鐨�
         if(fileList!=null && fileList.size()>0){
@@ -153,7 +167,7 @@
             return;
         }
         for (WithdrawRecord withdrawRecord: withdrawRecords) {
-            this.updateById(withdrawRecord);
+//            this.updateById(withdrawRecord);
         }
     }
 
@@ -172,6 +186,7 @@
         if (Objects.isNull(withdrawRecord) ) {
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
+        withdrawRecord.setBankInfo(Constants.getBankInfo(withdrawRecord.getBankName(),withdrawRecord.getBankAccount()));
         if(!Constants.equalsInteger(withdrawRecord.getStatus(), Constants.ZERO)){
             String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() +
                     systemDictDataBiz.queryByCode(Constants.OSS, Constants.TRANSFER_FILE).getCode();
@@ -301,7 +316,7 @@
 
 
     @Override
-    public void withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
+    public Integer withdrawApply(WithdrawApplyRequest request, IntegralService integralService){
         if (Objects.isNull( request)
             || request.getMemberId() == null
             || request.getBankId() == null
@@ -343,6 +358,7 @@
         dealIntegralRequest.setMemberId(request.getMemberId());
         dealIntegralRequest.setDealType(Constants.ONE);
         integralService.dealShopAmount(dealIntegralRequest);
+        return withdrawRecord.getId();
     }
 
 

--
Gitblit v1.9.3