Commit 6fe27791 authored by alex yao's avatar alex yao

fix:积分包价格

parent 95984445
......@@ -58,7 +58,7 @@ public class EquityServiceImpl implements EquityService {
if (StringUtils.isNotBlank(extraData)) {
agentEquity = JsonUtils.deSerialize(extraData, AgentEquity.class);
}
agentEquity.setAmount(entity.getAmount().longValue());
agentEquity.setAmount(new BigDecimal(entity.getAmount()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
agentEquity.setPoints(entity.getResourceCount().longValue());
agentEquity.setValidityUnit(EquityEnum.VALIDITY_UNIT.valueOf(entity.getExpiredType()));
result.add(agentEquity);
......@@ -119,9 +119,9 @@ public class EquityServiceImpl implements EquityService {
currentUserPayOrderEntity.setDomain(domain);
currentUserPayOrderEntity.setExpiredNum(payOrderLogEntity.getExpiredNum());
currentUserPayOrderEntity.setExpiredType(EquityEnum.VALIDITY_UNIT.valueOf(payOrderLogEntity.getExpiredType()));
currentUserPayOrderEntity.setPointNum(new BigDecimal(payOrderLogEntity.getTotalPoints()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
currentUserPayOrderEntity.setPointNum(new BigDecimal(payOrderLogEntity.getTotalPoints()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
currentUserPayOrderEntity.setRemainExpiredDay(calculateRemainExpiredDay(currDateTime, payOrderLogEntity.getPayTime(), payOrderLogEntity.getExpiredNum(), EquityEnum.VALIDITY_UNIT.valueOf(payOrderLogEntity.getExpiredType())));
currentUserPayOrderEntity.setAmount(new BigDecimal(payOrderLogEntity.getPayAmount()));
currentUserPayOrderEntity.setAmount(new BigDecimal(payOrderLogEntity.getPayAmount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
currentUserPayOrderEntity.setPayTime(DateUtils.formatDate(payOrderLogEntity.getPayTime(), DateUtils.yyyy_MM_dd_HH_mm_ss));
currentUserPayOrderEntity.setPayChannel(payOrderLogEntity.getPayChannel());
currentUserPayOrderEntity.setPayOrderSn(payOrderLogEntity.getPayOrderSn());
......
......@@ -3,6 +3,8 @@ package cn.com.poc.equity.domain;
import cn.com.poc.equity.constants.EquityEnum;
import java.math.BigDecimal;
/**
* 应用权益
......@@ -13,9 +15,9 @@ import cn.com.poc.equity.constants.EquityEnum;
*/
public class AgentEquity {
/**
* 金额-分
* 金额
*/
private Long amount;
private BigDecimal amount;
/**
* 积分数
......@@ -53,11 +55,11 @@ public class AgentEquity {
this.knowledgeNum = knowledgeNum;
}
public Long getAmount() {
public BigDecimal getAmount() {
return amount;
}
public void setAmount(Long amount) {
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
......
......@@ -52,7 +52,7 @@ public class EquityRestImpl implements EquityRest {
Integer amount = bizPaymentPackageConfigurationEntity.getAmount();
Integer points = bizPaymentPackageConfigurationEntity.getResourceCount();
pointEquityInfo.setPoints(points.longValue());
pointEquityInfo.setAmount(new BigDecimal(amount).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
pointEquityInfo.setAmount(new BigDecimal(amount).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
if (type.equals(EquityEnum.TYPE.normal.name())) {
result.setNormal(pointEquityInfo);
} else if (type.equals(EquityEnum.TYPE.professional.name())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment