clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:d6c8d90697a9836d120540391ce1131361b23eea
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:f04ef2689f54c4b5b703c49f1ec49d23543e976f
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

No commits in common. "d6c8d90697a9836d120540391ce1131361b23eea" and "f04ef2689f54c4b5b703c49f1ec49d23543e976f" have entirely different histories.
d6c8d90697 ... f04ef2689f

2 changed files with 1 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java
View File

@ -2,7 +2,6 @@ package com.syjiaer.clinic.server.controller.common;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.config.Config;
import com.syjiaer.clinic.server.common.util.RsaUtil; import com.syjiaer.clinic.server.common.util.RsaUtil;
import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.common.vo.Result;
@ -47,7 +46,7 @@ public class CommonConfigController extends BaseController {
} }
return success(map); return success(map);
} }
@RecordCommonLog(operation = "修改配置信息")
@RequestMapping("edit") @RequestMapping("edit")
public Result<Object> edit() { public Result<Object> edit() {
Map<String, Object> parms = getParms(); Map<String, Object> parms = getParms();
@ -72,7 +71,6 @@ public class CommonConfigController extends BaseController {
* map -> key -> printName打印机名称 pageType 打印类型 * map -> key -> printName打印机名称 pageType 打印类型
* @return * @return
*/ */
@RecordCommonLog(operation = "修改打印机配置")
@RequestMapping("savePrinter") @RequestMapping("savePrinter")
public Result<Object> updatePrinter() { public Result<Object> updatePrinter() {
Map map = parmsUtil.getMap("printConfig"); Map map = parmsUtil.getMap("printConfig");

3
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -383,8 +383,6 @@ public class ChargeService extends BaseService {
chargeOrderMapper.updateById(updateOrder); chargeOrderMapper.updateById(updateOrder);
order = chargeOrderMapper.selectById(id); order = chargeOrderMapper.selectById(id);
//扣除商品库存 //扣除商品库存
List<ChargeGoodsListVo> goodsLists = chargeGoodsListMapper.selectDetailByCode(order.getCode()); List<ChargeGoodsListVo> goodsLists = chargeGoodsListMapper.selectDetailByCode(order.getCode());
for (ChargeGoodsListVo goodsList : goodsLists) { for (ChargeGoodsListVo goodsList : goodsLists) {
@ -404,7 +402,6 @@ public class ChargeService extends BaseService {
inventoryLogMapper.insert(logs); inventoryLogMapper.insert(logs);
this.recordChargeInventoryLog(logs, order); this.recordChargeInventoryLog(logs, order);
} }
//记录收费日志 //记录收费日志
this.recordChargeLog(order, ChargeSourceEnum.CHARGE, ChargeTypeEnum.CHARGE); this.recordChargeLog(order, ChargeSourceEnum.CHARGE, ChargeTypeEnum.CHARGE);