Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
a71839d2e9
4 changed files with 7 additions and 4 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java View File

@@ -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();
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxFinanceService.java View File

@@ -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<WxFinanceFinish> finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize);


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java View File

@@ -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 {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml View File

@@ -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}
)
</foreach>
</insert>


Loading…
Cancel
Save