| @@ -332,7 +332,7 @@ public class WxFinanceController extends BaseController { | |||||
| @PostMapping("deleteTemp") | @PostMapping("deleteTemp") | ||||
| public ResultData deleteTemp(@RequestBody WxAllBill record) { | public ResultData deleteTemp(@RequestBody WxAllBill record) { | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| wxFinanceService.createTempFees(record,this.getUser()); | |||||
| wxFinanceService.delteTemp(record,this.getUser()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -51,7 +51,7 @@ public interface WxFinanceService { | |||||
| //增加临时费用 | //增加临时费用 | ||||
| void createTempFees(WxAllBill record,MallUserInfo user); | void createTempFees(WxAllBill record,MallUserInfo user); | ||||
| void createTempToPay(WxAllBill record,MallUserInfo user); | void createTempToPay(WxAllBill record,MallUserInfo user); | ||||
| void delteTemp(WxAllBill record); | |||||
| void delteTemp(WxAllBill record,MallUserInfo user); | |||||
| //结账 | //结账 | ||||
| PageInfo<WxFinanceFinish> finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize); | PageInfo<WxFinanceFinish> finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize); | ||||
| @@ -1123,8 +1123,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void delteTemp(WxAllBill record) { | |||||
| public void delteTemp(WxAllBill record,MallUserInfo user) { | |||||
| WxAllBill bill = wxAllBillService.getById(record,record.getId()); | WxAllBill bill = wxAllBillService.getById(record,record.getId()); | ||||
| if (bill.getCreateBy() != user.getId()) { | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"只能删除自己创建的账单"); | |||||
| } | |||||
| if (bill.getCanEdit() == EnumYesOrNo.YES.getCode()) { | if (bill.getCanEdit() == EnumYesOrNo.YES.getCode()) { | ||||
| wxAllBillService.deleteById(record.getId(), record); | wxAllBillService.deleteById(record.getId(), record); | ||||
| }else { | }else { | ||||
| @@ -354,7 +354,7 @@ | |||||
| #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, | #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, | ||||
| #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, | #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, | ||||
| #{item.shopId},#{item.shopNumber},#{item.receiveDate},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, | #{item.shopId},#{item.shopNumber},#{item.receiveDate},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, | ||||
| #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea} | |||||
| #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit} | |||||
| ) | ) | ||||
| </foreach> | </foreach> | ||||
| </insert> | </insert> | ||||