Browse Source

[积分][修改]:判断是否有已有积分

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
eed58e9e81
3 changed files with 18 additions and 20 deletions
  1. +12
    -15
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java
  3. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java

+ 12
- 15
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -512,21 +512,18 @@ public class WxUserGrantController extends BaseController {
user.setCountryCode(phoneNoInfo.getCountryCode());
if (isFirstPhone) {
//检查是否存在会员信息 如果有 赋值积分
List<WxCUserBasicInfo> basicInfoList = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone());
if (basicInfoList != null && !basicInfoList.isEmpty()) {
WxCUserBasicInfo basicInfo = basicInfoList.get(0);
if(basicInfo != null) {
int credit = user.getCredit() == null ? 0 : user.getCredit();
int score = user.getScore() == null ? 0 : user.getScore();
int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins();
int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit();
if (memCredit > 0) {
user.setCredit(memCredit);
wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT);
}
user.setCredit(memCredit + credit);
user.setScore(memScore + score);
}
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(user.getTenantId(), user.getPhone());
if (basicInfo != null ) {
int credit = user.getCredit() == null ? 0 : user.getCredit();
int score = user.getScore() == null ? 0 : user.getScore();
int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins();
int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit();
if (memCredit > 0) {
user.setCredit(memCredit);
wxCUserService.addCredit(user, EnumScoreType.MEM_IMPORT);
}
user.setCredit(memCredit + credit);
user.setScore(memScore + score);
}
}
wxCUserService.saveOrUpdate(user);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java View File

@@ -80,7 +80,7 @@ public interface WxCUserBasicInfoService {
void deleteById(Long id);

List<WxCUserBasicInfo> findByPhone(String tenantId, String phone);
List<WxCUserBasicInfo> findInfoByPhone(String tenantId, String phone);
WxCUserBasicInfo findInfoByPhone(String tenantId, String phone);

/**
* 修改会员积分


+ 5
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -555,15 +555,16 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
}

@Override
public List<WxCUserBasicInfo> findInfoByPhone(String tenantId, String phone) {
public WxCUserBasicInfo findInfoByPhone(String tenantId, String phone) {
WxCUserBasicInfo basic = null;
WxCUserBasicInfo basicQ = new WxCUserBasicInfo();
basicQ.setTenantId(tenantId);
basicQ.setPhone(phone);
List<WxCUserBasicInfo> basicInfos = wxCUserBasicInfoMapper.select(basicQ);
if (basicInfos != null && basicInfos.size() > 0) {
return basicInfos;
if (basicInfos.size() > 0) {
return basicInfos.get(0);
}
return null;
return basic;
}

@Override


Loading…
Cancel
Save