Browse Source

merge

release_toaliyun_real
Burce 6 years ago
parent
commit
0fa59c9f5f
3 changed files with 6 additions and 28 deletions
  1. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
  3. +4
    -28
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java View File

@@ -51,6 +51,7 @@ public class WxCampaignController extends BaseController {
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.updateTenantInfo(getTenantInfo());
wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC);
// TODO 缓存优化
final PageInfo<WxCampaign> page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java View File

@@ -86,6 +86,7 @@ public class WxMallController extends BaseController {
@ApiOperation("商场信息")
@GetMapping("/mallInfo")
public ResultData getMallInfo() {
//TODO 缓存优化
WxMall mall = wxMallService.getByTenantId(getTenantId());
if (mall == null) {
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);


+ 4
- 28
mallinkService/src/main/resources/mapper/WxShopMapper.xml View File

@@ -158,7 +158,8 @@
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone,
s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,rent,rent_unit,s.business_id as
businessId,s.create_date create_date
from wx_shop s left join wx_merchant_shop ms on ms.shop_id=s.id and ms.is_del=0
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_floor f on s.floor=f.id
@@ -186,52 +187,42 @@

<if test=" null != shopNumber and ''!=shopNumber">
and s.`shop_number` like concat('%', #{shopNumber},'%')

</if>

<if test=" null != buildArea ">
and s.`build_area` like concat('%', #{buildArea},'%')

</if>

<if test=" null != operationArea ">
and s.`operation_area` like concat('%', #{operationArea},'%')

</if>

<if test=" null != x ">
and s.`x` = #{x}

</if>

<if test=" null != y ">
and s.`y` = #{y}

</if>

<if test=" null != addr ">
and s.`addr` like concat('%', #{addr},'%')

</if>

<if test=" null != baiduPoi ">
and s.`baidu_poi` like concat('%', #{baiduPoi},'%')

</if>

<if test=" null != longitude ">
and s.`longitude` = #{longitude}

</if>

<if test=" null != latitude ">
and s.`latitude` = #{latitude}

</if>

<if test=" null != createDate ">
and s.`create_date` = #{createDate}

</if>

<if test=" null != updateDate ">
@@ -260,8 +251,8 @@
</select>

<select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap">
select s.id as id,s.shop_number shopNumber,CONVERT(s.build_area,SIGNED)buildArea,
s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea,
select s.id as id,s.shop_number shopNumber, CONVERT(s.build_area,DECIMAL(10,2)) buildArea,
s.img_url imgUrl,CONVERT(s.operation_area,DECIMAL(10,2)) operationArea,
s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone,
s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,s.create_date as create_date
from wx_shop s
@@ -355,77 +346,62 @@

<if test=" null != id ">
and s.`id` = #{id}

</if>

<if test=" null != tenantId ">
and s.`tenant_id`= #{tenantId}

</if>

<if test=" null != shopNumber and ''!=shopNumber">
and s.`shop_number` like concat('%', #{shopNumber},'%')

</if>

<if test=" null != buildArea ">
and s.`build_area` like concat('%', #{buildArea},'%')

</if>

<if test=" null != operationArea ">
and s.`operation_area` like concat('%', #{operationArea},'%')

</if>

<if test=" null != building ">
and s.`building`= #{building}

</if>

<if test=" null != floor ">
and s.`floor` = #{floor}

</if>

<if test=" null != status">
and s.`status` = #{status}

</if>

<if test=" null != x ">
and s.`x` = #{x}

</if>

<if test=" null != y ">
and s.`y` = #{y}

</if>

<if test=" null != addr ">
and s.`addr` like concat('%', #{addr},'%')

</if>

<if test=" null != baiduPoi ">
and s.`baidu_poi` like concat('%', #{baiduPoi},'%')

</if>

<if test=" null != longitude ">
and s.`longitude` = #{longitude}

</if>

<if test=" null != latitude ">
and s.`latitude` = #{latitude}

</if>

<if test=" null != createDate ">
and s.`create_date` = #{createDate}

</if>

<if test=" null != updateDate ">


Loading…
Cancel
Save