From ed28d31124ddb8cd9fd1670c1008e8b61d0669d5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Sep 2018 16:53:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E5=95=86=E9=93=BA][?= =?UTF-8?q?=E5=95=86=E9=93=BA][=E6=B7=BB=E5=8A=A0ShopNumber=E6=83=9F?= =?UTF-8?q?=E4=B8=80=E7=BA=A6=E6=9D=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxShopController.java | 11 +++++++++++ .../java/com/simple/service/WxShopService.java | 2 ++ .../service/impl/WxMerchantServiceImpl.java | 4 ++++ .../simple/service/impl/WxShopServiceImpl.java | 17 ++++++++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index 3b0769e14..bf78e68a0 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -83,5 +83,16 @@ public class WxShopController extends BaseController { return wxShopService.getMerchantShopByShopId(getTenantId(), shopId); } + @ApiOperation("查询商铺号是否存在") + @GetMapping("hasShopNumber") + + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true), + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query")}) + public ResultData hasShopNumber(String shopNumber,Long id) { + return wxShopService.hasShopNumber(getTenantId(), shopNumber,id); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/WxShopService.java b/mallinkService/src/main/java/com/simple/service/WxShopService.java index bdca3d1b8..827c88560 100644 --- a/mallinkService/src/main/java/com/simple/service/WxShopService.java +++ b/mallinkService/src/main/java/com/simple/service/WxShopService.java @@ -46,4 +46,6 @@ public interface WxShopService { ResultData getMerchantShopByShopId(String tenantId, String shopId); + ResultData hasShopNumber(String tenantId, String shopNumber, Long id); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 70a0ff781..93f409437 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -334,6 +334,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if(paycount==1){//12 WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(idWorker.nextId()); + wxBillRent.setShopId(wxshop.getId()); wxBillRent.setPayStatus(0); wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setTenantId(wxshop.getTenantId()); @@ -365,6 +366,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(idWorker.nextId()); + wxBillRent.setShopId(wxshop.getId()); wxBillRent.setPayStatus(0); wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setTenantId(wxshop.getTenantId()); @@ -397,6 +399,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(idWorker.nextId()); + wxBillRent.setShopId(wxshop.getId()); wxBillRent.setPayStatus(0); wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setTenantId(wxshop.getTenantId()); @@ -428,6 +431,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setId(idWorker.nextId()); + wxBillRent.setShopId(wxshop.getId()); wxBillRent.setPayStatus(0); wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setTenantId(wxshop.getTenantId()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java index 97fe036d3..fd662b574 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -1,6 +1,8 @@ package com.simple.service.impl; import java.util.*; +import java.util.stream.Collectors; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; @@ -41,7 +43,6 @@ public class WxShopServiceImpl implements WxShopService { public void saveOrUpdate(WxShop record) { if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setStatus(0); @@ -78,5 +79,19 @@ public class WxShopServiceImpl implements WxShopService { return new ResultData(ResultData.SUCCESS,"",map); } + @Override + public ResultData hasShopNumber(String tenantId, String shopNumber, Long id) { + WxShop wxShop = new WxShop(); + wxShop.setTenantId(tenantId); + wxShop.setShopNumber(shopNumber); + List list = wxShopMapper.findList(wxShop); + if(id!=null){ + List collect = list.stream().filter(s -> !s.getId().equals(id)?true:false).collect(Collectors.toList()); + return new ResultData(ResultData.SUCCESS,"查询成功",collect.size()>0?true:false); + } + + return new ResultData(ResultData.SUCCESS,"查询成功",list.size()>0?true:false); + } + }