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

Merge branch 'devlocal' into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
2bbbeeb689
4 измененных файлов: 22 добавлений и 9 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCUserBasicInfoMapper.java
  2. +8
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
  4. +7
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

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

@@ -28,7 +28,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper<WxCUserBasicInfo, S

List<WxCUserBasicInfo> findListByScore(WxCUserBasicInfoDto dto);

List<WxCUserBasicInfo> findBirthdayList();
List<WxCUserBasicInfo> findBirthdayList(WxCUserBasicInfoDto wxCUserBasicInfoDto);

long findCount(WxCUserBasicInfoDto dto);



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

@@ -215,7 +215,10 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
}

int creditChangeNumOrigin = creditIncrement(record);
int creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin,wxCUser,wxLevelConfigMapper,wxCUserBasicInfo,wxScoreRulesService) ;
int creditChangeNum = creditChangeNumOrigin ;
if (record.getCreditType().equals(EnumScoreType.CONSUMPTION.getCode()) || record.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())) {
creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUser, wxLevelConfigMapper, wxCUserBasicInfo, wxScoreRulesService);
}

if (creditChangeNum != 0) {
Integer total = currentCreditAmount + creditChangeNum;
@@ -309,17 +312,17 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
WxCreditHistory wxCreditHistory = new WxCreditHistory();
wxCreditHistory.setBusinessId(Long.valueOf(wxMerchant.getBusinessId()));
wxCreditHistory.setTenantId(tenantId);
int credit = 0;
int credit;
int creditNew = 0 ;
if (StringUtils.isNotBlank(spendStr)) {
wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue());
credit = payAddCredit(wxCreditHistory);
if(Objects.nonNull(userId)) {
if (Objects.nonNull(userId)) {
WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(userId);
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(userId);
creditNew = CreditUtil.calUserCredit(credit,wxCUser,wxLevelConfigMapper,wxCUserBasicInfo,wxScoreRulesService) ;
creditNew = CreditUtil.calUserCredit(credit, wxCUser, wxLevelConfigMapper, wxCUserBasicInfo, wxScoreRulesService);
} else {
creditNew = credit ;
creditNew = credit;
}
}
creditMap.put("credit", creditNew);


+ 6
- 1
mallinkService/src/main/java/com/iformall/utils/CreditUtil.java Просмотреть файл

@@ -9,6 +9,10 @@ import com.iformall.service.WxScoreRulesService;
import lombok.extern.slf4j.Slf4j;

import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.Objects;

@Slf4j
@@ -34,7 +38,8 @@ public class CreditUtil {
}
// 获取生日积分倍率:
int birthdayScale = WxScoreRules.DEFAULT_SCALE;
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate())) {
//生日当天
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) || DateUtils.daysBetween(new Date(), wxCUserBasicInfo.getBirthdate()) == 0) {
WxScoreRules rules = wxScoreRulesService.getScoreRules(wxCUser.getTenantId());
if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) {
birthdayScale = rules.getScale();


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

@@ -229,9 +229,14 @@

</select>

<select id="findBirthdayList" resultMap="BaseResultMap">
<select id="findBirthdayList" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultMap="BaseResultMap">
select <include refid="allColumnsOfScoreList"/>
from wx_c_user_basic_info where birthdate is not null and phone is not null
from wx_c_user_basic_info cub
inner join wx_c_user cu on cu.id = cub.id
where cub.birthdate is not null and cu.phone is not null
<if test="null != tenantId">
and cub.tenant_id =#{tenantId}
</if>
</select>

<select id="findCount" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultType="java.lang.Long">


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