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-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java
index f0b1e2f..492d1b0 100644
--- a/service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java
@@ -4,18 +4,29 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.account.IAccountDetailBMO;
import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.accountDetail.AccountDetailDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service("accountDetailBMOImpl")
public class AccountDetailBMOImpl extends ApiBaseBMO implements IAccountDetailBMO {
@Autowired
private IAccountDetailInnerServiceSMO accountDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -25,7 +36,6 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void addAccountDetail(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
paramInJson.put("detailId", "-1");
AccountDetailPo accountDetailPo = BeanConvertUtil.covertBean(paramInJson, AccountDetailPo.class);
super.insert(dataFlowContext, accountDetailPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ACCT_DETAIL);
@@ -58,4 +68,50 @@
super.update(dataFlowContext, accountDetailPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_ACCT_DETAIL);
}
+ @Override
+ public void dealAccount(JSONObject paramObj, DataFlowContext dataFlowContext) {
+ //璐︽埛閲戦
+ double deductionAmount = paramObj.getDouble("deductionAmount"); //鎶垫墸閲戦
+ double redepositAmount = paramObj.getDouble("redepositAmount"); //杞瓨閲戦
+
+ if (deductionAmount == 0 || redepositAmount == 0) { //鎶垫墸閲戦
+ return;
+ }
+ String acctId = paramObj.getString("acctId");
+ if (StringUtil.isEmpty(acctId)) {
+ throw new IllegalArgumentException("璐︽埛id涓虹┖锛�");
+ }
+ AccountDto accountDto = new AccountDto();
+ accountDto.setAcctId(acctId);
+ //鏌ヨ璐︽埛閲戦
+ List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+ Assert.listOnlyOne(accountDtos, "鏌ヨ璐︽埛閲戦閿欒锛�");
+ //鑾峰彇閲戦
+ double amount = Double.parseDouble(accountDtos.get(0).getAmount());
+
+ if (amount < deductionAmount && deductionAmount > 0) {
+ throw new IllegalArgumentException("浣欓涓嶈冻");
+ }
+
+ AccountDetailPo accountDetailPo = new AccountDetailPo();
+ accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ if (deductionAmount > 0) {
+ //accountDetailPo.setAmount((deductionAmount * -1) + "");
+ accountDetailPo.setAmount(deductionAmount + "");
+ accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_OUT);
+ accountDetailPo.setRemark("鍓嶅彴缂磋垂鎵f");
+ } else {
+ accountDetailPo.setAmount(redepositAmount + "");
+ accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_IN);
+ accountDetailPo.setRemark("鍓嶅彴缂磋垂棰勫瓨");
+ }
+ accountDetailPo.setOrderId("-1");
+ accountDetailPo.setObjType(accountDtos.get(0).getObjType());
+ accountDetailPo.setObjId(accountDtos.get(0).getObjId());
+ accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
+ accountDetailPo.setRelAcctId("-1");
+ super.insert(dataFlowContext, accountDetailPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ACCT_DETAIL);
+
+ }
+
}
--
Gitblit v1.8.0