Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-06-29 b173d31976fc4731b7c247d4038de92134eba317

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

@@ -8,10 +8,10 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.community.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.rentingPool.RentingPoolDto;
import com.java110.dto.renting.RentingPoolDto;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -21,15 +21,13 @@
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.rentingPool.RentingPoolPo;
import com.java110.po.renting.RentingPoolPo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

import java.math.BigDecimal;
import java.text.ParseException;
@@ -104,6 +102,8 @@
            payFeeDetailPo.setReceivedAmount(receivableAmount + "");
            payFeeDetailPo.setCommunityId(rentingPoolDto.getCommunityId());
            payFeeDetailPo.setPayOrderId(payFeeDetailPo.getDetailId());
            payFeeDetailPo.setCashierId("-1");
            payFeeDetailPo.setCashierName("系统收银");
            payFeeDetailPo.setState("1400");
            //添加单元信息
            flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
@@ -158,7 +158,8 @@
            payFeeDetailPo.setReceivedAmount(receivableAmount + "");
            payFeeDetailPo.setCommunityId(rentingPoolDto.getCommunityId());
            payFeeDetailPo.setPayOrderId(payFeeDetailPo.getDetailId());

            payFeeDetailPo.setCashierId("-1");
            payFeeDetailPo.setCashierName("系统收银");
            //添加单元信息
            flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
            if (flag < 1) {
@@ -212,7 +213,8 @@
            payFeeDetailPo.setReceivedAmount(receivableAmount + "");
            payFeeDetailPo.setCommunityId(rentingPoolDto.getCommunityId());
            payFeeDetailPo.setPayOrderId(payFeeDetailPo.getDetailId());

            payFeeDetailPo.setCashierId("-1");
            payFeeDetailPo.setCashierName("系统收银");
            //添加单元信息
            flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
            if (flag < 1) {