| @@ -21,6 +21,7 @@ import com.iformall.domain.vo.WxBillSum; | |||
| import com.iformall.domain.vo.WxMerchantBillVo; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumBillOweOrNearType; | |||
| import com.iformall.enums.EnumBillStatus; | |||
| import com.iformall.enums.EnumRentContractManageFeeType; | |||
| import com.iformall.enums.EnumYesOrNo; | |||
| import com.iformall.service.ExcelService; | |||
| @@ -257,6 +258,19 @@ public class WxBillAllController extends BillBaseController { | |||
| return new ResultData(tmap); | |||
| } | |||
| /** | |||
| * 账单状态 | |||
| * @return | |||
| */ | |||
| @GetMapping("billStatus") | |||
| public ResultData billStatus() { | |||
| Map<Integer,String> tmap = new HashMap<Integer,String>(); | |||
| for (EnumBillStatus t : EnumBillStatus.values()) { | |||
| tmap.put(t.getCode(), t.getMessage()); | |||
| } | |||
| return new ResultData(tmap); | |||
| } | |||
| /** | |||
| * 欠缴账单列表 | |||
| @@ -2543,3 +2543,106 @@ alter table wx_bill_other_deposit_97 add column last_owe_call_user varc | |||
| alter table wx_bill_other_deposit_98 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_other_deposit_99 add column last_owe_call_user varchar(100) comment '最后催缴人员'; | |||
| alter table wx_bill_action_0 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_1 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_2 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_3 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_4 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_5 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_6 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_7 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_8 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_9 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_10 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_11 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_12 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_13 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_14 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_15 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_16 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_17 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_18 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_19 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_20 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_21 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_22 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_23 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_24 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_25 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_26 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_27 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_28 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_29 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_30 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_31 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_32 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_33 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_34 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_35 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_36 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_37 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_38 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_39 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_40 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_41 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_42 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_43 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_44 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_45 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_46 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_47 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_48 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_49 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_50 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_51 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_52 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_53 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_54 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_55 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_56 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_57 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_58 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_59 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_60 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_61 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_62 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_63 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_64 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_65 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_66 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_67 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_68 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_69 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_70 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_71 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_72 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_73 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_74 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_75 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_76 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_77 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_78 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_79 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_80 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_81 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_82 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_83 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_84 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_85 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_86 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_87 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_88 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_89 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_90 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_91 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_92 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_93 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_94 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_95 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_96 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_97 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_98 add column pay_way int(3) comment '支付方式'; | |||
| alter table wx_bill_action_99 add column pay_way int(3) comment '支付方式'; | |||
| @@ -57,6 +57,9 @@ public class WxBillAction extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "付款时间", name = "payDate") | |||
| private Date payDate; | |||
| @io.swagger.annotations.ApiModelProperty(value = "付款方式EnumBillPayWay", name = "payWay") | |||
| private Integer payWay; | |||
| @io.swagger.annotations.ApiModelProperty(value = "备注", name = "remark") | |||
| private String remark; | |||
| @@ -43,13 +43,23 @@ public enum EnumBillAction { | |||
| return message; | |||
| } | |||
| public String getDescription(String oldMoney,String newMoney) { | |||
| public String getDescription(String oldMoney,String newMoney,Integer payWay) { | |||
| EnumBillPayWay pw = null; | |||
| if (null != payWay) { | |||
| pw = EnumBillPayWay.getEnum(payWay); | |||
| } | |||
| StringBuffer sb = new StringBuffer("[").append(this.message).append("]"); | |||
| if (code.intValue() == SELF_SERVICE_PAY.code.intValue()) { | |||
| if (null != pw) { | |||
| sb.append(pw.getMessage()).append("支付"); | |||
| } | |||
| sb.append(newMoney).append("元"); | |||
| }else if (code.intValue() == UPDATE_BILL.code.intValue()) { | |||
| sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元"); | |||
| }else if (code.intValue() == OFFLINE_PAY.code.intValue()) { | |||
| if (null != pw) { | |||
| sb.append(pw.getMessage()).append("支付"); | |||
| } | |||
| sb.append(newMoney).append("元"); | |||
| }else if (code.intValue() == DEPOSIT_PAY.code.intValue()) { | |||
| sb.append(newMoney).append("元"); | |||
| @@ -70,6 +70,7 @@ public class WxBillActionServiceImpl implements WxBillActionService { | |||
| wxBillAction.setPhone(phone); | |||
| wxBillAction.updateTenantInfo(tenantEntity); | |||
| wxBillAction.setPayDate(action.getPayDate()); | |||
| wxBillAction.setPayWay(action.getPayWay()); | |||
| wxBillAction.setRemark(action.getRemark()); | |||
| Date date = new Date(); | |||
| wxBillAction.setCreatetime(date); | |||
| @@ -23,29 +23,31 @@ public class WxBillBaseService{ | |||
| @Autowired | |||
| private WxBillActionService wxBillActionService; | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, MallUserInfo mallUserInfo) { | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark, MallUserInfo mallUserInfo) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setBillType(billType); | |||
| wxBillAction.setOldMoney(oldMoney); | |||
| wxBillAction.setNewMoney(newMoney); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney)); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay)); | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| wxBillAction.setPayWay(payWay); | |||
| wxBillAction.setRemark(remark); | |||
| wxBillAction.setUserType(EnumSystemUserType.ADMIN.getCode()); | |||
| wxBillActionService.modifyBill(wxBillAction, mallUserInfo); | |||
| } | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, WxMerchantBUser bUser) { | |||
| protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark, WxMerchantBUser bUser) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setBillType(billType); | |||
| wxBillAction.setOldMoney(oldMoney); | |||
| wxBillAction.setNewMoney(newMoney); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney)); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay)); | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| wxBillAction.setPayWay(payWay); | |||
| wxBillAction.setRemark(remark); | |||
| wxBillAction.setUserType(EnumSystemUserType.MERCHANT.getCode()); | |||
| wxBillActionService.modifyBill(wxBillAction, bUser); | |||
| @@ -439,31 +439,36 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| if (forcePaid) { | |||
| wxBillDaily.setReceivePay(dbBill.getPay()); | |||
| wxBillDaily.setStatus(EnumBillStatus.PAID.getCode()); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), | |||
| dbBill.getPay(),null, dto.getRemark(), user); | |||
| dbBill.getPay(),null,null, remark, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillDaily.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,dto.getRemark(), user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillDaily.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| } else { | |||
| //租赁账单更新 | |||
| wxBillDaily.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillDaily.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillDailyMapper.updateById(wxBillDaily); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -478,14 +483,14 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDaily wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(), dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user); | |||
| } | |||
| private WxBillDaily updateBillPay(WxBillPayDTO dto) { | |||
| @@ -502,6 +507,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -513,7 +519,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillDaily wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -423,22 +423,27 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| billDepositOldPrce = dbBill.getPay(); | |||
| billDepositNewPrce = dbBill.getPay(); | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, | |||
| billDepositNewPrce,payDate, dto.getRemark(), user); | |||
| billDepositNewPrce,payDate, null, remark, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| }else { | |||
| wxBillDeposit.setReceivePay(dto.getNewPrice()); | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillDeposit.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillDepositMapper.updateById(wxBillDeposit); | |||
| this.addBillAction(EnumBillAction.DEPOSIT_MODIFY, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce, | |||
| billDepositNewPrce,payDate, dto.getRemark(), user); | |||
| billDepositNewPrce,payDate,payWay,remark, user); | |||
| } | |||
| @@ -454,14 +459,14 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(), dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user); | |||
| } | |||
| private WxBillDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -478,6 +483,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -489,7 +495,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -408,25 +408,30 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillOtherDeposit.setReceivePay(dbBill.getPay()); | |||
| wxBillOtherDeposit.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),null, dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null, remark, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillOtherDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| }else { | |||
| wxBillOtherDeposit.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillOtherDeposit.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillOtherDepositMapper.updateById(wxBillOtherDeposit); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user); | |||
| } | |||
| } | |||
| @@ -440,14 +445,14 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOtherDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(), dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user); | |||
| } | |||
| private WxBillOtherDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -464,6 +469,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -475,7 +481,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillOtherDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -350,25 +350,30 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillOther.setReceivePay(dbBill.getPay()); | |||
| wxBillOther.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillOtherMapper.updateById(wxBillOther); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),null, dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),null,null, remark, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillOther.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillOtherMapper.updateById(wxBillOther); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| }else { | |||
| wxBillOther.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillOther.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillOtherMapper.updateById(wxBillOther); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user); | |||
| } | |||
| @@ -384,14 +389,14 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillOther wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(), dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user); | |||
| } | |||
| private WxBillOther updateBillPay(WxBillPayDTO dto) { | |||
| @@ -408,6 +413,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -419,6 +425,6 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillOther wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -401,25 +401,30 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| billPropertyDepositOldPrce = dbBill.getPay(); | |||
| billPropertyDepositNewPrce = dbBill.getPay(); | |||
| wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,null, dto.getRemark(), user); | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,null, remark, user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillPropertyDeposit.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| }else { | |||
| wxBillPropertyDeposit.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillPropertyDeposit.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,payDate, dto.getRemark(), user); | |||
| billPropertyDepositOldPrce, billPropertyDepositNewPrce,payDate, payWay,remark, user); | |||
| } | |||
| } | |||
| @@ -434,14 +439,14 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillPropertyDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(), dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user); | |||
| } | |||
| private WxBillPropertyDeposit updateBillPay(WxBillPayDTO dto) { | |||
| @@ -458,6 +463,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -469,7 +475,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillPropertyDeposit wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| @@ -485,30 +485,35 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillProperty.setReceivePay(dbBill.getPay()); | |||
| wxBillProperty.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dbBill.getPay(), dbBill.getPay(),null,dto.getRemark(), user); | |||
| dbBill.getPay(), dbBill.getPay(),null,null,remark, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillProperty.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,dto.getRemark(), user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillProperty.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| } else { | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| wxBillProperty.setReceivePay(dto.getNewPrice()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillProperty.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillPropertyMapper.updateById(wxBillProperty); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -523,14 +528,14 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillProperty wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| private WxBillProperty updateBillPay(WxBillPayDTO dto) { | |||
| @@ -547,6 +552,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -558,6 +564,6 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillProperty wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -414,30 +414,35 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setReceivePay(dbBill.getPay()); | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,dto.getRemark(), user); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillRent.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,dto.getRemark(), user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| } else { | |||
| //租赁账单更新 | |||
| wxBillRent.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -452,14 +457,14 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRentManage wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| private WxBillRentManage updateBillPay(WxBillPayDTO dto) { | |||
| @@ -476,6 +481,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -487,7 +493,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillRentManage wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -579,30 +579,35 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setReceivePay(dbBill.getPay()); | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,dto.getRemark(), user); | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。"; | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark, user); | |||
| }else { | |||
| if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) { | |||
| wxBillRent.setLatePayPrice(dto.getNewLatePrice()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,dto.getRemark(), user); | |||
| dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user); | |||
| }else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) { | |||
| wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(), | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,dto.getRemark(), user); | |||
| dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user); | |||
| }else { | |||
| //租赁账单更新 | |||
| wxBillRent.setReceivePay(dto.getNewPrice()); | |||
| Date payDate = null; | |||
| Integer payWay = null; | |||
| String remark = StringUtils.trimToEmpty(dto.getRemark()); | |||
| if (new BigDecimal(dto.getNewPrice()).compareTo(new BigDecimal(dbBill.getPay())) <= 0) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| payDate = new Date(); | |||
| payWay = EnumBillPayWay.OTHER.getCode(); | |||
| remark = remark + ";【系统】账单实际应付金额调整至小于等于已付金额,自动归结为结清。"; | |||
| } | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| //账单日志 | |||
| this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,dto.getRemark(), user); | |||
| dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -617,14 +622,14 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")"); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(), | |||
| null, null,null,dto.getRemark(), user); | |||
| null, null,null,null,dto.getRemark(), user); | |||
| } | |||
| @Override | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user) { | |||
| WxBillRent wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| private WxBillRent updateBillPay(WxBillPayDTO dto) { | |||
| @@ -641,6 +646,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setPay(opay.toPlainString()); | |||
| if (opay.compareTo(new BigDecimal(dbBill.getReceivePay())) >= 0 ) { | |||
| wxBillRent.setStatus(EnumBillStatus.PAID.getCode()); | |||
| dto.setRemark(StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单已付金额调整后已大于等于实际应付金额,自动归结为结清。"); | |||
| } | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| @@ -652,6 +658,6 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user) { | |||
| WxBillRent wxBillRent = updateBillPay(dto); | |||
| this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(), | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getRemark(), user); | |||
| dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -18,11 +18,12 @@ | |||
| <result column="createtime" jdbcType="TIMESTAMP" property="createtime"/> | |||
| <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/> | |||
| <result column="pay_date" jdbcType="TIMESTAMP" property="payDate"/> | |||
| <result column="pay_way" jdbcType="INTEGER" property="payWay"/> | |||
| <result column="remark" jdbcType="VARCHAR" property="remark"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`bill_type`,`bill_id`,`old_money`,`new_money`,`user_Type`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`,`pay_date`,`remark` | |||
| `id`,`tenant_id`,`parent_tenant_id`,`bill_type`,`bill_id`,`old_money`,`new_money`,`user_Type`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`,`pay_date`,`pay_way`,`remark` | |||
| </sql> | |||