Browse Source

[合同管理][修改][选择店铺问题]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
8a73942917
4 changed files with 4 additions and 11 deletions
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
  4. +2
    -5
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java View File

@@ -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")})


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java View File

@@ -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;


+ 2
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -87,8 +87,8 @@
left join wx_mall_building b on s.building=b.id
<where>
rc.tenant_id=#{tenantId}
<if test=" null != merchantName">and rc.`merchant_name` like concat('%',#{merchantName},'%')</if>
<if test=" null != shopNumber ">and s.`shop_number` like concat('%',#{shopNumber},'%')</if>
<if test=" null != merchantName and merchantName!=''">and rc.`merchant_name` like concat('%',#{merchantName},'%')</if>
<if test=" null != shopNumber and shopNumber!=''">and s.`shop_number` like concat('%',#{shopNumber},'%')</if>
<if test=" null != status ">and rc.`status` = #{status}</if>
</where>
order by rc.id desc


+ 2
- 5
mallinkService/src/main/resources/mapper/WxShopMapper.xml View File

@@ -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

<if test=" null != id ">


Loading…
Cancel
Save