bug有快递费的佣金计算问题

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -66,7 +66,7 @@
                         <td th:if="${item.type==2}" th:text="普代"></td>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
-                        <td th:text="${#aggregates.sum(item.dataAgentVos.![price*number])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![priceReal])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![commission])}"></td>
                         <td th:if="${item.priceStatus!=0}" th:text="待打款"></td>
                         <td th:if="${item.priceStatus==0}" th:text="已打款"></td>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

@@ -35,6 +35,12 @@ public class UserDataAgentVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "单价", example = "")
     private BigDecimal price;
 
+    /**
+     * 单价
+     */
+    @ApiModelProperty(value = "真实付款金额", example = "")
+    private BigDecimal priceReal;
+
     /**
      * 票提
      */

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

@@ -363,6 +363,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(showBaseVoDto.getNumber());
                     userDataAgentVo.setPrice(showBaseVoDto.getPrice());
+                    userDataAgentVo.setPriceReal(showBaseVoDto.getPriceReal());
 //                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
                     userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().setScale(2, RoundingMode.HALF_UP));
                 } else {
@@ -371,6 +372,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(new BigDecimal(0));
                     userDataAgentVo.setPrice(new BigDecimal(0));
+                    userDataAgentVo.setPriceReal(new BigDecimal("0.00"));
 //                    userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
                     userDataAgentVo.setCommission(new BigDecimal("0.00"));
                 }
@@ -409,6 +411,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(new BigDecimal(0));
                     userDataAgentVo.setPrice(new BigDecimal(0));
+                    userDataAgentVo.setPriceReal(new BigDecimal("0.00"));
                     userDataAgentVo.setCommission(new BigDecimal("0.00"));
                     userDataAgentVos.add(userDataAgentVo);
                     //是总代  //在原有的数据上新增加该用户下所有普代的提成

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -37,6 +37,11 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private BigDecimal price;
 
+    /**
+     * 真实付款金额
+     */
+    private BigDecimal priceReal;
+
     /**
      * 票提
      */

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -115,6 +115,7 @@
             sukotr.ticket_id AS tid,
             sukotr.type,
             kot.price,
+            SUM(kot.price_actual - kot.price_refund) price_real,
             sukotr.agent_distributions AS `use`,
             SUM( kot.number - kot.refund_number ) number,
             SUM( ( kot.price_actual - kot.price_refund ) * sukotr.agent_distributions ) totalPrice