添加根据userId 查询订单接口，修改商户名称不显示问题

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){

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<Map<String,Object>> list=userPromotionMapper.selectOrdersByUserId(userId,orderNumber);
+        PageInfo pageInfo=new PageInfo(list);
+        return new RespBody("000000",pageInfo);
+    }
+
+
 
     private String getRandomNum(){
         String inviteNum;

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<String,BigDecimal> selectPromotionByUserId(String userId);
+
+    List<Map<String,Object>> selectOrdersByUserId(@Param("userId") String userId, @Param("orderNumber") String orderNumber);
 }

newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml

@@ -328,46 +328,48 @@
 
 
     SELECT
-      p.user_id AS id,
+    p.user_id AS id,
-      u.loginName AS agencyCode,
+    u.loginName AS agencyCode,
-      u.trueName AS agencyName,
+    a.userName AS agencyName,
-      p.parent_user_id,
+    p.parent_user_id,
-      pr.loginName AS parentLoginName,
+    pr.loginName AS parentLoginName,
-      pr.trueName AS parentTrueName,
+    pa.userName AS parentTrueName,
-      p.current_fee,
+    p.current_fee,
-      p.type_code,
+    p.type_code,
-      p.is_extend,
+    p.is_extend,
-      FORMAT( IFNULL( k.sumConsumeFee, 0 ), 2 ) AS sumConsumeFee,
+    FORMAT( IFNULL( k.sumConsumeFee, 0 ), 2 ) AS sumConsumeFee,
-      FORMAT( IFNULL( k.yestedayConsumeFee, 0 ), 2 ) AS yestedayConsumeFee
+    FORMAT( IFNULL( k.yestedayConsumeFee, 0 ), 2 ) AS yestedayConsumeFee
     FROM
-      (
+    (
-        SELECT
+    SELECT
-          @ids AS _ids,
+    @ids AS _ids,
-          ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
+    ( 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
+    @l := @l + 1 AS LEVEL
     FROM
-      tb_pluss_user_promotion,
+    tb_pluss_user_promotion,
-      ( SELECT @ids := #{userId}, @l := 0 ) b
+    ( SELECT @ids := #{userId}, @l := 0 ) b
     WHERE
-      @ids IS NOT NULL
+    @ids IS NOT NULL
-      ) ID,
+    ) ID,
-      tb_pluss_user_promotion p
+    tb_pluss_user_promotion p
-      LEFT JOIN tb_pluss_user_info u ON p.user_id = u.id
+    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_info pr ON p.parent_user_id = pr.id
-      LEFT JOIN (
+    left join tb_pluss_user_app a on p.user_id=a.userId
-      SELECT
+    left join tb_pluss_user_app pa on p.parent_user_id=pa.userId
-      i.userId,
+    LEFT JOIN (
-      IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee,
+    SELECT
-      IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee
+    i.userId,
-      FROM
+    IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee,
-      view_order_info i
+    IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee
-      GROUP BY
+    FROM
-      i.userId
+    view_order_info i
-      ) k ON p.user_id = k.userId
+    GROUP BY
+    i.userId
+    ) k ON p.user_id = k.userId
     WHERE
-      FIND_IN_SET( p.user_id, ID._ids )
+    FIND_IN_SET( p.user_id, ID._ids )
-      AND p.type_code = 'MC'
+    AND p.type_code = 'MC'
-      AND p.user_id != #{userId}
+    AND p.user_id != #{userId}
 
     <if test="agencyCode != null and agencyCode!=''">
       and u.loginName = #{agencyCode}
@@ -467,4 +469,24 @@
 
     select * from view_merchant_profit_sum where userId=#{userId}
   </select>
+
+  <select id="selectOrdersByUserId" resultType="java.util.Map">
+
+    SELECT
+      o.orderNumber,
+      o.merchantCode,
+      o.consumeFee,
+      o.merchantName,
+      o.createDt,
+      p.current_fee as currentFee,
+      p.type_code as typeCode
+    FROM
+      view_base_order o left join tb_pluss_user_promotion p on o.userId=p.user_id
+    WHERE
+      o.userId =#{userId}
+      <if test="orderNumber != null and orderNumber != ''">
+        o.orderNumber=#{orderNumber}
+      </if>
+    order by o.id desc
+    </select>
 </mapper>