| @@ -43,7 +43,6 @@ public class WxBillActionController extends BaseController { | |||||
| wxBillAction = new WxBillAction(); | wxBillAction = new WxBillAction(); | ||||
| } | } | ||||
| wxBillAction.setTenantId(getTenantId()); | wxBillAction.setTenantId(getTenantId()); | ||||
| wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); | |||||
| PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -402,9 +402,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 | int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 | ||||
| // 4. 计算积分 | // 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; | return addCreditNumber; | ||||
| } | } | ||||
| @@ -320,9 +320,14 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 | int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 | ||||
| // 4. 计算成长值 | // 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. 增长的成长值 | // 5. 增长的成长值 | ||||
| updateScore(order.getCUserId(), addScoreNumber); | updateScore(order.getCUserId(), addScoreNumber); | ||||
| @@ -50,6 +50,7 @@ | |||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| <if test=" null == sortColumns">order by createtime desc</if> | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxBillAction" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxBillAction" resultMap="BaseResultMap"> | ||||