记得上下班打卡 | git大法好,push需谨慎

Commit b4f4afe0 authored by GaoHu's avatar GaoHu

bug:修改使用stripTrailingZeros()后采用科学技术法

parent 68b4a736
......@@ -405,10 +405,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userDataAgentVo.setTicketsId(showBaseVoDto.getTid());
userDataAgentVo.setTicketName(smileAgent.getTitle());
userDataAgentVo.setNumber(showBaseVoDto.getNumber());
userDataAgentVo.setPrice(showBaseVoDto.getPrice().stripTrailingZeros());
userDataAgentVo.setPriceReal(showBaseVoDto.getPriceReal().stripTrailingZeros());
userDataAgentVo.setPrice(new BigDecimal(showBaseVoDto.getPrice().stripTrailingZeros().toPlainString()));
userDataAgentVo.setPriceReal(new BigDecimal(showBaseVoDto.getPriceReal().stripTrailingZeros().toPlainString()));
// userDataAgentVo.setAgent(showBaseVoDto.getUse());
userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().stripTrailingZeros());
userDataAgentVo.setCommission(new BigDecimal(showBaseVoDto.getTotalPrice().stripTrailingZeros().toPlainString()));
} else {
//没有买过
userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
......@@ -425,12 +425,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
//判断是否为总代
if (baseVoDto.getType() != 5) {
//不是特邀代理 //在原有的数据上新增加该用户下所有普代的提成
userData.setTotalCommission(totalCommission.stripTrailingZeros());
userData.setTotalCommission(new BigDecimal(totalCommission.stripTrailingZeros().toPlainString()));
if (agentIdMasterMap.get(baseVoDto.getAgentId()) != null) {
userData.setTotalCommission(totalCommission.add(agentIdMasterMap.get(baseVoDto.getAgentId())).stripTrailingZeros());
userData.setTotalCommission(new BigDecimal(totalCommission.add(agentIdMasterMap.get(baseVoDto.getAgentId())).stripTrailingZeros().toPlainString()));
}
} else {
userData.setTotalCommission(totalCommission.stripTrailingZeros());
userData.setTotalCommission(new BigDecimal(totalCommission.stripTrailingZeros().toPlainString()));
}
userData.setUid(showBaseVoDtoList.get(0).getAgentId());
userData.setUsername(showBaseVoDtoList.get(0).getName());
......@@ -468,7 +468,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
}
//不是特邀代理 //在原有的数据上新增加该用户下所有普代的提成
BigDecimal decimal = agentIdMasterMap.get(smileUser.getUid());
userData.setTotalCommission(decimal.stripTrailingZeros());
userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString()));
userData.setUid(smileUser.getUid());
userData.setUsername(smileUser.getName());
userData.setCityName(smileUser.getCity());
......@@ -565,9 +565,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat("--").concat(end).concat(")"));
}
//总代票提
showAgentVo.setTotalCarry(smileAgent.getTotalCarry().stripTrailingZeros());
showAgentVo.setTotalCarry(new BigDecimal(smileAgent.getTotalCarry().stripTrailingZeros().toPlainString()));
//普代票提
showAgentVo.setOrdCarry(smileAgent.getOrdCarry().stripTrailingZeros());
showAgentVo.setOrdCarry(new BigDecimal(smileAgent.getOrdCarry().stripTrailingZeros().toPlainString()));
return showAgentVo;
}
......
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