盲票统计修改

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

@@ -8,6 +8,7 @@ import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserDeliverOrder;
+import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.service.IUserTicketOrderService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
@@ -58,7 +59,7 @@ public class IndexMgrController extends BaseApiController {
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		
 		List<IndexVO> list = new ArrayList<IndexVO>();
-		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
@@ -181,7 +182,7 @@ public class IndexMgrController extends BaseApiController {
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		
 		List<IndexVO> list = new ArrayList<IndexVO>();
-		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
@@ -457,7 +458,7 @@ public class IndexMgrController extends BaseApiController {
 		List<IndexVO> list = new ArrayList<IndexVO>();
 		List<IndexVO> siteList = new ArrayList<IndexVO>();
 		
-		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
@@ -563,7 +564,7 @@ public class IndexMgrController extends BaseApiController {
 		
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		List<IndexVO> list = new ArrayList<IndexVO>();
-		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);
@@ -606,7 +607,7 @@ public class IndexMgrController extends BaseApiController {
 		
 		IndexQueryParam queryParam = getQueryParam(indeQueryParam);
 		List<IndexVO> list = new ArrayList<IndexVO>();
-		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<UserTicketOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "DATE_FORMAT(t1.created_time, '%Y-%m-%d')", queryParam.getEndTime());
 		queryWrapper.gt("t1.`status`", 0);

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

@@ -23,8 +23,11 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.ChannelRoleEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysUserService;
+import com.qs.mp.user.domain.UserTicketOrder;
+import com.qs.mp.user.service.IUserTicketOrderService;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -65,6 +68,9 @@ public class SaleSiteMgrController extends BaseApiController {
 
 	@Autowired
 	private IChannelOrderService channelOrderService;
+	
+	@Autowired
+	private IUserTicketOrderService userTicketOrderService;
 
 	@Autowired
 	private ISysUserService userService;
@@ -354,10 +360,15 @@ public class SaleSiteMgrController extends BaseApiController {
 		}
 	    // 查询经销商销售额、佣金收入、订单数等
 	    ChannelOperDataVO channelOperDataVO = channelService.getChannelTotalOperData(channelVO.getChannelNo());
-		LambdaQueryWrapper<ChannelOrder> queryWrapper = new LambdaQueryWrapper<ChannelOrder>();
-		queryWrapper.eq(ChannelOrder::getChannelId, channelId);
-		int orderCnt = channelOrderService.count(queryWrapper);
-		channelOperDataVO.setOrderCnt(orderCnt);
+		// LambdaQueryWrapper<ChannelOrder> queryWrapper = new LambdaQueryWrapper<ChannelOrder>();
+		// queryWrapper.eq(ChannelOrder::getChannelId, channelId);
+//		int orderCnt = channelOrderService.count(queryWrapper);
+//		channelOperDataVO.setOrderCnt(orderCnt);
+		
+		// 盲票销售张数
+		int ticketSaleCnt = userTicketOrderService.getSaleSiteTotalTicketNumCnt(channelVO.getChannelId());
+		channelOperDataVO.setTicketSaleCnt(ticketSaleCnt);
+		
 	    channelVO.setOperData(channelOperDataVO);
 		return AjaxResult.success(channelVO);
 	}

mp-service/src/main/java/com/qs/mp/user/mapper/UserTicketOrderMapper.java

@@ -24,35 +24,35 @@ public interface UserTicketOrderMapper extends BaseMapper<UserTicketOrder> {
 	   * @param wrapper
 	   * @return
 	   */
-	  List<IndexVO> selectIndexPayAmtList(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	  List<IndexVO> selectIndexPayAmtList(@Param(Constants.WRAPPER) Wrapper<UserTicketOrder> wrapper);
 	  
 	  /**
 	   * 统计交易用户数
 	   * @param wrapper
 	   * @return
 	   */
-	  List<IndexVO> selectIndexPayUserCntList(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	  List<IndexVO> selectIndexPayUserCntList(@Param(Constants.WRAPPER) Wrapper<UserTicketOrder> wrapper);
 	  
 	  /**
 	   * 统计实时交易数据
 	   * @param wrapper
 	   * @return
 	   */
-	  List<IndexVO> selectIndexDailyInfoList(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	  List<IndexVO> selectIndexDailyInfoList(@Param(Constants.WRAPPER) Wrapper<UserTicketOrder> wrapper);
 	  
 	  /**
 	   * 统计票组销售TOP10
 	   * @param wrapper
 	   * @return
 	   */
-	  List<IndexVO> selectIndexTicketBoxTop(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	  List<IndexVO> selectIndexTicketBoxTop(@Param(Constants.WRAPPER) Wrapper<UserTicketOrder> wrapper);
 	  
 	  /**
 	   * 统计经销商交易额TOP10
 	   * @param wrapper
 	   * @return
 	   */
-	  List<IndexVO> selectIndexTicketSiteTop(@Param(Constants.WRAPPER) Wrapper<UserDeliverOrder> wrapper);
+	  List<IndexVO> selectIndexTicketSiteTop(@Param(Constants.WRAPPER) Wrapper<UserTicketOrder> wrapper);
 	  
 	  /**
 	   * 查询子渠道全部的盲票销售张数
@@ -60,4 +60,12 @@ public interface UserTicketOrderMapper extends BaseMapper<UserTicketOrder> {
 	   * @return
 	   */
 	  int getChannelTotalTicketNumCnt(@Param("channelNo") String channelNo);
+	  
+	  /**
+	   * 查询经销商的盲票销售张数
+	   * @param channelNo
+	   * @return
+	   */
+	  int getSaleSiteTotalTicketNumCnt(@Param("channelId") Long channelId);
+	  
 }

mp-service/src/main/java/com/qs/mp/user/service/IUserTicketOrderService.java

@@ -66,21 +66,21 @@ public interface IUserTicketOrderService extends IService<UserTicketOrder> {
    * @param wrapper
    * @return
    */
-  List<IndexVO> selectIndexPayAmtList(Wrapper<UserDeliverOrder> wrapper);
+  List<IndexVO> selectIndexPayAmtList(Wrapper<UserTicketOrder> wrapper);
   
   /**
    * 统计交易用户数
    * @param wrapper
    * @return
    */
-  List<IndexVO> selectIndexPayUserCntList(Wrapper<UserDeliverOrder> wrapper);
+  List<IndexVO> selectIndexPayUserCntList(Wrapper<UserTicketOrder> wrapper);
   
   /**
    * 统计实时交易数据
    * @param wrapper
    * @return
    */
-  List<IndexVO> selectIndexDailyInfoList(Wrapper<UserDeliverOrder> wrapper);
+  List<IndexVO> selectIndexDailyInfoList(Wrapper<UserTicketOrder> wrapper);
   
   
   /**
@@ -88,14 +88,14 @@ public interface IUserTicketOrderService extends IService<UserTicketOrder> {
    * @param wrapper
    * @return
    */
-  List<IndexVO> selectIndexTicketBoxTop(Wrapper<UserDeliverOrder> wrapper);
+  List<IndexVO> selectIndexTicketBoxTop(Wrapper<UserTicketOrder> wrapper);
   
   /**
    * 统计经销商交易额TOP10
    * @param wrapper
    * @return
    */
-  List<IndexVO> selectIndexTicketSiteTop(Wrapper<UserDeliverOrder> wrapper);
+  List<IndexVO> selectIndexTicketSiteTop(Wrapper<UserTicketOrder> wrapper);
   
 
  /**
@@ -105,4 +105,12 @@ public interface IUserTicketOrderService extends IService<UserTicketOrder> {
   */
   int getChannelTotalTicketNumCnt(String channelNo);
   
+
+  /**
+  * 查询子渠道全部的盲票销售张数
+  * @param channelNo
+  * @return
+   */
+   int getSaleSiteTotalTicketNumCnt(Long channelId);
+  
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -473,33 +473,37 @@ public class UserTicketOrderServiceImpl extends
   }
 
 	@Override
-	public List<IndexVO> selectIndexPayAmtList(Wrapper<UserDeliverOrder> wrapper) {
+	public List<IndexVO> selectIndexPayAmtList(Wrapper<UserTicketOrder> wrapper) {
 		return getBaseMapper().selectIndexPayAmtList(wrapper);
 	}
 	
 	@Override
-	public List<IndexVO> selectIndexPayUserCntList(Wrapper<UserDeliverOrder> wrapper) {
+	public List<IndexVO> selectIndexPayUserCntList(Wrapper<UserTicketOrder> wrapper) {
 		return getBaseMapper().selectIndexPayUserCntList(wrapper);
 	}
 
 	@Override
-	public List<IndexVO> selectIndexDailyInfoList(Wrapper<UserDeliverOrder> wrapper) {
+	public List<IndexVO> selectIndexDailyInfoList(Wrapper<UserTicketOrder> wrapper) {
 		return getBaseMapper().selectIndexDailyInfoList(wrapper);
 	}
 
 	@Override
-	public List<IndexVO> selectIndexTicketBoxTop(Wrapper<UserDeliverOrder> wrapper) {
+	public List<IndexVO> selectIndexTicketBoxTop(Wrapper<UserTicketOrder> wrapper) {
 		return getBaseMapper().selectIndexTicketBoxTop(wrapper);
 	}
 
 	@Override
-	public List<IndexVO> selectIndexTicketSiteTop(Wrapper<UserDeliverOrder> wrapper) {
+	public List<IndexVO> selectIndexTicketSiteTop(Wrapper<UserTicketOrder> wrapper) {
 		return getBaseMapper().selectIndexTicketSiteTop(wrapper);
 	}
 
 	@Override
 	public int getChannelTotalTicketNumCnt(String channelNo) {
-		// TODO Auto-generated method stub
 		return getBaseMapper().getChannelTotalTicketNumCnt(channelNo);
 	}
+	
+	@Override
+	public int getSaleSiteTotalTicketNumCnt(Long channelId) {
+		return getBaseMapper().getSaleSiteTotalTicketNumCnt(channelId);
+	}
 }

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

@@ -103,5 +103,12 @@
 		where (t2.channel_no like concat(#{channelNo},'.%') or t2.channel_no = #{channelNo})
 		and t1.`status` = 1
 	</select>
+	
+	<!-- 查询经销商的盲票销量 -->
+    <select id="getSaleSiteTotalTicketNumCnt" resultType="integer">
+		select IFNULL(SUM(t1.ticket_num),0) as ticketNum
+		from mp_user_ticket_order t1
+		where t1.`status` = 1 and t1.channel_id = #{channelId}
+	</select>
     
 </mapper>