Преглед на файлове

Merge commit '32519d976443a604b9fbbde3d3c95ba29dcb0240' into release

release_toaliyun_real
luozukai преди 6 години
родител
ревизия
8c52c67667
променени са 4 файла, в които са добавени 17 реда и са изтрити 7 реда
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java
  2. +8
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  3. +8
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/resources/mapper/WxBillActionMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java Целия файл

@@ -43,7 +43,6 @@ public class WxBillActionController extends BaseController {
wxBillAction = new WxBillAction();
}
wxBillAction.setTenantId(getTenantId());
wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC);
PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize);
return new ResultData(result);
}

+ 8
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Целия файл

@@ -402,9 +402,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分

// 4. 计算积分
Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore);
addCreditNumber = dScoreT.intValue();
log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: " + addCreditNumber);
if(record.getSpend() >= priceCondition.intValue()) {
Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore);
addCreditNumber = dScoreT.intValue();
log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: " + addCreditNumber);
} else {
log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: 0, not touch credit limit");
return 0;
}

return addCreditNumber;
}


+ 8
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Целия файл

@@ -320,9 +320,14 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分

// 4. 计算成长值
Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore);
addScoreNumber = dScoreT.intValue();
logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber);
if(order.getPayment() >= priceCondition.intValue()) {
Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore);
addScoreNumber = dScoreT.intValue();
logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber);
} else {
logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: 0, not touch score limit");
return 0;
}

// 5. 增长的成长值
updateScore(order.getCUserId(), addScoreNumber);


+ 1
- 0
mallinkService/src/main/resources/mapper/WxBillActionMapper.xml Целия файл

@@ -50,6 +50,7 @@
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
<if test=" null == sortColumns">order by createtime desc</if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxBillAction" resultMap="BaseResultMap">


Зареждане…
Отказ
Запис