Просмотр исходного кода

[shop][修复]:版本修复

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
80ebfd06fd
2 измененных файлов: 7 добавлений и 31 удалений
  1. +4
    -28
      mallinkService/src/main/resources/mapper/WxShopMapper.xml
  2. +3
    -3
      pom.xml

+ 4
- 28
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -158,7 +158,8 @@
m.link_person linkPerson,m.link_phone linkPhone,s.manager,s.manager_phone managerPhone, 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 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 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_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_mall_floor f on s.floor=f.id
@@ -186,52 +187,42 @@


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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


<select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap"> <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.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 s.type,s.point_type pointType,s.addr,DATEDIFF(now(),s.create_date) freeDay,s.create_date as create_date
from wx_shop s from wx_shop s
@@ -355,77 +346,62 @@


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


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

</if> </if>


<if test=" null != updateDate "> <if test=" null != updateDate ">


+ 3
- 3
pom.xml Просмотреть файл

@@ -194,17 +194,17 @@
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.9.2</version>
<version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version>
<version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-spring-web</artifactId> <artifactId>springfox-spring-web</artifactId>
<version>2.9.2</version>
<version>2.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>


Загрузка…
Отмена
Сохранить