xhxu 5 лет назад
Родитель
Сommit
5a7e1e28f9
7 измененных файлов: 43 добавлений и 5 удалений
  1. +17
    -1
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicChildMapper.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java
  4. +0
    -3
      mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java
  6. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  7. +5
    -0
      mallinkService/src/main/resources/mapper/wxCUserBasicChildMapper.xml

+ 17
- 1
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -3,6 +3,7 @@ package com.iformall.controller;
import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaService;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxCUserBasicChild;
import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.po.base.BaseCUserEntity;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
@@ -11,6 +12,7 @@ import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.CUserTokenService; import com.iformall.service.CUserTokenService;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxCUserBasicChildService;
import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.wechat.FmOpenService; import com.iformall.service.wechat.FmOpenService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -35,6 +37,7 @@ import java.beans.PropertyEditorSupport;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;


@RestController @RestController
public class BaseController { public class BaseController {
@@ -52,6 +55,9 @@ public class BaseController {


@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;

@Autowired
private WxCUserBasicChildService wxCUserBasicChildService;
@Autowired @Autowired
private CUserTokenService cUserTokenService; private CUserTokenService cUserTokenService;
@@ -156,7 +162,9 @@ public class BaseController {
if (member == null) { if (member == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY); throw new MallinkException(ErrorCode.USER_IS_EMPTY);
} }
RedisCacheUtils.cache(cuserBasicInfoTemplate, key, member, seconds);
setCUserBasicChild(member);

RedisCacheUtils.cache(cuserBasicInfoTemplate, key, member, seconds);
} }
return member; return member;
} }
@@ -276,5 +284,13 @@ public class BaseController {
return ipaddress; return ipaddress;
} }


private void setCUserBasicChild(WxCUserBasicInfo basicInfo){
WxCUserBasicChild child = new WxCUserBasicChild();
child.setCUserId(basicInfo.getId());
child.setTenantId(basicInfo.getFinalTenantId());
List<WxCUserBasicChild> list = wxCUserBasicChildService.findList(child);
basicInfo.setChildrenList(list);
}



} }

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

@@ -2,6 +2,7 @@ package com.iformall.mapper;


import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxCUserBasicChild; import com.iformall.domain.po.WxCUserBasicChild;
import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxCreditHistory;


import java.util.List; import java.util.List;
@@ -12,4 +13,5 @@ public interface WxCUserBasicChildMapper extends CommonMapper<WxCUserBasicChild,


int updDelById(WxCUserBasicChild record); int updDelById(WxCUserBasicChild record);


int deleteByUserBasicId(WxCUserBasicChild record);
} }

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

@@ -14,5 +14,6 @@ public interface WxCUserBasicChildService {


int updDelById(WxCUserBasicChild record); int updDelById(WxCUserBasicChild record);


int deleteByUserBasicId(WxCUserBasicChild record);
} }



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

@@ -83,7 +83,6 @@ public interface WxCUserBasicInfoService {
/** /**
* 根据Id删除实体 * 根据Id删除实体
* *
* @param id
*/ */
//void deleteById(Long id); //void deleteById(Long id);


@@ -152,14 +151,12 @@ public interface WxCUserBasicInfoService {


/** /**
* 自然增长用户 * 自然增长用户
* @param dto
* @return * @return
*/ */
long findGrowUserCount(TenantEntity tenantEntity); long findGrowUserCount(TenantEntity tenantEntity);


/** /**
* 导入用户数 * 导入用户数
* @param dto
* @return * @return
*/ */
long findImportUserCount(TenantEntity tenantEntity); long findImportUserCount(TenantEntity tenantEntity);


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

@@ -52,4 +52,9 @@ public class WxCUserBasicChildServiceImpl implements WxCUserBasicChildService {
public int updDelById(WxCUserBasicChild record) { public int updDelById(WxCUserBasicChild record) {
return wxCUserBasicChildMapper.updDelById(record); return wxCUserBasicChildMapper.updDelById(record);
} }

@Override
public int deleteByUserBasicId(WxCUserBasicChild record) {
return wxCUserBasicChildMapper.deleteByUserBasicId(record);
}
} }

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

@@ -65,6 +65,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
@Autowired @Autowired
WxCUserTagsService wxCUserTagsService; WxCUserTagsService wxCUserTagsService;


@Autowired
WxCUserBasicChildService wxCUserBasicChildService;

@Autowired @Autowired
WxScoreRulesService wxScoreRulesService; WxScoreRulesService wxScoreRulesService;


@@ -643,7 +646,16 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
@Override @Override
public void update(WxCUserBasicInfo record) { public void update(WxCUserBasicInfo record) {
if(record.isUpdChild()){ if(record.isUpdChild()){
WxCUserBasicChild childvo = new WxCUserBasicChild();
childvo.setCUserId(record.getId());
childvo.setTenantId(record.getFinalTenantId());
wxCUserBasicChildService.deleteByUserBasicId(childvo);
List<WxCUserBasicChild> childrenList = record.getChildrenList();
if(childrenList != null && childrenList.size() > 0){
for (WxCUserBasicChild child:childrenList) {
wxCUserBasicChildService.saveOrUpdate(child);
}
}
} }
wxCUserBasicInfoMapper.updateById(record); wxCUserBasicInfoMapper.updateById(record);
} }


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

@@ -65,4 +65,9 @@
update wx_c_user_basic_child set del_status = 0 where id = #{id} and tenant_id = #{tenantId} update wx_c_user_basic_child set del_status = 0 where id = #{id} and tenant_id = #{tenantId}
</update> </update>



<delete id="deleteByUserBasicId" parameterType="com.iformall.domain.po.WxCUserBasicChild">
delete from wx_c_user_basic_child where c_user_id = #{cUserId} and tenant_id = #{tenantId}
</delete>

</mapper> </mapper>

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