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 7fcc5a914..ddf6e16bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -784,6 +784,14 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("新增结账") + @PostMapping("saveCheckOut") + public ResultData saveCheckOut(@RequestBody WxFinanceCheckOut record) { + record.updateTenantInfo(getTenantInfo()); + wxFinanceService.saveOrUpdateCheckOut(record, getUser()); + return new ResultData(); + } + private boolean isValidPayTime(Date date) { // SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo()); // String fdatestr = sysconfig.getConfigItemValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 714cfbacd..5d57d2329 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -90,4 +90,5 @@ public interface WxFinanceService { //结账 PageInfo checkOutListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize); + void saveOrUpdateCheckOut(WxFinanceCheckOut record,MallUserInfo user); } 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 d237cd7ab..3a44474d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1928,6 +1928,32 @@ public class WxFinanceServiceImpl implements WxFinanceService { return page; } + @Override + public void saveOrUpdateCheckOut(WxFinanceCheckOut record, MallUserInfo user) { + final IdWorker idWorker = IdWorker.get(); + Date date = new Date(); + if (record.getId() == null) { + record.setId(idWorker.nextId()); + record.setCreateTime(date); + record.setCreateBy(user.getId()); + record.setCreateByName(user.getName()); + record.setUpdateTime(date); + record.setUpdateBy(user.getId()); + record.setUpdateByName(user.getName()); + try { + wxFinanceCheckOutMapper.insert(record); + } catch (Exception e) { + logger.error("保存失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + } else { + record.setUpdateTime(date); + record.setUpdateBy(user.getId()); + record.setUpdateByName(user.getName()); + wxFinanceCheckOutMapper.updateById(record); + } + } + }