diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java
index 3c7464921..a4d15b47c 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java
@@ -40,8 +40,6 @@ public class WxShopController extends BaseController {
@ApiOperation("新增接口")
@PostMapping("add")
public ResultData add(@RequestBody WxShop wxShop) {
- //Assert.notNull(wxShop.getName(), "角色名不能为空");
- //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxShop.setTenantId(getTenantId());
wxShopService.saveOrUpdate(wxShop);
return new ResultData();
@@ -85,7 +83,6 @@ public class WxShopController extends BaseController {
@ApiOperation("查询商铺号是否存在")
@GetMapping("hasShopNumber")
-
@ApiImplicitParams({
@ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query")})
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 cfab2842e..bdca71294 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
@@ -7,7 +7,6 @@ import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBillRent;
-import com.iformall.enums.EnumBillRentPayWay;
import com.iformall.enums.EnumBillRentStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillRentMapper;
diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
index 85b4642de..691ed5e05 100644
--- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
@@ -87,8 +87,8 @@
left join wx_mall_building b on s.building=b.id
rc.tenant_id=#{tenantId}
- and rc.`merchant_name` like concat('%',#{merchantName},'%')
- and s.`shop_number` like concat('%',#{shopNumber},'%')
+ and rc.`merchant_name` like concat('%',#{merchantName},'%')
+ and s.`shop_number` like concat('%',#{shopNumber},'%')
and rc.`status` = #{status}
order by rc.id desc
diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
index 151ee0b83..e62023246 100644
--- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
@@ -127,14 +127,11 @@
select s.id,s.shop_number shopNumber,s.build_area buildArea,
s.img_url imgUrl,s.operation_area operationArea,
- s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId,
- rc.id rentContractId,rc.link_person linkPerson,rc.link_phone linkPhone
+ s.status,b.building_name building,f.floor_name floor,m.`name` merchantName,m.id merchantId
from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0
left join wx_merchant m on ms.merchant_id=m.id
- left join wx_mall_building b
- on s.building=b.id
+ left join wx_mall_building b on s.building=b.id
left join wx_mall_floor f on s.floor=f.id
- left join wx_rent_contract rc on s.id=rc.shop_id
where 1 = 1