| | |
| | | payOrderDto.setFinalAmount(payOrderDto.getOrderAmount()); |
| | | } |
| | | if (payOrderDto.getType()==1&&payOrderDto.getStatus()==3){ |
| | | payOrderDto.setFinalAmount(payOrderDto.getRechargeAmount()); |
| | | payOrderDto.setOrderAmount(payOrderDto.getRechargeAmount()); |
| | | payOrderDto.setPaymentAmount(payOrderDto.getRechargeAmount()); |
| | | payOrderDto.setFinalAmount(payOrderDto.getOrderAmount()); |
| | | payOrderDto.setOrderAmount(payOrderDto.getOrderAmount()); |
| | | payOrderDto.setPaymentAmount(payOrderDto.getOrderAmount()); |
| | | } |
| | | } |
| | | pageInfo.setRecords(list); |
| | |
| | | tSettlementConfirm.setIncome(dto.getElectrovalence().add(dto.getServiceCharge())); |
| | | tSettlementConfirm.setCost(dto.getVenue().add(dto.getClean()).add(dto.getMaintain()).add(dto.getSupplyElectronic())); |
| | | BigDecimal divide1 = tSettlementConfirm.getProportionMoney().divide(tSettlementConfirm.getProportionPartner(), 2, RoundingMode.HALF_DOWN); |
| | | tSettlementConfirm.setProfitMoney(tSettlementConfirm.getServiceMoney().multiply(tSettlementConfirm.getServicePartner()) |
| | | tSettlementConfirm.setProfitMoney(subtract2.subtract(tSettlementConfirm.getCost())); |
| | | tSettlementConfirm.setNewSettlement(tSettlementConfirm.getServiceMoney().multiply(tSettlementConfirm.getServicePartner()) |
| | | .subtract(divide1)); |
| | | tSettlementConfirm.setNewSettlement(subtract2.subtract(tSettlementConfirm.getCost())); |
| | | |
| | | |
| | | tSettlementConfirmMapper.insert(tSettlementConfirm); |