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

修改项目名称

This commit is contained in:
韩鹏辉 2023-08-03 17:25:17 +08:00
parent eebaa66f43
commit f96b4e1bfe
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.chaozhanggui.admin.system.util.MD5Util;
import com.chaozhanggui.admin.system.util.SignUtils;
import com.chaozhanggui.common.system.config.RespBody;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
@ -87,8 +88,11 @@ public class AgencyController {
@GetMapping(value = "queryCustormerFlow")
public RespBody queryCustormerFlow(@RequestHeader("loginName") String loginName, @RequestHeader("token") String token, @RequestHeader("userId") String userId,
@RequestParam("agencyCode") String agencyCode,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSzie") Integer pageSize,
@RequestParam("userType") String userType,@RequestParam("isExtend") String isExtend){
return agencyService.queryCustormFlow(userId, userType, agencyCode, isExtend, pageNum, pageSize);
@RequestParam("userType") String userType,@RequestParam("isExtend") String isExtend,
@RequestParam("merchantCode") String merchantCode,@RequestParam("status") String status,
@RequestParam("merchantType") String merchantType,@RequestParam("reqUserId") String reqUserId
){
return agencyService.queryCustormFlow(userId, userType, agencyCode, isExtend,merchantCode,status,merchantType,reqUserId, pageNum, pageSize);
}
/**

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

@ -157,9 +157,11 @@ public class AgencyService {
}
public RespBody queryCustormFlow(String userId,String userType,String agencyCode,String isExtend,Integer pageNum,Integer pageSize){
public RespBody queryCustormFlow(String userId,String userType,String agencyCode,String isExtend,
String merchantCode,String status,String merchantType,String reqUserId,
Integer pageNum,Integer pageSize){
PageHelper.startPage(pageNum, pageSize);
List<Map<String,Object>> list=userPromotionMapper.selectOrderByUserIdOrAgecyCode(userId,userType,agencyCode,isExtend);
List<Map<String,Object>> list=userPromotionMapper.selectOrderByUserIdOrAgecyCode(userId,userType,agencyCode,isExtend,merchantCode,status,merchantType,reqUserId);
if(ObjectUtil.isNotEmpty(list)&&list.size()>0){
list.stream().forEach(it->{
String id= it.get("id")+"";

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

@ -29,7 +29,7 @@ public interface TbPlussUserPromotionMapper {
List<Map<String,Object>> selectOrderByUserIdOrAgecyCode(@Param("userId") String userId,@Param("userType") String userType,@Param("agencyCode") String agencyCode,@Param("isExtend") String isExtend);
List<Map<String,Object>> selectOrderByUserIdOrAgecyCode(@Param("userId") String userId,@Param("userType") String userType,@Param("agencyCode") String agencyCode,@Param("isExtend") String isExtend, @Param("merchantCode") String merchantCode,@Param("status") String status, @Param("merchantType") String merchantType,@Param("reqUserId") String reqUserId);
Map<String,Object> selectByUserId(String userId);

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

@ -363,6 +363,7 @@
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 tb_pluss_merchant_channel_status s on a.merchantCode=s.merchantCode
left join tb_pluss_merchant_base_info b on a.merchantCode=b.merchantCode
LEFT JOIN (
SELECT
i.userId,
@ -381,8 +382,23 @@
and u.loginName = #{agencyCode}
</if>
<if test="merchantCode != null and merchantCode!=''">
and a.merchantCode = #{merchantCode}
</if>
<if test="merchantType != null and merchantType!=''">
and b.merchantType = #{merchantType}
</if>
<if test="status != null and status!=''">
and s.`status` = #{status}
</if>
<if test="reqUserId != null and reqUserId!=''">
and p.user_id = #{reqUserId}
</if>
ORDER BY
user_id
user_id desc
</select>

2
newadmin/pom.xml
View File

@ -19,7 +19,7 @@
<module>oss-service</module>
<module>admin</module>
<module>merchant-service-api</module>
<module>order-service</module>
<!-- <module>order-service</module>-->
</modules>