czg_team
/
newadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
韩鹏辉 2023-07-31 10:23:59 +08:00
parent ef5cb98648
commit 98a9a05b11
4 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java
View File

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

8
newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java
View File

@ -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;

2
newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java
View File

@ -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);
}

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

@ -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}
<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>