From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java b/service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java
index 5a2d5aa..0c5d9e0 100644
--- a/service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java
+++ b/service-acct/src/main/java/com/java110/acct/bmo/account/impl/OwnerPrestoreAccountBMOImpl.java
@@ -14,6 +14,7 @@
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -51,16 +52,28 @@
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
if (accountDtos == null || accountDtos.size() < 1) {
accountDto = addAccountDto(reqJson);
+ //淇濆瓨浜ゆ槗鏄庣粏
+ AccountDetailPo accountDetail = BeanConvertUtil.covertBean(accountDetailPo, AccountDetailPo.class);
+ accountDetail.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+ accountDetail.setAcctId(accountDto.getAcctId());
+ accountDetail.setObjType(AccountDetailDto.ORDER_TYPE_USER);
+ accountDetail.setDetailType(AccountDetailDto.DETAIL_TYPE_IN);
+ if (StringUtil.isEmpty(accountDetail.getDetailId())) {
+ accountDetail.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ }
+ if (StringUtil.isEmpty(accountDetail.getRelAcctId())) {
+ accountDetail.setRelAcctId("-1");
+ }
+ accountDetailInnerServiceSMOImpl.saveAccountDetails(accountDetail);
} else {
accountDto = accountDtos.get(0);
- }
- accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
- accountDetailPo.setAcctId(accountDto.getAcctId());
- accountDetailPo.setObjType(AccountDetailDto.ORDER_TYPE_USER);
-
- int flag = accountInnerServiceSMOImpl.prestoreAccount(accountDetailPo);
- if (flag < 1) {
- return ResultVo.error("棰勫瓨澶辫触");
+ accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+ accountDetailPo.setAcctId(accountDto.getAcctId());
+ accountDetailPo.setObjType(AccountDetailDto.ORDER_TYPE_USER);
+ int flag = accountInnerServiceSMOImpl.prestoreAccount(accountDetailPo);
+ if (flag < 1) {
+ return ResultVo.error("棰勫瓨澶辫触");
+ }
}
return ResultVo.success();
}
--
Gitblit v1.8.0