From 9f84b4ee79b20d2d8852cd943649f05d004c9ccc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Oct 2018 11:24:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E7=BB=93=E5=8D=95=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxBillRentController.java | 10 ++++++++-- .../com/iformall/service/WxBillRentService.java | 2 ++ .../service/impl/WxBillRentServiceImpl.java | 13 +++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index 42bcaaf02..cdd746179 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -65,8 +65,14 @@ public class WxBillRentController extends BaseController { @GetMapping("/findByMerchantId") @ApiImplicitParam(name = "merchantId", value = "merchantId", dataType = "Long", paramType = "query", required = true) - public ResultData findByMerchantId(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.findByMerchantId(id)); + public ResultData findByMerchantId(Long merchantId) { + return new ResultData(Result.SUCCESS, "查询成功", wxBillRentService.findByMerchantId(merchantId)); + } + + @GetMapping("/updatePaid") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData updatePaid(Long id) { + return wxBillRentService.updatePaid(id); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index c3f3d2680..df8d80391 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -45,4 +45,6 @@ public interface WxBillRentService { Object findByMerchantId(Long id); + ResultData updatePaid(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 193da0174..ba95187bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -112,5 +112,18 @@ public class WxBillRentServiceImpl implements WxBillRentService { return wxBillRentMapper.queryBillRentList(record); } + @Transactional(rollbackFor = {Exception.class}) + @Override + public ResultData updatePaid(Long id) { + WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(id); + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + try { + wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + } catch (Exception e) { + logger.error("结单失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "结单成功"); + } }