diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java index fe34cdf..59bebe4 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java @@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.controller.common; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; import com.syjiaer.clinic.server.common.config.Config; import com.syjiaer.clinic.server.common.util.RsaUtil; import com.syjiaer.clinic.server.common.vo.Result; @@ -46,7 +47,7 @@ public class CommonConfigController extends BaseController { } return success(map); } - + @RecordCommonLog(operation = "修改配置信息") @RequestMapping("edit") public Result edit() { Map parms = getParms(); @@ -71,6 +72,7 @@ public class CommonConfigController extends BaseController { * map -> key -> printName打印机名称 pageType 打印类型 * @return */ + @RecordCommonLog(operation = "修改打印机配置") @RequestMapping("savePrinter") public Result updatePrinter() { Map map = parmsUtil.getMap("printConfig"); diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index a4577f6..80db9c7 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -383,6 +383,8 @@ public class ChargeService extends BaseService { chargeOrderMapper.updateById(updateOrder); order = chargeOrderMapper.selectById(id); + + //扣除商品库存 List goodsLists = chargeGoodsListMapper.selectDetailByCode(order.getCode()); for (ChargeGoodsListVo goodsList : goodsLists) { @@ -402,6 +404,7 @@ public class ChargeService extends BaseService { inventoryLogMapper.insert(logs); this.recordChargeInventoryLog(logs, order); } + //记录收费日志 this.recordChargeLog(order, ChargeSourceEnum.CHARGE, ChargeTypeEnum.CHARGE);