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

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
3af45fc7ea
4 измененных файлов: 6 добавлений и 15 удалений
  1. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +0
    -8
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
  4. +0
    -6
      mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml

+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java Просмотреть файл

@@ -79,6 +79,7 @@ public class WxMemController extends BaseController {

WxCUserVo userVo = new WxCUserVo();
org.springframework.beans.BeanUtils.copyProperties(wxCUserBasicInfo, userVo);
userVo.setScore(wxCUserBasicInfo.getPoins());

// if (wxCUserBasicInfo != null) {
// userVo.setName(wxCUserBasicInfo.getName());


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

@@ -220,7 +220,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}

WxLevelConfig wxLevelConfig = new WxLevelConfig();
wxLevelConfig.setTenantId(wxMerchant.getTenantId());
if(StringUtils.isNotBlank(wxMerchant.getParentTenantId())){
wxLevelConfig.setTenantId(wxMerchant.getParentTenantId());
}else{
wxLevelConfig.setTenantId(wxMerchant.getTenantId());
}
wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC);
wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig));



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

@@ -179,14 +179,6 @@
<select id="loginCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Integer">
select COUNT(0) from wx_credit_history
where 1=1
<choose>
<when test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</when>
<otherwise>
and `tenant_id` = #{tenantId}
</otherwise>
</choose>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>


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

@@ -91,12 +91,6 @@
select count(*)
from wx_score_history
where 1=1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != cUserId ">
and `c_user_id` = #{cUserId}
</if>


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