| @@ -13,6 +13,7 @@ import com.iformall.common.SysConfigConstant; | |||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.SysConfig; | import com.iformall.domain.po.SysConfig; | ||||
| import com.iformall.domain.po.WxAllBill; | import com.iformall.domain.po.WxAllBill; | ||||
| import com.iformall.domain.po.WxBillAction; | |||||
| import com.iformall.domain.po.WxContractCustomers; | import com.iformall.domain.po.WxContractCustomers; | ||||
| import com.iformall.domain.po.WxContractShop; | import com.iformall.domain.po.WxContractShop; | ||||
| import com.iformall.domain.po.WxEnergyFees; | import com.iformall.domain.po.WxEnergyFees; | ||||
| @@ -38,6 +39,7 @@ import com.iformall.domain.vo.WxBillSum; | |||||
| import com.iformall.domain.vo.WxRentContractRevenueSetSalesVo; | import com.iformall.domain.vo.WxRentContractRevenueSetSalesVo; | ||||
| import com.iformall.domain.vo.WxRentContractYearsSumVo; | import com.iformall.domain.vo.WxRentContractYearsSumVo; | ||||
| import com.iformall.domain.vo.WxRentContractYearsVo; | import com.iformall.domain.vo.WxRentContractYearsVo; | ||||
| import com.iformall.enums.EnumBillAction; | |||||
| import com.iformall.enums.EnumBillAllType; | import com.iformall.enums.EnumBillAllType; | ||||
| import com.iformall.enums.EnumBillExtraCreateFrom; | import com.iformall.enums.EnumBillExtraCreateFrom; | ||||
| import com.iformall.enums.EnumBillStatus; | import com.iformall.enums.EnumBillStatus; | ||||
| @@ -66,6 +68,7 @@ import com.iformall.enums.EnumRentShopType; | |||||
| import com.iformall.enums.EnumRentStartType; | import com.iformall.enums.EnumRentStartType; | ||||
| import com.iformall.enums.EnumShopUsersStatus; | import com.iformall.enums.EnumShopUsersStatus; | ||||
| import com.iformall.enums.EnumShopUsersType; | import com.iformall.enums.EnumShopUsersType; | ||||
| import com.iformall.enums.EnumSystemUserType; | |||||
| import com.iformall.enums.EnumTradeDailyDateType; | import com.iformall.enums.EnumTradeDailyDateType; | ||||
| import com.iformall.enums.EnumYesOrNo; | import com.iformall.enums.EnumYesOrNo; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| @@ -85,6 +88,7 @@ import com.iformall.mapper.WxRentContractRevenueSalesMapper; | |||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.SysConfigService; | import com.iformall.service.SysConfigService; | ||||
| import com.iformall.service.WxAgileContractService; | import com.iformall.service.WxAgileContractService; | ||||
| import com.iformall.service.WxBillActionService; | |||||
| import com.iformall.service.WxEnergyService; | import com.iformall.service.WxEnergyService; | ||||
| import com.iformall.service.WxFlowRecordService; | import com.iformall.service.WxFlowRecordService; | ||||
| import com.iformall.service.WxFlowService; | import com.iformall.service.WxFlowService; | ||||
| @@ -239,6 +243,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| @Autowired | @Autowired | ||||
| SysConfigService sysConfigService; | SysConfigService sysConfigService; | ||||
| @Lazy | |||||
| @Autowired | |||||
| private WxBillActionService wxBillActionService; | |||||
| @Override | @Override | ||||
| public List<WxRentContract> findList(WxRentContract record){ | public List<WxRentContract> findList(WxRentContract record){ | ||||
| return wxRentContractMapper.findList(record); | return wxRentContractMapper.findList(record); | ||||
| @@ -2830,6 +2838,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| return vo; | return vo; | ||||
| } | } | ||||
| private void createBillAction(WxAllBill bill,String oldMoney,String newMoney,MallUserInfo user) { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | |||||
| wxBillAction.setBillId(bill.getId()); | |||||
| wxBillAction.setBillType(bill.getBillType()); | |||||
| wxBillAction.setOldMoney(oldMoney); | |||||
| wxBillAction.setNewMoney(newMoney); | |||||
| wxBillAction.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldMoney, newMoney,null,null,null,null)); | |||||
| wxBillAction.setAction(EnumBillAction.UPDATE_BILL.getCode()); | |||||
| wxBillAction.setRemark(bill.getBillRemark()); | |||||
| wxBillAction.setUserType(EnumSystemUserType.ADMIN.getCode()); | |||||
| wxBillActionService.modifyBill(wxBillAction, user); | |||||
| } | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| public List<WxAllBill> generateManageBill(MallUserInfo user,List<Long> shopIds,Map<Long, WxShop> shopMap,Map<Long,WxShopUsers> shopUserMap,Map<Long, BigDecimal> shopAreaRateMap,WxRentContract rentcontract, | public List<WxAllBill> generateManageBill(MallUserInfo user,List<Long> shopIds,Map<Long, WxShop> shopMap,Map<Long,WxShopUsers> shopUserMap,Map<Long, BigDecimal> shopAreaRateMap,WxRentContract rentcontract, | ||||
| Date starttime, Date endtime,String total,String rate,EnumBillAllType type,EnumBillExtraCreateFrom createFrom) { | Date starttime, Date endtime,String total,String rate,EnumBillAllType type,EnumBillExtraCreateFrom createFrom) { | ||||
| @@ -2848,8 +2870,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //查询每一个铺位的 | //查询每一个铺位的 | ||||
| for (int i = 0 ; i < bmbillList.size() ; i ++) { | for (int i = 0 ; i < bmbillList.size() ; i ++) { | ||||
| WxAllBill b = bmbillList.get(i); | WxAllBill b = bmbillList.get(i); | ||||
| String oldMoney = b.getReceivePay(); | |||||
| //把原有的账单应收金额变为0 | //把原有的账单应收金额变为0 | ||||
| b.setHistoryReceivePay(b.getReceivePay()); | |||||
| b.setHistoryReceivePay(oldMoney); | |||||
| b.setNeedPay("0");//如不设置会影响减免统计 | b.setNeedPay("0");//如不设置会影响减免统计 | ||||
| b.setReceivePay("0"); | b.setReceivePay("0"); | ||||
| b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0"); | b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0"); | ||||
| @@ -2857,6 +2880,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| b.setUpdateBy(user.getId()); | b.setUpdateBy(user.getId()); | ||||
| b.setUpdateByName(user.getName()); | b.setUpdateByName(user.getName()); | ||||
| wxAllBillMapper.updateById(b); | wxAllBillMapper.updateById(b); | ||||
| createBillAction(b,oldMoney,"0",user); | |||||
| } | } | ||||
| } | } | ||||
| if (bussinessmoney.compareTo(new BigDecimal(0)) > 0 ) { | if (bussinessmoney.compareTo(new BigDecimal(0)) > 0 ) { | ||||
| @@ -2926,6 +2951,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| for (int i = 0 ; i < propertyBillList.size(); i++){ | for (int i = 0 ; i < propertyBillList.size(); i++){ | ||||
| WxAllBill _rb = propertyBillList.get(i); | WxAllBill _rb = propertyBillList.get(i); | ||||
| //把原有的账单应收金额变为0 | //把原有的账单应收金额变为0 | ||||
| String oldMoney = _rb.getReceivePay(); | |||||
| _rb.setHistoryReceivePay(_rb.getReceivePay()); | _rb.setHistoryReceivePay(_rb.getReceivePay()); | ||||
| _rb.setNeedPay("0"); | _rb.setNeedPay("0"); | ||||
| _rb.setReceivePay("0"); | _rb.setReceivePay("0"); | ||||
| @@ -2934,6 +2960,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| _rb.setUpdateBy(user.getId()); | _rb.setUpdateBy(user.getId()); | ||||
| _rb.setUpdateByName(user.getName()); | _rb.setUpdateByName(user.getName()); | ||||
| wxAllBillMapper.updateById(_rb); | wxAllBillMapper.updateById(_rb); | ||||
| createBillAction(_rb,oldMoney,"0",user); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -3005,7 +3033,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| for (int i = 0 ; i < rentBillList.size() ; i ++) { | for (int i = 0 ; i < rentBillList.size() ; i ++) { | ||||
| WxAllBill b = rentBillList.get(i); | WxAllBill b = rentBillList.get(i); | ||||
| //把原有的账单应收金额变为0 | //把原有的账单应收金额变为0 | ||||
| b.setHistoryReceivePay(b.getReceivePay());//设置此值,供录入销售额的页面显示应收金额 | |||||
| String oldMoney = b.getReceivePay(); | |||||
| b.setHistoryReceivePay(oldMoney);//设置此值,供录入销售额的页面显示应收金额 | |||||
| b.setNeedPay("0");//如不设置会影响减免统计 | b.setNeedPay("0");//如不设置会影响减免统计 | ||||
| b.setReceivePay("0"); | b.setReceivePay("0"); | ||||
| b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0"); | b.setBillRemark("账单金额重新计算生成新账单,原账单金额变为0"); | ||||
| @@ -3013,6 +3042,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| b.setUpdateBy(user.getId()); | b.setUpdateBy(user.getId()); | ||||
| b.setUpdateByName(user.getName()); | b.setUpdateByName(user.getName()); | ||||
| wxAllBillMapper.updateById(b); | wxAllBillMapper.updateById(b); | ||||
| createBillAction(b,oldMoney,"0",user); | |||||
| } | } | ||||
| } | } | ||||
| BigDecimal moneyb = new BigDecimal(money); | BigDecimal moneyb = new BigDecimal(money); | ||||