fix: 茅台预约,自测问题修复及优化。
This commit is contained in:
@@ -13,5 +13,6 @@ import io.swagger.annotations.ApiModel;
|
|||||||
@Data
|
@Data
|
||||||
public class IUserVo extends IUser
|
public class IUserVo extends IUser
|
||||||
{
|
{
|
||||||
|
private String shopName;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,10 +33,44 @@
|
|||||||
<result property="districtName" column="district_name" />
|
<result property="districtName" column="district_name" />
|
||||||
<result property="userName" column="user_name" />
|
<result property="userName" column="user_name" />
|
||||||
<result property="itemName" column="item_name" />
|
<result property="itemName" column="item_name" />
|
||||||
|
<result property="shopName" column="shop_name" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectIUserVo">
|
<sql id="selectIUserVo">
|
||||||
select a.mobile, a.user_id,a.district_name,a.user_name,a.item_name, a.token, a.cookie, a.device_id, a.item_code, a.ishop_id, a.province_name, a.city_name, a.address, a.lat, a.lng, a.minute, a.shop_type, a.random_minute, a.push_plus_token, a.json_result, a.remark, a.expire_time, a.del_flag, a.create_time, a.create_user, a.update_time, a.update_user, a.create_by from i_user a
|
select
|
||||||
|
a.mobile,
|
||||||
|
a.user_id,
|
||||||
|
a.district_name,
|
||||||
|
a.user_name,
|
||||||
|
a.item_name,
|
||||||
|
a.token,
|
||||||
|
a.cookie,
|
||||||
|
a.device_id,
|
||||||
|
a.item_code,
|
||||||
|
a.ishop_id,
|
||||||
|
a.province_name,
|
||||||
|
a.city_name,
|
||||||
|
a.address,
|
||||||
|
a.lat,
|
||||||
|
a.lng,
|
||||||
|
a.minute,
|
||||||
|
a.shop_type,
|
||||||
|
a.random_minute,
|
||||||
|
a.push_plus_token,
|
||||||
|
a.json_result,
|
||||||
|
a.remark,
|
||||||
|
a.expire_time,
|
||||||
|
a.del_flag,
|
||||||
|
a.create_time,
|
||||||
|
a.create_user,
|
||||||
|
a.update_time,
|
||||||
|
a.update_user,
|
||||||
|
a.create_by,
|
||||||
|
is2."name" as shop_name
|
||||||
|
from
|
||||||
|
i_user a
|
||||||
|
left join i_shop is2 on is2.i_shop_id =a.ishop_id
|
||||||
|
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectIUserList" parameterType="IUserDto" resultMap="IUserResult">
|
<select id="selectIUserList" parameterType="IUserDto" resultMap="IUserResult">
|
||||||
@@ -132,7 +166,7 @@
|
|||||||
<if test="updateUser != null">#{updateUser},</if>
|
<if test="updateUser != null">#{updateUser},</if>
|
||||||
<if test="createBy != null">#{createBy},</if>
|
<if test="createBy != null">#{createBy},</if>
|
||||||
<if test="districtName != null">#{districtName},</if>
|
<if test="districtName != null">#{districtName},</if>
|
||||||
<if test="userName != null">#{createBy},</if>
|
<if test="userName != null">#{userName},</if>
|
||||||
<if test="itemName != null">#{itemName},</if>
|
<if test="itemName != null">#{itemName},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|||||||
Reference in New Issue
Block a user