From 1af4e76f8440b1efbbce3689fdcc16f4a4f2c6c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 18 六月 2021 00:01:42 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java b/service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java
index e594128..87aca88 100644
--- a/service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java
+++ b/service-acct/src/main/java/com/java110/acct/bmo/accountWithdrawalApply/impl/SaveAccountWithdrawalApplyBMOImpl.java
@@ -1,12 +1,16 @@
 package com.java110.acct.bmo.accountWithdrawalApply.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.acct.bmo.accountWithdrawalApply.ISaveAccountWithdrawalApplyBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 
+import com.java110.dto.accountDetail.AccountDetailDto;
 import com.java110.dto.user.UserDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
 import com.java110.intf.acct.IAccountWithdrawalApplyInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.accountDetail.AccountDetailPo;
 import com.java110.po.accountWithdrawalApply.AccountWithdrawalApplyPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +25,9 @@
     private IAccountWithdrawalApplyInnerServiceSMO accountWithdrawalApplyInnerServiceSMOImpl;
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
     /**
      * 娣诲姞灏忓尯淇℃伅
      *
@@ -28,7 +35,7 @@
      * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
      */
     @Java110Transactional
-    public ResponseEntity<String> save(AccountWithdrawalApplyPo accountWithdrawalApplyPo,String userId) {
+    public ResponseEntity<String> save(AccountWithdrawalApplyPo accountWithdrawalApplyPo, String userId) {
 
 
         UserDto userDto = new UserDto();
@@ -40,13 +47,24 @@
             accountWithdrawalApplyPo.setApplyUserName( userDtoList.get( 0 ).getUserName() );
             accountWithdrawalApplyPo.setApplyUserTel( userDtoList.get( 0 ).getTel() );
             accountWithdrawalApplyPo.setApplyUserId( userDtoList.get( 0 ).getUserId() );
-
             accountWithdrawalApplyPo.setApplyId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyId));
-            int flag = accountWithdrawalApplyInnerServiceSMOImpl.saveAccountWithdrawalApply(accountWithdrawalApplyPo);
 
-            if (flag > 0) {
-                return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+            AccountDetailPo accountDetailPo = new AccountDetailPo();
+            accountDetailPo.setAcctId( accountWithdrawalApplyPo.getAcctId() );
+            accountDetailPo.setAmount( accountWithdrawalApplyPo.getAmount() );
+            accountDetailPo.setRemark( accountWithdrawalApplyPo.getContext() );
+            //璋冪敤鎵f鎺ュ彛杩涜鎵f
+            int acctflag = accountInnerServiceSMOImpl.withholdAccount( accountDetailPo );
+            if (acctflag < 1) {
+                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鎵f澶辫触");
             }
+            //鎶ュ瓨鎻愮幇淇℃伅
+            int flag = accountWithdrawalApplyInnerServiceSMOImpl.saveAccountWithdrawalApply(accountWithdrawalApplyPo);
+            if (flag < 1) {
+                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨鎻愮幇澶辫触");
+            }
+
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎻愮幇鎴愬姛");
         }
 
 

--
Gitblit v1.8.0