autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-25 21:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update会员计费模板

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-02 17:01:07 +08:00
parent d90498520d
commit 04705ed0bf
11 changed files with 243 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
View File

@@ -12,11 +12,9 @@ import com.jsowell.pile.domain.MemberGroup;
import com.jsowell.pile.domain.MemberGroupRelation;
import com.jsowell.pile.dto.MemberGroupDTO;
import com.jsowell.pile.mapper.MemberGroupMapper;
import com.jsowell.pile.service.MemberBasicInfoService;
import com.jsowell.pile.service.MemberGroupRelationService;
import com.jsowell.pile.service.MemberGroupService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.MemberDiscountVO;
import com.jsowell.pile.vo.web.MemberGroupVO;
import lombok.extern.slf4j.Slf4j;
@@ -49,6 +47,9 @@ public class MemberGroupServiceImpl implements MemberGroupService {
@Autowired
private PileMerchantInfoService pileMerchantInfoService;
@Autowired
private PileBillingTemplateService pileBillingTemplateService;
/**
* 查询会员组
*
@@ -188,6 +189,25 @@ public class MemberGroupServiceImpl implements MemberGroupService {
return MemberDiscountVO;
}
public MemberDiscountVO queryMemberDiscountV2(String merchantId, String stationId, String memberId) {
String groupCode = memberGroupMapper.queryMemberGroupCode(merchantId, stationId, memberId);
if (StringUtils.isBlank(groupCode)) {
return null;
}
// 查询站点的集团会员计费模板
BillingTemplateVO billingTemplate = pileBillingTemplateService.queryPreferentialBillingTemplate(stationId);
if (billingTemplate == null) {
return null;
}
MemberDiscountVO memberDiscountVOBuilder = MemberDiscountVO.builder()
.merchantId(merchantId)
.stationId(stationId)
.groupCode(groupCode)
.billingTemplateVO(billingTemplate)
.build();
return memberDiscountVOBuilder;
}
/**
* 后管保存集团会员关系
* @param dto
@@ -229,8 +249,8 @@ public class MemberGroupServiceImpl implements MemberGroupService {
return 0;
}
// 检查memberId是否在集团中
MemberDiscountVO vo = memberGroupMapper.queryMemberDiscountV2(memberGroupVO.getGroupCode(), memberId);
if (vo == null) {
MemberGroupVO groupVO = memberGroupMapper.queryByGroupCodeAndMemberId(memberGroupVO.getGroupCode(), memberId);
if (groupVO == null) {
// 校验通过，关系存入数据库 加入到集团
return saveMemberGroupRelation(memberId, memberGroupVO.getGroupCode());
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -465,6 +465,11 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
return 1;
}
@Override
public BillingTemplateVO queryPreferentialBillingTemplate(String stationId) {
return pileBillingTemplateMapper.queryPreferentialBillingTemplate(stationId);
}
@Override
public List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList) {
if (CollectionUtils.isEmpty(stationIdList)) {