From 98a9a05b11485d44eebefde885140b17af77b902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Mon, 31 Jul 2023 10:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AEuserId=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E5=90=8D=E7=A7=B0=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/AgencyController.java | 18 ++++ .../admin/system/service/AgencyService.java | 8 ++ .../dao/TbPlussUserPromotionMapper.java | 2 + .../mapper/TbPlussUserPromotionMapper.xml | 94 ++++++++++++------- 4 files changed, 86 insertions(+), 36 deletions(-) diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java index 0edd684..5665ce7 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java @@ -182,6 +182,24 @@ return null; } + /** + * 查询订单信息 + * @param loginName + * @param token + * @param userId + * @param reqUserId + * @param orderNumber + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("queryOrder") + public RespBody queryOrder(@RequestHeader("loginName") String loginName, @RequestHeader("token") String token, @RequestHeader("userId") String userId + ,@RequestParam("reqUserId") String reqUserId,@RequestParam("orderNumber") String orderNumber,@RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + return agencyService.queryOrder(reqUserId,orderNumber,pageNum,pageSize); + } + + @GetMapping("mytest") public RespBody mytest(@RequestParam("userId") String userId){ diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java index b73e22f..8e77829 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java @@ -385,6 +385,14 @@ public class AgencyService { } + public RespBody queryOrder(String userId,String orderNumber,Integer pageNum,Integer pageSize){ + PageHelper.startPage(pageNum, pageSize); + List> list=userPromotionMapper.selectOrdersByUserId(userId,orderNumber); + PageInfo pageInfo=new PageInfo(list); + return new RespBody("000000",pageInfo); + } + + private String getRandomNum(){ String inviteNum; diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java index 2a48fc6..f81adcc 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java @@ -53,4 +53,6 @@ public interface TbPlussUserPromotionMapper { TbPlussUserPromotion selectUserPromotionByUserId(@Param("userId") String userId,@Param("orderUserId") String orderUserId); Map selectPromotionByUserId(String userId); + + List> selectOrdersByUserId(@Param("userId") String userId, @Param("orderNumber") String orderNumber); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml index 3ea4571..33d1617 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml @@ -328,46 +328,48 @@ SELECT - p.user_id AS id, - u.loginName AS agencyCode, - u.trueName AS agencyName, - p.parent_user_id, - pr.loginName AS parentLoginName, - pr.trueName AS parentTrueName, - p.current_fee, - p.type_code, - p.is_extend, - FORMAT( IFNULL( k.sumConsumeFee, 0 ), 2 ) AS sumConsumeFee, - FORMAT( IFNULL( k.yestedayConsumeFee, 0 ), 2 ) AS yestedayConsumeFee + p.user_id AS id, + u.loginName AS agencyCode, + a.userName AS agencyName, + p.parent_user_id, + pr.loginName AS parentLoginName, + pa.userName AS parentTrueName, + p.current_fee, + p.type_code, + p.is_extend, + FORMAT( IFNULL( k.sumConsumeFee, 0 ), 2 ) AS sumConsumeFee, + FORMAT( IFNULL( k.yestedayConsumeFee, 0 ), 2 ) AS yestedayConsumeFee FROM - ( - SELECT - @ids AS _ids, - ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids, - @l := @l + 1 AS LEVEL + ( + SELECT + @ids AS _ids, + ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids, + @l := @l + 1 AS LEVEL FROM - tb_pluss_user_promotion, - ( SELECT @ids := #{userId}, @l := 0 ) b + tb_pluss_user_promotion, + ( SELECT @ids := #{userId}, @l := 0 ) b WHERE - @ids IS NOT NULL - ) ID, - tb_pluss_user_promotion p - LEFT JOIN tb_pluss_user_info u ON p.user_id = u.id - LEFT JOIN tb_pluss_user_info pr ON p.parent_user_id = pr.id - LEFT JOIN ( - SELECT - i.userId, - IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee, - IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee - FROM - view_order_info i - GROUP BY - i.userId - ) k ON p.user_id = k.userId + @ids IS NOT NULL + ) ID, + tb_pluss_user_promotion p + LEFT JOIN tb_pluss_user_info u ON p.user_id = u.id + LEFT JOIN tb_pluss_user_info pr ON p.parent_user_id = pr.id + left join tb_pluss_user_app a on p.user_id=a.userId + left join tb_pluss_user_app pa on p.parent_user_id=pa.userId + LEFT JOIN ( + SELECT + i.userId, + IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee, + IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee + FROM + view_order_info i + GROUP BY + i.userId + ) k ON p.user_id = k.userId WHERE - FIND_IN_SET( p.user_id, ID._ids ) - AND p.type_code = 'MC' - AND p.user_id != #{userId} + FIND_IN_SET( p.user_id, ID._ids ) + AND p.type_code = 'MC' + AND p.user_id != #{userId} and u.loginName = #{agencyCode} @@ -467,4 +469,24 @@ select * from view_merchant_profit_sum where userId=#{userId} + + \ No newline at end of file