From 772e0691e643486a6fe8a33c094534124f095e0c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 12 Oct 2018 15:55:42 +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][=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillRentController.java | 11 ++--- .../com/iformall/mapper/WxBillRentMapper.java | 5 +- .../iformall/service/WxBillRentService.java | 7 +-- .../service/impl/WxBillRentServiceImpl.java | 47 ++++++++++++------- .../resources/mapper/WxBillRentMapper.xml | 22 ++++++++- .../resources/mapper/WxRentContractMapper.xml | 4 +- 6 files changed, 67 insertions(+), 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index 361ad75af..879d8c98e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +/** + * @author gongbiao + */ @RestController @RequestMapping("wxBillRent") public class WxBillRentController extends BaseController { @@ -36,17 +39,13 @@ public class WxBillRentController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxBillRent wxBillRent) { - //Assert.notNull(wxBillRent.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxBillRent.setTenantId(getTenantId()); - wxBillRentService.saveOrUpdate(wxBillRent); - return new ResultData(ResultData.SUCCESS, "操作成功"); + return wxBillRentService.saveOrUpdate(wxBillRent); } @PostMapping("update") public ResultData update(@RequestBody WxBillRent wxBillRent) { - wxBillRentService.saveOrUpdate(wxBillRent); - return new ResultData(ResultData.SUCCESS, "操作成功"); + return wxBillRentService.saveOrUpdate(wxBillRent); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 6b51273de..68fd9d50f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -6,11 +6,14 @@ import com.iformall.domain.po.WxBillRent; import java.util.List; import java.util.Map; +/** + * @author gongbiao + */ public interface WxBillRentMapper extends CommonMapper { List findList(WxBillRent wxBillRent); - List> findListMap(WxBillRent record); + List> queryBillRentList(WxBillRent record); Map queryPayInfo(Map params); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index eed2760c4..672010e12 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -2,6 +2,7 @@ package com.iformall.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillRent; public interface WxBillRentService { @@ -27,9 +28,9 @@ public interface WxBillRentService { /** * 保存或更新实体 * - * @param record - */ - void saveOrUpdate(WxBillRent record); + * @param record + */ + ResultData saveOrUpdate(WxBillRent record); /** * 根据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 58f2e652e..2bd74d60e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -2,8 +2,12 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; +import com.iformall.common.Result; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillRent; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillRentMapper; import com.iformall.service.WxBillRentService; import org.slf4j.Logger; @@ -15,19 +19,22 @@ import java.util.Date; import java.util.List; import java.util.Map; +/** + * @author gongbiao + */ @Service public class WxBillRentServiceImpl implements WxBillRentService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired + + @Autowired WxBillRentMapper wxBillRentMapper; @Override public PageInfo> listAsPage(WxBillRent record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); - List> shops = wxBillRentMapper.findListMap(record); - PageInfo> pageInfo = new PageInfo<>(shops); + List> shops = wxBillRentMapper.queryBillRentList(record); + PageInfo> pageInfo = new PageInfo<>(shops); return pageInfo; //return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.findList(record)); } @@ -36,21 +43,35 @@ public class WxBillRentServiceImpl implements WxBillRentService { public Map getById(Long id) { WxBillRent record = new WxBillRent(); record.setId(id); - return wxBillRentMapper.findListMap(record).get(0); + return wxBillRentMapper.queryBillRentList(record).get(0); } @Override - public void saveOrUpdate(WxBillRent record) { + public ResultData saveOrUpdate(WxBillRent record) { if (record.getId() == null) { + logger.info("新增租赁账单"); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); - wxBillRentMapper.insertSelective(record); + try { + wxBillRentMapper.insertSelective(record); + } catch (Exception e) { + logger.error("保存租赁账单失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "保存租赁账单成功"); } else { + logger.info("更新租赁账单"); record.setUpdatetime(new Date()); - wxBillRentMapper.updateByPrimaryKeySelective(record); + try { + wxBillRentMapper.updateByPrimaryKeySelective(record); + } catch (Exception e) { + logger.error("更新租赁账单失败,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } + return new ResultData(Result.SUCCESS, "更新租赁账单成功"); } } @@ -58,12 +79,6 @@ public class WxBillRentServiceImpl implements WxBillRentService { public void deleteById(Long id) { wxBillRentMapper.deleteByPrimaryKey(id); } - - - - - - - - + + } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 0e52c9434..ab39b968c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -63,8 +63,28 @@ + - + diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 1591c5210..8786fa316 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -77,8 +77,8 @@