From 9e434807cce14afae1abecc765c4ffc51423066a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 九月 2021 12:07:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-api/src/main/java/com/java110/api/bmo/account/impl/AccountDetailBMOImpl.java | 110 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 41 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 9ddda55..bc20235 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
@@ -1,5 +1,6 @@
package com.java110.api.bmo.account.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.account.IAccountDetailBMO;
@@ -9,14 +10,20 @@
import com.java110.dto.accountDetail.AccountDetailDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.po.account.AccountPo;
import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
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;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.List;
@Service("accountDetailBMOImpl")
@@ -69,51 +76,72 @@
}
@Override
- public void dealAccount(JSONObject paramObj, DataFlowContext dataFlowContext) {
- if(!paramObj.containsKey("deductionAmount")){
- return ;
- }
- //璐︽埛閲戦
- double deductionAmount = paramObj.getDouble("deductionAmount"); //鎶垫墸閲戦
- double redepositAmount = paramObj.getDouble("redepositAmount"); //杞瓨閲戦
+ public void dealAccount(JSONObject paramObj, DataFlowContext dataFlowContext, JSONArray businesses) {
+ //鍒ゆ柇閫夋嫨鐨勮处鍙�
+ JSONArray jsonArray = paramObj.getJSONArray("selectUserAccount");
+ if (jsonArray != null) {
+ //搴旀敹娆� totalFeePrice
+ BigDecimal totalFeePrice = new BigDecimal(paramObj.getString("totalFeePrice")); //搴旀敹娆�
+ //瀹炴敹娆� receivedAmount
+ BigDecimal receivedAmount = new BigDecimal(paramObj.getString("receivedAmount")); //瀹炴敹娆撅紙鎵ｆ閲戦锛�
- 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());
+ BigDecimal redepositAmount = new BigDecimal("0.00");//鎶垫墸閲戦
+ for (int columnIndex = 0; columnIndex < jsonArray.size(); columnIndex++) {
+ JSONObject param = jsonArray.getJSONObject(columnIndex);
+ //璐︽埛閲戦
+ BigDecimal amount = new BigDecimal(param.getString("amount")); //璐︽埛閲戦
+ int flag = amount.compareTo(receivedAmount);
+ if (flag == -1) {//璐︽埛閲戦灏忎簬瀹炴敹娆�
+ receivedAmount = receivedAmount.subtract(amount);
+ redepositAmount = amount;//鎶垫墸閲戦
+ } else {
+ redepositAmount = receivedAmount;//鎶垫墸閲戦
+ }
+ //鍓╀綑閲戦
+ amount.compareTo(receivedAmount);
+ String acctId = param.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, "鏌ヨ璐︽埛閲戦閿欒锛�");
+ if (accountDtos != null && accountDtos.size() > 0) {
+ AccountDto accountDto1 = accountDtos.get(0);
+ BigDecimal accountDto1Amount = new BigDecimal(accountDto1.getAmount());
+ if (accountDto1Amount.compareTo(redepositAmount) == -1) {
+ throw new UnsupportedOperationException("璐︽埛閲戦鎶垫墸涓嶈冻锛岃鎮ㄧ‘璁よ处鎴烽噾棰濓紒");
+ }
+ }
- if (amount < deductionAmount && deductionAmount > 0) {
- throw new IllegalArgumentException("浣欓涓嶈冻");
+
+ AccountDetailPo accountDetailPo = new AccountDetailPo();
+ accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ int flag1 = redepositAmount.compareTo(BigDecimal.ZERO);
+ if (flag1 == 1) {
+ accountDetailPo.setAmount(redepositAmount + "");
+ accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_OUT);
+ accountDetailPo.setRemark("鍓嶅彴缂磋垂鎵ｆ");
+ }
+ accountDetailPo.setOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orderId));
+ accountDetailPo.setObjType(accountDtos.get(0).getObjType());
+ accountDetailPo.setObjId(accountDtos.get(0).getObjId());
+ accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
+ accountDetailPo.setRelAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ACCT_DETAIL);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(accountDetailPo.getClass().getSimpleName(), BeanConvertUtil.beanCovertMap(accountDetailPo));
+ businesses.add(business);
+ }
+
}
- 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("鍓嶅彴缂磋垂鎵ｆ");
- } 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