mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-16 21:30:28 +08:00
查询会员组的站点列表
This commit is contained in:
@@ -97,10 +97,6 @@ public class MemberGroupController extends BaseController {
|
|||||||
return ajaxResult;
|
return ajaxResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 会员组添加站点
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改会员组
|
* 修改会员组
|
||||||
*/
|
*/
|
||||||
@@ -138,4 +134,12 @@ public class MemberGroupController extends BaseController {
|
|||||||
return getDataTable(memberGroupService.queryMemberList(dto));
|
return getDataTable(memberGroupService.queryMemberList(dto));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询会员组/集团 的站点列表
|
||||||
|
*/
|
||||||
|
@PostMapping("/queryStationList")
|
||||||
|
public TableDataInfo queryStationList(@RequestBody MemberGroupDTO dto) {
|
||||||
|
startPage();
|
||||||
|
return getDataTable(memberGroupService.queryStationList(dto));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
|
|||||||
|
|
||||||
import com.jsowell.pile.domain.MemberGroup;
|
import com.jsowell.pile.domain.MemberGroup;
|
||||||
import com.jsowell.pile.dto.MemberGroupDTO;
|
import com.jsowell.pile.dto.MemberGroupDTO;
|
||||||
|
import com.jsowell.pile.vo.base.MemberGroupStationVO;
|
||||||
import com.jsowell.pile.vo.uniapp.MemberVO;
|
import com.jsowell.pile.vo.uniapp.MemberVO;
|
||||||
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
||||||
import com.jsowell.pile.vo.web.MemberGroupVO;
|
import com.jsowell.pile.vo.web.MemberGroupVO;
|
||||||
@@ -95,4 +96,6 @@ public interface MemberGroupMapper {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
String queryMemberGroupCode(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId);
|
String queryMemberGroupCode(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId);
|
||||||
|
|
||||||
|
List<MemberGroupStationVO> queryStationList(MemberGroupDTO dto);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.jsowell.pile.service;
|
|||||||
|
|
||||||
import com.jsowell.pile.domain.MemberGroup;
|
import com.jsowell.pile.domain.MemberGroup;
|
||||||
import com.jsowell.pile.dto.MemberGroupDTO;
|
import com.jsowell.pile.dto.MemberGroupDTO;
|
||||||
|
import com.jsowell.pile.vo.base.MemberGroupStationVO;
|
||||||
import com.jsowell.pile.vo.uniapp.MemberVO;
|
import com.jsowell.pile.vo.uniapp.MemberVO;
|
||||||
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
||||||
import com.jsowell.pile.vo.web.MemberGroupVO;
|
import com.jsowell.pile.vo.web.MemberGroupVO;
|
||||||
@@ -92,4 +93,11 @@ public interface MemberGroupService {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
int addMember2MemberGroup(String memberId, String stationId);
|
int addMember2MemberGroup(String memberId, String stationId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询会员组/集团站点列表
|
||||||
|
* @param dto
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<MemberGroupStationVO> queryStationList(MemberGroupDTO dto);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import com.jsowell.pile.domain.MemberGroupRelation;
|
|||||||
import com.jsowell.pile.dto.MemberGroupDTO;
|
import com.jsowell.pile.dto.MemberGroupDTO;
|
||||||
import com.jsowell.pile.mapper.MemberGroupMapper;
|
import com.jsowell.pile.mapper.MemberGroupMapper;
|
||||||
import com.jsowell.pile.service.*;
|
import com.jsowell.pile.service.*;
|
||||||
|
import com.jsowell.pile.vo.base.MemberGroupStationVO;
|
||||||
import com.jsowell.pile.vo.uniapp.MemberVO;
|
import com.jsowell.pile.vo.uniapp.MemberVO;
|
||||||
import com.jsowell.pile.vo.web.BillingTemplateVO;
|
import com.jsowell.pile.vo.web.BillingTemplateVO;
|
||||||
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
import com.jsowell.pile.vo.web.MemberDiscountVO;
|
||||||
@@ -257,6 +258,11 @@ public class MemberGroupServiceImpl implements MemberGroupService {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<MemberGroupStationVO> queryStationList(MemberGroupDTO dto) {
|
||||||
|
return memberGroupMapper.queryStationList(dto);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 会员与集团的关系保存到数据库
|
* 会员与集团的关系保存到数据库
|
||||||
* @param memberId 会员id
|
* @param memberId 会员id
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.jsowell.pile.vo.base;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class MemberGroupStationVO {
|
||||||
|
private String stationId;
|
||||||
|
|
||||||
|
private String stationName;
|
||||||
|
|
||||||
|
private String remark;
|
||||||
|
}
|
||||||
@@ -227,4 +227,16 @@
|
|||||||
and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
|
and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
|
||||||
and find_in_set(#{stationId,jdbcType=VARCHAR}, t1.station_id)
|
and find_in_set(#{stationId,jdbcType=VARCHAR}, t1.station_id)
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="queryStationList" resultType="com.jsowell.pile.vo.base.MemberGroupStationVO">
|
||||||
|
SELECT
|
||||||
|
t1.id,
|
||||||
|
t1.station_name,
|
||||||
|
t2.remark
|
||||||
|
FROM
|
||||||
|
pile_station_info t1
|
||||||
|
JOIN pile_billing_template t2 ON t2.station_id = t1.id AND t2.del_flag = '0' AND t2.member_flag = '1'
|
||||||
|
WHERE
|
||||||
|
FIND_IN_SET(t1.id, (SELECT station_id FROM member_group WHERE group_code = #{groupCode,jdbcType=VARCHAR}))
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
Reference in New Issue
Block a user