xhxu 5 лет назад
Родитель
Сommit
f09587f8ef
3 измененных файлов: 4 добавлений и 3 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java Просмотреть файл

@@ -788,6 +788,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
if (userTags.getId() != null) {
wxCUserTagsMapper.updateById(userTags);
} else {
userTags.setTenantId(wxCUserBasicInfo.getFinalTenantId());
userTags.setCreateDate(new Date());
userTags.setUpdateDate(new Date());
wxCUserTagsMapper.insert(userTags);


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

@@ -717,6 +717,7 @@
#{idItem}
</foreach>
</if>
order by cu.`active_time` DESC
<!--<if test=" null != sortColumns">order by ${sortColumns}</if>-->
</sql>

@@ -790,6 +791,7 @@
#{idItem}
</foreach>
</if>
order by cu.`active_time` DESC
<!-- <if test=" null != sortColumns">order by ${sortColumns}</if>-->
</sql>

@@ -801,7 +803,6 @@
<if test=" null != begin ">
limit #{begin}, #{limit}
</if>
order by cu.`active_time` DESC
</select>

<select id="findVoList1" resultMap="VoBaseResultMap">
@@ -814,7 +815,6 @@
<if test=" null != basicInfo.begin ">
limit #{basicInfo.begin}, #{basicInfo.limit}
</if>
order by cu.`active_time` DESC
</select>

<select id="countVoList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultType="java.lang.Integer">


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

@@ -790,7 +790,7 @@
</if>
) co
ON co.coupon_id = couc.product_id
INNER JOIN wx_c_user_basic_info cu ON cu.id=co.c_user_id
LEFT JOIN wx_c_user_basic_info cu ON cu.id=co.c_user_id
LEFT JOIN wx_coupon c ON c.id = co.coupon_id
LEFT JOIN wx_merchant m1 ON m1.id = couc.merchant_id
LEFT JOIN wx_merchant_subsidy ms ON co.id = ms.coupon_order_id AND ms.type = 1


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