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

Merge branch 'release_toaliyun_real_2022_init' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_init

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
201e4bf9d2
6 измененных файлов: 14 добавлений и 17 удалений
  1. +8
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java
  3. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
  4. +1
    -2
      mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml
  5. +0
    -6
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml

+ 8
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -89,8 +89,10 @@ public class WxCouponChannelController extends BaseController {
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) { if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
if(page.getList() != null && page.getList().size() > 0){
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
}
} }
return new ResultData(page); return new ResultData(page);
} }
@@ -171,8 +173,10 @@ public class WxCouponChannelController extends BaseController {
logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page);
if (null == page ) { if (null == page ) {
page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
if(page.getList() != null && page.getList().size() > 0){
filterTimed(wxCouponChannel, page);
RedisCacheUtils.cache(redisTemplate, key, page, 100);
}
} }


if(wxCouponChannel.getMerchantId() != null){ if(wxCouponChannel.getMerchantId() != null){


+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java Просмотреть файл

@@ -1,8 +1,6 @@
package com.iformall.mapper; package com.iformall.mapper;


import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;


import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxCUserTags; import com.iformall.domain.po.WxCUserTags;


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

@@ -233,8 +233,10 @@ public class WxGameServiceImpl implements WxGameService {
List<WxCouponChannelVo> voList = wxCouponChannelService.newfindListVo(couponChannelQ); List<WxCouponChannelVo> voList = wxCouponChannelService.newfindListVo(couponChannelQ);


Map<Long, WxCouponChannelVo> wxCouponChannelsMap = new HashMap<Long, WxCouponChannelVo>(); Map<Long, WxCouponChannelVo> wxCouponChannelsMap = new HashMap<Long, WxCouponChannelVo>();
for(WxCouponChannelVo wxCouponChannelVo: voList) {
wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo);
if(voList != null && voList.size() > 0){
for(WxCouponChannelVo wxCouponChannelVo: voList) {
wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo);
}
} }


// get game's coupon // get game's coupon


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

@@ -95,10 +95,9 @@
from wx_c_user_tags from wx_c_user_tags
where tenant_id = #{tenantId} where tenant_id = #{tenantId}
<if test=" null != tagIds"> <if test=" null != tagIds">
and JSON_CONTAINS(cut.tags,#{tagIds})
and JSON_CONTAINS(tags,#{tagIds})
</if> </if>


</select> </select>



</mapper> </mapper>

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

@@ -702,13 +702,7 @@
<result column="source_type" jdbcType="INTEGER" property="sourceType"/> <result column="source_type" jdbcType="INTEGER" property="sourceType"/>


<result column="gift_list" jdbcType="VARCHAR" property="giftList"></result> <result column="gift_list" jdbcType="VARCHAR" property="giftList"></result>


<collection column="{productId=id,tenantId=tenant_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo"
javaType="java.util.List"
select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantBaseList">
</collection>
</resultMap> </resultMap>


<resultMap id="WxCouponCVoMapL" type="com.iformall.domain.vo.WxCouponCVo"> <resultMap id="WxCouponCVoMapL" type="com.iformall.domain.vo.WxCouponCVo">


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

@@ -84,7 +84,7 @@
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>


<select id="findMerchantIdListByProduct" parameterType="java.util.Map" resultMap="BaseResultMap">
<select id="findMerchantIdListByProduct" parameterType="java.util.Map" resultType="Long">
select distinct cm.merchant_id select distinct cm.merchant_id
from wx_coupon_merchant cm from wx_coupon_merchant cm
where cm.status = 0 where cm.status = 0


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