exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowBaseController.java

@@ -22,7 +22,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 
 /**
  * @author TT

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -403,10 +403,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setTicketsId(showBaseVoDto.getTid());
                         userDataAgentVo.setTicketName(smileAgent.getTitle());
                         userDataAgentVo.setNumber(showBaseVoDto.getNumber());
-                        userDataAgentVo.setPrice(showBaseVoDto.getPrice());
-                        userDataAgentVo.setPriceReal(showBaseVoDto.getPriceReal());
+                        userDataAgentVo.setPrice(showBaseVoDto.getPrice().stripTrailingZeros());
+                        userDataAgentVo.setPriceReal(showBaseVoDto.getPriceReal().stripTrailingZeros());
 //                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
-                        userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice());
+                        userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().stripTrailingZeros());
                     } else {
                         //没有买过
                         userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
@@ -422,7 +422,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     //是总代  //在原有的数据上新增加该用户下所有普代的提成
                     Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, baseVoDto.getAgentId(), smileAgent.getTicketsId());
                     if (orgMap != null) {
-                        userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))));
+                        userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).stripTrailingZeros());
                     }
 //                    }
                     userDataAgentVos.add(userDataAgentVo);
@@ -457,7 +457,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         //是总代  //在原有的数据上新增加该用户下所有普代的提成
                         Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
                         if (orgMap != null) {
-                            userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
+                            userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).stripTrailingZeros());
                         }
                         price = price.add(userDataAgentVo.getCommission());
                         userDataAgentVos.add(userDataAgentVo);
@@ -596,9 +596,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat("--").concat(end).concat(")"));
         }
         //总代票提
-        showAgentVo.setTotalCarry(smileAgent.getTotalCarry());
+        showAgentVo.setTotalCarry(smileAgent.getTotalCarry().stripTrailingZeros());
         //普代票提
-        showAgentVo.setOrdCarry(smileAgent.getOrdCarry());
+        showAgentVo.setOrdCarry(smileAgent.getOrdCarry().stripTrailingZeros());
         return showAgentVo;
     }