| @@ -79,6 +79,7 @@ public class WxMemController extends BaseController { | |||||
| WxCUserVo userVo = new WxCUserVo(); | WxCUserVo userVo = new WxCUserVo(); | ||||
| org.springframework.beans.BeanUtils.copyProperties(wxCUserBasicInfo, userVo); | org.springframework.beans.BeanUtils.copyProperties(wxCUserBasicInfo, userVo); | ||||
| userVo.setScore(wxCUserBasicInfo.getPoins()); | |||||
| // if (wxCUserBasicInfo != null) { | // if (wxCUserBasicInfo != null) { | ||||
| // userVo.setName(wxCUserBasicInfo.getName()); | // userVo.setName(wxCUserBasicInfo.getName()); | ||||
| @@ -220,7 +220,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| WxLevelConfig wxLevelConfig = new WxLevelConfig(); | 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); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); | wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); | ||||
| @@ -179,14 +179,6 @@ | |||||
| <select id="loginCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Integer"> | <select id="loginCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Integer"> | ||||
| select COUNT(0) from wx_credit_history | select COUNT(0) from wx_credit_history | ||||
| where 1=1 | 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 "> | <if test=" null != cUserId "> | ||||
| and `c_user_id` = #{cUserId} | and `c_user_id` = #{cUserId} | ||||
| </if> | </if> | ||||
| @@ -91,12 +91,6 @@ | |||||
| select count(*) | select count(*) | ||||
| from wx_score_history | from wx_score_history | ||||
| where 1=1 | 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 "> | <if test=" null != cUserId "> | ||||
| and `c_user_id` = #{cUserId} | and `c_user_id` = #{cUserId} | ||||
| </if> | </if> | ||||