盲票实时毛利、终极毛利后台展示

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/IndexMgrController.java

@@ -745,8 +745,8 @@ public class IndexMgrController extends BaseApiController {
 
 		payAmt.put("today", todayPayAmt);
 		payAmt.put("yesterday", yesterdayPayAmt);
-		realPayAmt.put("realTodayPayAmt", realTodayPayAmt);
-		realPayAmt.put("realYesterdayPayAmt", realYesterdayPayAmt);
+		realPayAmt.put("today", realTodayPayAmt);
+		realPayAmt.put("yesterday", realYesterdayPayAmt);
 		payUser.put("today", todayPayUserCnt);
 		payUser.put("yesterday", yesterdayPayUserCnt);
 		ticketNum.put("today", todayTicketNum);

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -165,7 +165,7 @@ public class TicketBoxMgrController extends BaseApiController {
         ticketBoxGrossProfitParam.setBoxId(box.getBoxId());
         ticketBoxGrossProfitParam.setTicketOrderStatus(0);
         ticketBoxGrossProfitParam.setChannelOrderStatus(0);
-        ticketBoxGrossProfitParam.setChannelOrderType(1);
+        ticketBoxGrossProfitParam.setChannelOrderType(2);
         TicketBoxGrossProfitVO boxGrossProfit = userTicketOrderService.selectTicketBoxGrossProfitByTicketOrderAndChannelOrder(ticketBoxGrossProfitParam);
         // 佣金成本
         List<ChannelCommission> commissions = commissionService.list(new QueryWrapper<ChannelCommission>().eq("box_id", box.getBoxId()));

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -254,7 +254,7 @@
 			  where t1.box_id = #{param.boxId}
 				and t1.status > #{param.ticketOrderStatus}
 
-			  union
+			  union all
 
 			  select sum(a1.pay_amt) as pay_amt
 			  from mp_channel_order a1
@@ -262,7 +262,7 @@
 								 on a1.order_id = a2.order_id
 			  where a2.box_id = #{param.boxId}
 				and a1.status > #{param.channelOrderStatus}
-				and  a1.type > #{param.channelOrderType}
+				and  a1.type = #{param.channelOrderType}
 			  ) a
 	</select>
 	<select id="listPrizeCost" resultType="com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO">