From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java | 181 +--------------------------------------------
1 files changed, 5 insertions(+), 176 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java
index 203a287..88b55b2 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java
@@ -11,12 +11,12 @@
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.account.AccountDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.couponUser.CouponUserDto;
+import com.java110.dto.couponPool.CouponUserDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeDiscount.ComputeDiscountDto;
+import com.java110.dto.fee.ComputeDiscountDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
@@ -25,9 +25,6 @@
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
-import com.java110.po.account.AccountPo;
-import com.java110.po.accountDetail.AccountDetailPo;
-import com.java110.po.feeAccountDetail.FeeAccountDetailPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.CmdException;
@@ -35,7 +32,6 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -167,8 +163,11 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
logger.debug("ServiceDataFlowEvent : {}", event);
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
String appId = cmdDataFlowContext.getReqHeaders().get("app-id");
reqJson.put("appId", appId);
+ reqJson.put("userId",userId);
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(reqJson.getString("feeId"));
@@ -283,177 +282,7 @@
}
BigDecimal money = new BigDecimal(0);
- BigDecimal totalAccountAmount = new BigDecimal(0);
- for (AccountDto tmpAccountDto : accountDtos) {
- if (!StringUtil.isEmpty(tmpAccountDto.getAcctType()) && tmpAccountDto.getAcctType().equals("2004")) { //绉垎璐︽埛
- String maximum = "";
- String deduction = "";
- for (int index = 0; index < selectUserAccount.size(); index++) {
- JSONObject param = selectUserAccount.getJSONObject(index);
- if (!StringUtil.isEmpty(param.getString("acctType")) && param.getString("acctType").equals("2004")) { //绉垎璐︽埛
- maximum = param.getString("maximumNumber");
- deduction = param.getString("deductionProportion");
- }
- }
- //璐︽埛閲戦
- BigDecimal amount = new BigDecimal(tmpAccountDto.getAmount());
- //鑾峰彇鏈�澶ф姷鎵ｇН鍒�
- BigDecimal maximumNumber = new BigDecimal(maximum);
- //鑾峰彇绉垎鎶垫墸姣斾緥
- BigDecimal deductionProportion = new BigDecimal(deduction);
- int flag = amount.compareTo(maximumNumber);
- BigDecimal redepositAmount = new BigDecimal("0.00");
- BigDecimal integralAmount = new BigDecimal("0.00");
- if (flag == 1) { //璐︽埛绉垎澶т簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
- redepositAmount = maximumNumber;
- integralAmount = amount.subtract(maximumNumber);
- }
- if (flag > -1) { //璐︽埛绉垎澶т簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤鏈�澶т娇鐢ㄧН鍒嗘姷鎵�
- redepositAmount = maximumNumber;
- integralAmount = amount.subtract(maximumNumber);
- }
- if (flag == -1) { //璐︽埛绉垎灏忎簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
- redepositAmount = amount;
- }
- if (flag < 1) { //璐︽埛绉垎灏忎簬绛変簬鏈�澶т娇鐢ㄧН鍒嗭紝灏辩敤璐︽埛绉垎鎶垫墸
- redepositAmount = amount;
- }
- if (flag == 0) { //璐︽埛绉垎绛変簬鏈�澶т娇鐢ㄧН鍒�
- redepositAmount = amount;
- }
- //鏇存柊璐︽埛淇℃伅
- AccountPo accountPo = new AccountPo();
- accountPo.setAcctId(tmpAccountDto.getAcctId());
- accountPo.setAmount(integralAmount.toString());
- accountInnerServiceSMOImpl.updateAccount(accountPo);
- //鐢熸垚璐︽埛璇︽儏
- AccountDetailPo accountDetailPo = new AccountDetailPo();
- accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- accountDetailPo.setAcctId(tmpAccountDto.getAcctId());
- accountDetailPo.setDetailType("2002"); //1001 杞叆 2002 杞嚭
- accountDetailPo.setRelAcctId("-1");
- accountDetailPo.setAmount(redepositAmount.toString());
- accountDetailPo.setObjType("6006"); //6006 涓汉 7007 鍟嗘埛
- accountDetailPo.setObjId(tmpAccountDto.getObjId());
- accountDetailPo.setOrderId("-1");
- accountDetailPo.setbId("-1");
- accountDetailPo.setRemark("鎵嬫満绔Н鍒嗘姷鎵�");
- accountDetailPo.setCreateTime(new Date());
- accountDetailInnerServiceSMOImpl.saveAccountDetails(accountDetailPo);
- //璁＄畻绉垎鎹㈢畻鐨勯噾棰�
- BigDecimal divide = redepositAmount.divide(deductionProportion);
- BigDecimal dedAmount = new BigDecimal(deductionAmount);
- //璁＄畻瀹炰粯閲戦
- int flag2 = divide.compareTo(dedAmount);
- BigDecimal subtract = new BigDecimal("0.00");
- //鐢熸垚鎶垫墸鏄庣粏璁板綍
- FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
- if (flag2 == -1) { //绉垎鎹㈢畻閲戦灏忎簬搴斾粯閲戦
- //subtract = dedAmount.subtract(divide);
- BigDecimal multiply = divide.multiply(deductionProportion);
- feeAccountDetailPo.setAmount(multiply.toString()); //绉垎鎶垫墸閲戦
- } else if (flag < 1) { //绉垎鎹㈢畻閲戦灏忎簬绛変簬搴斾粯閲戦
- //subtract = dedAmount.subtract(divide);
- BigDecimal multiply = divide.multiply(deductionProportion);
- feeAccountDetailPo.setAmount(multiply.toString()); //绉垎鎶垫墸閲戦
- } else {
- BigDecimal multiply = dedAmount.multiply(deductionProportion);
- feeAccountDetailPo.setAmount(multiply.toString()); //绉垎鎶垫墸閲戦
- }
- reqJson.put("receivedMoney", divide);
- feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
- feeAccountDetailPo.setDetailId(accountDetailPo.getDetailId());
- feeAccountDetailPo.setCommunityId(reqJson.getString("communityId"));
- feeAccountDetailPo.setState("1003"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
- feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
- money = divide;
- } else if (!StringUtil.isEmpty(tmpAccountDto.getAcctType()) && tmpAccountDto.getAcctType().equals("2003")) { //鐜伴噾璐︽埛
- //璐︽埛閲戦
- BigDecimal amount = new BigDecimal(tmpAccountDto.getAmount());
- //鑾峰彇搴旀敹閲戦
- BigDecimal dedAmount = new BigDecimal("0.00");
- if (reqJson.containsKey("receivedMoney") && !StringUtil.isEmpty(reqJson.getString("receivedMoney"))) {
- dedAmount = new BigDecimal(reqJson.getString("receivedMoney"));
- } else {
- dedAmount = new BigDecimal(reqJson.getString("deductionAmount"));
- }
- int flag = amount.compareTo(dedAmount);
- BigDecimal redepositAmount = new BigDecimal("0.00");
- BigDecimal integralAmount = new BigDecimal("0.00");
- if (flag == 1) { //鐜伴噾璐︽埛澶т簬搴旀敹閲戦锛屽氨鐢ㄥ簲鏀堕噾棰濇姷鎵�
- redepositAmount = dedAmount;
- integralAmount = amount.subtract(dedAmount);
- }
- if (flag > -1) { //鐜伴噾璐︽埛澶т簬绛変簬搴旀敹閲戦锛屽氨鐢ㄥ簲鏀堕噾棰濇姷鎵�
- redepositAmount = dedAmount;
- integralAmount = amount.subtract(dedAmount);
- }
- if (flag == -1) { //鐜伴噾璐︽埛灏忎簬瀹炴敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴锋姷鎵�
- redepositAmount = amount;
- }
- if (flag < 1) { //鐜伴噾璐︽埛灏忎簬绛変簬搴旀敹閲戦锛屽氨鐢ㄧ幇閲戣处鎴锋姷鎵�
- redepositAmount = amount;
- }
- if (flag == 0) { //鐜伴噾璐︽埛绛変簬搴旀敹閲戦
- redepositAmount = amount;
- }
- //鏇存柊璐︽埛淇℃伅
- AccountPo accountPo = new AccountPo();
- accountPo.setAcctId(tmpAccountDto.getAcctId());
- accountPo.setAmount(integralAmount.toString());
- accountInnerServiceSMOImpl.updateAccount(accountPo);
- //鐢熸垚璐︽埛璇︽儏
- AccountDetailPo accountDetailPo = new AccountDetailPo();
- accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- accountDetailPo.setAcctId(tmpAccountDto.getAcctId());
- accountDetailPo.setDetailType("2002"); //1001 杞叆 2002 杞嚭
- accountDetailPo.setRelAcctId("-1");
- accountDetailPo.setAmount(redepositAmount.toString());
- accountDetailPo.setObjType("6006"); //6006 涓汉 7007 鍟嗘埛
- accountDetailPo.setObjId(tmpAccountDto.getObjId());
- accountDetailPo.setOrderId("-1");
- accountDetailPo.setbId("-1");
- accountDetailPo.setRemark("鎵嬫満绔幇閲戣处鎴锋姷鎵�");
- accountDetailPo.setCreateTime(new Date());
- accountDetailInnerServiceSMOImpl.saveAccountDetails(accountDetailPo);
- //鐢熸垚鎶垫墸鏄庣粏璁板綍
- FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
- feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
- feeAccountDetailPo.setDetailId(accountDetailPo.getDetailId());
- feeAccountDetailPo.setCommunityId(reqJson.getString("communityId"));
- feeAccountDetailPo.setState("1002"); //1001 鏃犳姷鎵� 1002 鐜伴噾璐︽埛鎶垫墸 1003 绉垎璐︽埛鎶垫墸 1004 浼樻儬鍒告姷鎵�
- feeAccountDetailPo.setAmount(redepositAmount.toString()); //绉垎鎶垫墸閲戦
- feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
- money = money.add(redepositAmount);
- /*int flag2 = money.compareTo(amount);
- if (flag2 == 1) { //鍓╀綑閲戦澶т簬鐜伴噾璐︽埛
- money = money.subtract(amount);
- }
- if (flag2 > -1) { //鍓╀綑閲戦澶т簬绛変簬鐜伴噾璐︽埛
- money = money.subtract(amount);
- }
- if (flag2 == -1) { //鍓╀綑閲戦灏忎簬鐜伴噾璐︽埛
- money = new BigDecimal(0);
- }
- if (flag2 < 1) { //鍓╀綑閲戦灏忎簬绛変簬鐜伴噾璐︽埛
- money = new BigDecimal(0);
- }
- if (flag2 == 0) { //鍓╀綑閲戦绛変簬鐜伴噾璐︽埛
- money = new BigDecimal(0);
- }*/
- }
-// totalAccountAmount = totalAccountAmount.add(new BigDecimal(tmpAccountDto.getAmount()));
- }
- /* double tmpDeductionAmount = totalAccountAmount.subtract(new BigDecimal(deductionAmount)).doubleValue();
- if (tmpDeductionAmount < 0) {
- reqJson.put("deductionAmount", totalAccountAmount.doubleValue());
- reqJson.put("selectUserAccount", BeanConvertUtil.beanCovertJSONArray(accountDtos));
- return totalAccountAmount.doubleValue();
- }
- reqJson.put("deductionAmount", deductionAmount);
- reqJson.put("selectUserAccount", BeanConvertUtil.beanCovertJSONArray(accountDtos));
- return deductionAmount;*/
reqJson.put("deductionAmount", money.doubleValue());
reqJson.put("selectUserAccount", BeanConvertUtil.beanCovertJSONArray(accountDtos));
return money.doubleValue();
--
Gitblit v1.8.0