diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index 312a1e8c3..cfa0f10ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java +++ b/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 result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 2320f4ed3..e81e7d23b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/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; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 7fcd0141f..e44559cc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/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); diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index 51fa40e53..51c8bcb69 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -50,6 +50,7 @@ order by ${sortColumns} + order by createtime desc