From 0f218c07e9c63e4ca1338bb34719d2147f52feeb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Oct 2018 17:48:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=85=B3=E8=81=94=E5=95=86=E6=88=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 5 +++++ .../iformall/service/WxRentContractService.java | 2 ++ .../service/impl/WxRentContractServiceImpl.java | 14 ++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 3fe9aa45b..ff1248932 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -77,4 +77,9 @@ public class WxRentContractController extends BaseController { return wxRentContractService.endRentContract(id); } + @PostMapping("updateMerchant") + public ResultData updateMerchant(@RequestBody WxRentContract wxRentContract) { + return wxRentContractService.updateMerchant(wxRentContract); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index c9734868d..7785c4b8e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -51,4 +51,6 @@ public interface WxRentContractService { ResultData endRentContract(Long id); + ResultData updateMerchant(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index eeab8fc80..71b921f38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -142,6 +142,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.SUCCESS, "操作成功"); } + @Transactional(rollbackFor = {Exception.class}) + @Override + public ResultData updateMerchant(WxRentContract wxRentContract) { + WxRentContract record =wxRentContractMapper.selectByPrimaryKey(wxRentContract); + record.setMerchantId(wxRentContract.getMerchantId()); + try{ + wxRentContractMapper.updateByPrimaryKeySelective(record); + }catch (MallinkException e){ + logger.info("关联合同商户失败:"+e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "操作成功"); + } + public Map updateStatus(String tenantId){ Map resultData=new HashMap(); WxRentContract wxRentContract = new WxRentContract();