| @@ -14,3 +14,4 @@ ALTER TABLE wx_bill_action ADD COLUMN `old_money` VARCHAR(30) COMMENT '原有 | |||
| ALTER TABLE wx_bill_action ADD COLUMN `new_money` VARCHAR(30) COMMENT '变更后金额' AFTER `bill_id`; | |||
| ALTER TABLE wx_bill_action ADD COLUMN `remark` VARCHAR(1000) COMMENT '备注'; | |||
| ALTER TABLE wx_bill_action ADD COLUMN `user_Type` int(3) COMMENT '用户类型' AFTER `bill_id`; | |||
| @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.common.SysConfigConstant; | |||
| import com.iformall.domain.dto.WxBillPayDTO; | |||
| import com.iformall.domain.po.SysConfig; | |||
| import com.iformall.domain.po.WxFlowModel; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| @@ -251,7 +252,6 @@ public class WxBillController extends BaseController { | |||
| return wxBillAllService.pageListBill(wxBillAll,wxMerchant,true,true,true); | |||
| } | |||
| @GetMapping("/findSettleById") | |||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | |||
| @ApiOperation("账单管理-结算单-id查找") | |||
| @@ -16,4 +16,5 @@ public class WxBillPayDTO extends TenantEntity{ | |||
| private String addpay;//支付金额 | |||
| private Integer payWay;//支付方式 EnumBillPayWay | |||
| private String remark; | |||
| private String image; | |||
| } | |||
| @@ -30,6 +30,9 @@ public class WxBillAction extends TenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "变更后金额", name = "newMoney") | |||
| private String newMoney; | |||
| @io.swagger.annotations.ApiModelProperty(value = "用户ID,EnumSystemUserType", name = "userType") | |||
| private Integer userType; | |||
| @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") | |||
| private Long userId; | |||
| @@ -0,0 +1,33 @@ | |||
| package com.iformall.enums; | |||
| /** | |||
| */ | |||
| public enum EnumSystemUserType { | |||
| ADMIN(1, "商管"), | |||
| MERCHANT(2, "商户员工"); | |||
| public static EnumSystemUserType getEnum(Integer code) { | |||
| for (EnumSystemUserType value : values()) { | |||
| if (value.getCode().equals(code)) { | |||
| return value; | |||
| } | |||
| } | |||
| return null; | |||
| } | |||
| private Integer code; | |||
| private String message; | |||
| EnumSystemUserType(Integer code, String message) { | |||
| this.code = code; | |||
| this.message = message; | |||
| } | |||
| public Integer getCode() { | |||
| return code; | |||
| } | |||
| public String getMessage() { | |||
| return message; | |||
| } | |||
| } | |||
| @@ -3,6 +3,7 @@ package com.iformall.service; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillAction; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import java.util.List; | |||
| @@ -16,6 +17,8 @@ public interface WxBillActionService { | |||
| int save(WxBillAction action); | |||
| int modifyBill(WxBillAction wxBillAction, MallUserInfo mallUserInfo); | |||
| int modifyBill(WxBillAction wxBillAction, WxMerchantBUser bUser); | |||
| List<WxBillAction> find(WxBillAction record); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillDaily; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillDailyVo; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -75,5 +76,7 @@ public interface WxBillDailyService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -13,6 +13,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -77,5 +78,6 @@ public interface WxBillDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillOtherDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| @@ -74,5 +75,5 @@ public interface WxBillOtherDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillOther; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| @@ -70,5 +71,5 @@ public interface WxBillOtherService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid) ; | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -13,6 +13,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillPropertyDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -79,4 +80,5 @@ public interface WxBillPropertyDepositService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillProperty; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| @@ -85,4 +86,5 @@ public interface WxBillPropertyService { | |||
| public void updateReceivePay(WxBillReceiveUpdateDTO dto, MallUserInfo user, boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxBillRentManage; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -85,4 +86,5 @@ public interface WxBillRentManageService { | |||
| void updateReceivePay(WxBillReceiveUpdateDTO dto,MallUserInfo user,boolean forcePaid); | |||
| public void updatePay(WxBillPayDTO dto, MallUserInfo user); | |||
| public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user); | |||
| } | |||
| @@ -6,6 +6,7 @@ import com.iformall.domain.dto.WxBillPayDTO; | |||
| import com.iformall.domain.dto.WxBillReceiveUpdateDTO; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| import com.iformall.domain.vo.WxBillSum; | |||
| @@ -86,6 +87,7 @@ public interface WxBillRentService { | |||
| void updateReceivePay(WxBillReceiveUpdateDTO dto,MallUserInfo user,boolean forcePaid); | |||
| void updatePay(WxBillPayDTO dto,MallUserInfo user); | |||
| void updatePayByMerchant(WxBillPayDTO dto,WxMerchantBUser user); | |||
| } | |||
| @@ -32,6 +32,7 @@ import com.iformall.domain.po.WxBillPropertyDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxBillRentManage; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.po.base.WxBillBaseEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -667,4 +668,26 @@ public class WxBillAllHelper { | |||
| wxBillOtherDepositService.updatePay(dto, user); | |||
| } | |||
| } | |||
| public void updatePayByMerchant(WxBillPayDTO dto,WxMerchantBUser user) { | |||
| if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT.getCode().intValue()) { | |||
| wxBillRentService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode().intValue()) { | |||
| wxBillRentManageService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_OPERATION_MANAGE.getCode().intValue()) { | |||
| wxBillRentManageService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.RENT_DEPOSIT.getCode().intValue()) { | |||
| wxBillRentDepositService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY.getCode().intValue()) { | |||
| wxBillPropertyService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.PROPERTY_DEPOSIT.getCode().intValue()) { | |||
| wxBillPropertyDepositService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.DAILY.getCode().intValue()) { | |||
| wxBillDailyService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { | |||
| wxBillOtherService.updatePayByMerchant(dto, user); | |||
| }else if (dto.getBillTypeValue().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { | |||
| wxBillOtherDepositService.updatePayByMerchant(dto, user); | |||
| } | |||
| } | |||
| } | |||
| @@ -5,6 +5,8 @@ import com.github.pagehelper.PageInfo; | |||
| import com.iformall.common.IdWorker; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillAction; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.mapper.WxBillActionMapper; | |||
| import com.iformall.service.WxBillActionService; | |||
| import org.slf4j.Logger; | |||
| @@ -49,7 +51,11 @@ public class WxBillActionServiceImpl implements WxBillActionService { | |||
| @Override | |||
| public int modifyBill(WxBillAction action, MallUserInfo user) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| return modifyBillByUser(user,action,user.getId(),user.getName(),user.getPhone()); | |||
| } | |||
| private int modifyBillByUser(TenantEntity tenantEntity,WxBillAction action,Long userId,String userName,String phone) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setId(idWorker.nextId()); | |||
| wxBillAction.setBillId(action.getBillId()); | |||
| @@ -58,10 +64,11 @@ public class WxBillActionServiceImpl implements WxBillActionService { | |||
| wxBillAction.setNewMoney(action.getNewMoney()); | |||
| wxBillAction.setDetails(action.getDetails()); | |||
| wxBillAction.setAction(action.getAction()); | |||
| wxBillAction.setUserId(user.getId()); | |||
| wxBillAction.setUserName(user.getName()); | |||
| wxBillAction.setPhone(user.getPhone()); | |||
| wxBillAction.updateTenantInfo(user); | |||
| wxBillAction.setUserType(action.getUserType()); | |||
| wxBillAction.setUserId(userId); | |||
| wxBillAction.setUserName(userName); | |||
| wxBillAction.setPhone(phone); | |||
| wxBillAction.updateTenantInfo(tenantEntity); | |||
| wxBillAction.setPayDate(action.getPayDate()); | |||
| wxBillAction.setRemark(action.getRemark()); | |||
| Date date = new Date(); | |||
| @@ -70,4 +77,9 @@ public class WxBillActionServiceImpl implements WxBillActionService { | |||
| return wxBillActionMapper.insert(wxBillAction); | |||
| } | |||
| @Override | |||
| public int modifyBill(WxBillAction action, WxMerchantBUser bUser) { | |||
| return modifyBillByUser(bUser,action,bUser.getId(),bUser.getName(),bUser.getPhone()); | |||
| } | |||
| } | |||
| @@ -9,8 +9,10 @@ import org.springframework.stereotype.Service; | |||
| import com.iformall.domain.po.MallUserInfo; | |||
| import com.iformall.domain.po.WxBillAction; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.enums.EnumBillAction; | |||
| import com.iformall.enums.EnumBillAllType; | |||
| import com.iformall.enums.EnumSystemUserType; | |||
| import com.iformall.service.WxBillActionService; | |||
| @Service | |||
| @@ -31,7 +33,22 @@ public class WxBillBaseService{ | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| 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) { | |||
| WxBillAction wxBillAction = new WxBillAction(); | |||
| wxBillAction.setBillId(billId); | |||
| wxBillAction.setBillType(billType); | |||
| wxBillAction.setOldMoney(oldMoney); | |||
| wxBillAction.setNewMoney(newMoney); | |||
| wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney)); | |||
| wxBillAction.setAction(billAction.getCode()); | |||
| wxBillAction.setPayDate(payDate); | |||
| wxBillAction.setRemark(remark); | |||
| wxBillAction.setUserType(EnumSystemUserType.MERCHANT.getCode()); | |||
| wxBillActionService.modifyBill(wxBillAction, bUser); | |||
| } | |||
| } | |||
| @@ -469,6 +469,12 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| @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); | |||
| } | |||
| private WxBillDaily updateBillPay(WxBillPayDTO dto) { | |||
| WxBillDaily dbBill = wxBillDailyMapper.selectById(dto.getId()); | |||
| WxBillDaily wxBillRent = new WxBillDaily(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -486,8 +492,14 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillDailyMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillOtherDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.WxRentContract; | |||
| import com.iformall.domain.po.WxShop; | |||
| @@ -443,6 +444,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| @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); | |||
| } | |||
| private WxBillDeposit updateBillPay(WxBillPayDTO dto) { | |||
| WxBillDeposit dbBill = wxBillDepositMapper.selectById(dto.getId()); | |||
| WxBillDeposit wxBillRent = new WxBillDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -460,8 +467,14 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillDepositMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillDaily; | |||
| import com.iformall.domain.po.WxBillOtherDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -430,6 +431,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| @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); | |||
| } | |||
| private WxBillOtherDeposit updateBillPay(WxBillPayDTO dto) { | |||
| WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectById(dto.getId()); | |||
| WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -447,8 +454,14 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillOtherDepositMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillDaily; | |||
| import com.iformall.domain.po.WxBillOther; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.domain.vo.WxBillHotNotify; | |||
| @@ -374,6 +375,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| @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); | |||
| } | |||
| private WxBillOther updateBillPay(WxBillPayDTO dto) { | |||
| WxBillOther dbBill = wxBillOtherMapper.selectById(dto.getId()); | |||
| WxBillOther wxBillRent = new WxBillOther(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -391,7 +398,13 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillOtherMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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.getRemark(), user); | |||
| } | |||
| } | |||
| @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillPropertyDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.WxPropertyContract; | |||
| import com.iformall.domain.po.WxShop; | |||
| @@ -422,6 +423,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| @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); | |||
| } | |||
| private WxBillPropertyDeposit updateBillPay(WxBillPayDTO dto) { | |||
| WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectById(dto.getId()); | |||
| WxBillPropertyDeposit wxBillRent = new WxBillPropertyDeposit(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -439,8 +446,14 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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.getRemark(), user); | |||
| } | |||
| @@ -513,6 +513,12 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| @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); | |||
| } | |||
| private WxBillProperty updateBillPay(WxBillPayDTO dto) { | |||
| WxBillProperty dbBill = wxBillPropertyMapper.selectById(dto.getId()); | |||
| WxBillProperty wxBillRent = new WxBillProperty(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -530,6 +536,12 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillPropertyMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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); | |||
| } | |||
| @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillDeposit; | |||
| import com.iformall.domain.po.WxBillRent; | |||
| import com.iformall.domain.po.WxBillRentManage; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxPayAccountBill; | |||
| import com.iformall.domain.po.WxRentContract; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| @@ -441,6 +442,12 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| @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); | |||
| } | |||
| private WxBillRentManage updateBillPay(WxBillPayDTO dto) { | |||
| WxBillRentManage dbBill = wxBillRentManageMapper.selectById(dto.getId()); | |||
| WxBillRentManage wxBillRent = new WxBillRentManage(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -458,6 +465,12 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillRentManageMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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); | |||
| } | |||
| @@ -606,6 +606,12 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| @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); | |||
| } | |||
| private WxBillRent updateBillPay(WxBillPayDTO dto) { | |||
| WxBillRent dbBill = wxBillRentMapper.selectById(dto.getId()); | |||
| WxBillRent wxBillRent = new WxBillRent(); | |||
| wxBillRent.setId(dto.getId()); | |||
| @@ -623,6 +629,12 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||
| wxBillRent.setPayDate(new Date()); | |||
| wxBillRent.setPayWay(dto.getPayWay()); | |||
| wxBillRentMapper.updateById(wxBillRent); | |||
| return wxBillRent; | |||
| } | |||
| @Override | |||
| 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); | |||
| } | |||
| @@ -9,6 +9,7 @@ | |||
| <result column="bill_id" jdbcType="BIGINT" property="billId"/> | |||
| <result column="old_money" jdbcType="VARCHAR" property="oldMoney"/> | |||
| <result column="new_money" jdbcType="VARCHAR" property="newMoney"/> | |||
| <result column="user_Type" jdbcType="INTEGER" property="userType"/> | |||
| <result column="user_id" jdbcType="BIGINT" property="userId"/> | |||
| <result column="user_name" jdbcType="VARCHAR" property="userName"/> | |||
| <result column="phone" jdbcType="VARCHAR" property="phone"/> | |||
| @@ -21,7 +22,7 @@ | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`parent_tenant_id`,`bill_type`,`bill_id`,`old_money`,`new_money`,`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`,`remark` | |||
| </sql> | |||