exit 销售数据统计

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

@@ -42,4 +42,15 @@ public class SmileShowBaseController extends BaseController {
         return prefix + "/smileTickets/saleData";
     }
 
+    /*@GetMapping("/saleDataTest/{performancesId}")
+    @ApiOperation("销售数据Test")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "performancesId", value = "演出ID")
+    })
+    @ResponseBody
+    public AjaxResult saleDataTest(@PathVariable("performancesId") String performancesId) {
+        SaleDataVo saleDataVo = smileShowService.saleData(performancesId);
+        return AjaxResult.success(saleDataVo);
+    }*/
+
 }

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

@@ -65,7 +65,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])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![price*number])}"></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/service/impl/SmileShowServiceImpl.java

@@ -33,6 +33,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -340,14 +342,14 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userDataAgentVo.setNumber((BigDecimal) userMap.get("num"));
                 userDataAgentVo.setPrice((BigDecimal) userMap.get("price"));
                 userDataAgentVo.setAgent((BigDecimal) userMap.get("use"));
-                userDataAgentVo.setCommission((BigDecimal) userMap.get("totalPrice"));
+                userDataAgentVo.setCommission(((BigDecimal) userMap.get("totalPrice")).setScale(2, RoundingMode.HALF_UP));
             } else {
                 userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                 userDataAgentVo.setTicketName(smileAgent.getTitle());
                 userDataAgentVo.setNumber(new BigDecimal(0));
                 userDataAgentVo.setPrice(new BigDecimal(0));
                 userDataAgentVo.setAgent(smileUser.getType() == 1 ? map.get(smileAgent.getTicketsId()).getTotalCarry() : map.get(smileAgent.getTicketsId()).getOrdCarry());
-                userDataAgentVo.setCommission(new BigDecimal(0));
+                userDataAgentVo.setCommission(new BigDecimal(0.00));
                 log.debug("saleData：演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
             }
             //判断该用户是否是总代理
@@ -355,7 +357,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")));
+                    userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
                 } else {
                     log.debug("saleData：演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
                 }

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

@@ -45,6 +45,7 @@
         FROM
             (
                 SELECT
+                    kot.order_tickets_id,
                     kote.ticket_id,
                     kote.performance_id,
                     kotr.agent_id,
@@ -67,6 +68,7 @@
                   AND kotr.agent_status = 1
                   AND kotr.agent_id = #{uid}
                   AND kote.ticket_id = #{ticketId}
+                GROUP BY kot.order_tickets_id
             ) kk
                 LEFT JOIN (
                 SELECT