diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 013395f36..d66d03069 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -332,7 +332,7 @@ public class WxFinanceController extends BaseController { @PostMapping("deleteTemp") public ResultData deleteTemp(@RequestBody WxAllBill record) { record.updateTenantInfo(getTenantInfo()); - wxFinanceService.createTempFees(record,this.getUser()); + wxFinanceService.delteTemp(record,this.getUser()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index edd2222db..dc1fe2921 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -51,7 +51,7 @@ public interface WxFinanceService { //增加临时费用 void createTempFees(WxAllBill record,MallUserInfo user); void createTempToPay(WxAllBill record,MallUserInfo user); - void delteTemp(WxAllBill record); + void delteTemp(WxAllBill record,MallUserInfo user); //结账 PageInfo finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index f7ccb6a3c..e498cdf43 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1123,8 +1123,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { } @Override - public void delteTemp(WxAllBill record) { + public void delteTemp(WxAllBill record,MallUserInfo user) { 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()) { wxAllBillService.deleteById(record.getId(), record); }else { diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index cf63850c6..040637536 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -354,7 +354,7 @@ #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, #{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} )