From b0ce351d1e6cc552c65a805640d018bb40c63db7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 5 Nov 2018 16:35:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=8A=E6=9F=A5=E8=AF=A2=E5=BA=97=E9=93=BA?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 9 ++++--- .../iformall/controller/WxShopController.java | 21 ++++++++++++++- .../iformall/domain/po/WxRentContract.java | 22 +++++++++++++++ .../iformall/enums/EnumBillDailyStatus.java | 6 ++--- .../com/iformall/mapper/WxShopMapper.java | 5 ++++ .../service/WxRentContractService.java | 2 +- .../com/iformall/service/WxShopService.java | 2 ++ .../impl/WxRentContractServiceImpl.java | 6 ++--- .../service/impl/WxShopServiceImpl.java | 7 +++++ .../resources/mapper/WxRentContractMapper.xml | 5 +++- .../main/resources/mapper/WxShopMapper.xml | 27 +++++++++++++++---- 11 files changed, 94 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 9c8945642..eebb971a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -84,9 +84,12 @@ public class WxRentContractController extends BaseController { return wxRentContractService.updateMerchant(wxRentContract); } - @GetMapping("/getRentContractList") - public ResultData getRentContractList() { - return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractList(getTenantId())); + @GetMapping("getRentContractList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData getRentContractList(Integer pageNum, Integer pageSize) { + return new ResultData(wxRentContractService.getRentContractList(getTenantId(),pageNum, pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index 4e5798c0d..9033cad9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +/** + * @author gongbiao + */ @RestController @RequestMapping("wxShop") public class WxShopController extends BaseController { @@ -29,7 +32,9 @@ public class WxShopController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { - if (null == wxShop) wxShop = new WxShop(); + if (null == wxShop){ + wxShop = new WxShop(); + } wxShop.setTenantId(getTenantId()); wxShop.setSortColumns(WxShop.Field.Id_DESC); @@ -89,5 +94,19 @@ public class WxShopController extends BaseController { } + @ApiOperation("分页列表接品-合同访问") + @GetMapping("listShopFromContract") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData listShopFromContract(@ModelAttribute WxShop wxShop, Integer pageNum, Integer pageSize) { + if (null == wxShop){ + wxShop = new WxShop(); + } + wxShop.setTenantId(getTenantId()); + wxShop.setSortColumns(WxShop.Field.Id_DESC); + final PageInfo> page = wxShopService.listShopFromContract(wxShop, pageNum, pageSize); + return new ResultData(page); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 045e8495f..8d2931204 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -46,6 +46,28 @@ public class WxRentContract implements Serializable { @Transient private String shopNumber; + @Transient + private String building; + + @Transient + private String floor; + + public String getBuilding() { + return building; + } + + public void setBuilding(String building) { + this.building = building; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + public String getShopNumber() { return shopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java index 37b462393..c71700ab8 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillDailyStatus.java @@ -7,10 +7,10 @@ package com.iformall.enums; public enum EnumBillDailyStatus { - NOT_EXPIRED(1,"未到期"), + NOT_PAID(1, "欠缴"), WAIT_PAY(2,"待缴"), - NOT_PAID(3, "欠缴"), - PAID(4, "已结清"), + PAID(3, "已结清"), + NOT_EXPIRED(4,"未到期"), ; public static EnumBillDailyStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 59a2e5d30..576e42ff3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -6,6 +6,9 @@ import com.iformall.domain.po.WxShop; import java.util.List; import java.util.Map; +/** + * @author gongbiao + */ public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); @@ -19,4 +22,6 @@ public interface WxShopMapper extends CommonMapper { Map queryShopLeftInfo(Map shopparams); + List> listShopFromContract(WxShop wxShop); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index c818765d7..9a107d5eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -53,6 +53,6 @@ public interface WxRentContractService { ResultData updateMerchant(WxRentContract wxRentContract); - Object getRentContractList(String tenantId); + Object getRentContractList(String tenantId, Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index a735edd43..150e753ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -48,4 +48,6 @@ public interface WxShopService { ResultData hasShopNumber(String tenantId, String shopNumber, Long id); + PageInfo> listShopFromContract(WxShop wxShop, Integer pageNum, Integer pageSize); + } 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 cad9e1815..e4026750f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -32,7 +32,6 @@ import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.util.*; -import java.util.stream.Collectors; /** * @author gongbiao @@ -445,9 +444,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public Object getRentContractList(String tenantId) { - - return wxRentContractMapper.getRentContractList(tenantId); + public PageInfo getRentContractList(String tenantId, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(tenantId)); } public Map updateStatus(String tenantId) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 51fdc43a6..eff8d7229 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -99,5 +99,12 @@ public class WxShopServiceImpl implements WxShopService { return new ResultData(ResultData.SUCCESS,"查询成功",list.size()>0?true:false); } + @Override + public PageInfo> listShopFromContract(WxShop wxShop, Integer pageIndex, Integer pageSize) { + PageHelper.startPage(pageIndex, pageSize); + List> shops = wxShopMapper.listShopFromContract(wxShop); + PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; + } } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 69c1ba177..5b67acc55 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -139,7 +139,10 @@ diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 92b5dbc43..5d9520f13 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -174,11 +174,6 @@ and s.`status` = #{status} - - and s.id not in( - SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status!=1 and status!=6 and status!=7 and merchant_id is not null - ) - and s.`x` = #{x} @@ -251,4 +246,26 @@ where tenant_id=#{tenantId} and status=#{status} + +