优化代码

java110

2022-09-30 8befc3dddb49edd0d6c09ab6e4c182a6df8b0b87

 service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeePreCmd.java

@@ -4,7 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
@@ -13,6 +13,7 @@
import com.java110.dto.community.CommunityDto;
import com.java110.dto.couponUser.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;
@@ -23,7 +24,6 @@
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.feeAccountDetail.IFeeAccountDetailServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.account.AccountPo;
import com.java110.po.accountDetail.AccountDetailPo;
@@ -60,9 +60,9 @@
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
 */
@Java110Cmd(serviceCode = "fee.payFeePre")
public class PayFeePreCmd extends AbstractServiceCmdListener {
    private static Logger logger = LoggerFactory.getLogger(PayFeePreCmd.class);
public class PayFeePreCmd extends Cmd {

    private static Logger logger = LoggerFactory.getLogger(PayFeePreCmd.class);

    @Autowired
    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@@ -122,6 +122,45 @@
        Assert.hasLength(reqJson.getString("receivedAmount"), "实收金额不能为空");
        Assert.hasLength(reqJson.getString("feeId"), "费用ID不能为空");
        Assert.hasLength(reqJson.getString("appId"), "appId不能为空");


        //判断是否 费用状态为缴费结束
        FeeDto feeDto = new FeeDto();
        feeDto.setFeeId(reqJson.getString("feeId"));
        feeDto.setCommunityId(reqJson.getString("communityId"));
        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);

        Assert.listOnlyOne(feeDtos, "传入费用ID错误");

        feeDto = feeDtos.get(0);

        if (FeeDto.STATE_FINISH.equals(feeDto.getState())) {
            throw new IllegalArgumentException("收费已经结束，不能再缴费");
        }

        Date endTime = feeDto.getEndTime();

        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setConfigId(feeDto.getConfigId());
        feeConfigDto.setCommunityId(reqJson.getString("communityId"));
        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);

        if (feeConfigDtos != null && feeConfigDtos.size() == 1) {
            try {
                Date configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
                configEndTime = DateUtil.stepDay(configEndTime, 5);

                Date newDate = DateUtil.stepMonth(endTime, reqJson.getInteger("cycles"));

                if (newDate.getTime() > configEndTime.getTime()) {
                    throw new IllegalArgumentException("缴费周期超过 缴费结束时间");
                }

            } catch (Exception e) {
                logger.error("比较费用日期失败", e);
            }
        }

    }

    @Override
@@ -247,12 +286,21 @@
        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(tmpAccountDto.getMaximumNumber());
                BigDecimal maximumNumber = new BigDecimal(maximum);
                //获取积分抵扣比例
                BigDecimal deductionProportion = new BigDecimal(tmpAccountDto.getDeductionProportion());
                BigDecimal deductionProportion = new BigDecimal(deduction);
                int flag = amount.compareTo(maximumNumber);
                BigDecimal redepositAmount = new BigDecimal("0.00");
                BigDecimal integralAmount = new BigDecimal("0.00");
@@ -274,24 +322,24 @@
                    redepositAmount = amount;
                }
                //更新账户信息
                AccountPo accountPo = new AccountPo();
                accountPo.setAcctId(tmpAccountDto.getAcctId());
                accountPo.setAmount(integralAmount.toString());
                accountInnerServiceSMOImpl.updateAccount(accountPo);
//                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);
//                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);
@@ -301,24 +349,24 @@
                //生成抵扣明细记录
                FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
                if (flag2 == -1) { //积分换算金额小于应付金额
                    subtract = dedAmount.subtract(divide);
                    //subtract = dedAmount.subtract(divide);
                    BigDecimal multiply = divide.multiply(deductionProportion);
                    feeAccountDetailPo.setAmount(multiply.toString()); //积分抵扣金额
                } else if (flag < 1) { //积分换算金额小于等于应付金额
                    subtract = dedAmount.subtract(divide);
                    //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", subtract);
                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 = subtract;
                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());
@@ -350,48 +398,49 @@
                    redepositAmount = amount;
                }
                //更新账户信息
                AccountPo accountPo = new AccountPo();
                accountPo.setAcctId(tmpAccountDto.getAcctId());
                accountPo.setAmount(integralAmount.toString());
                accountInnerServiceSMOImpl.updateAccount(accountPo);
//                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);
//                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);
                int flag2 = money.compareTo(amount);
//                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 (flag > -1) { //剩余金额大于等于现金账户
                if (flag2 > -1) { //剩余金额大于等于现金账户
                    money = money.subtract(amount);
                }
                if (flag == -1) { //剩余金额小于现金账户
                if (flag2 == -1) { //剩余金额小于现金账户
                    money = new BigDecimal(0);
                }
                if (flag < 1) { //剩余金额小于等于现金账户
                if (flag2 < 1) { //剩余金额小于等于现金账户
                    money = new BigDecimal(0);
                }
                if (flag == 0) { //剩余金额等于现金账户
                if (flag2 == 0) { //剩余金额等于现金账户
                    money = new BigDecimal(0);
                }
                }*/
            }
//            totalAccountAmount = totalAccountAmount.add(new BigDecimal(tmpAccountDto.getAmount()));
        }