update 集团列表

This commit is contained in:
2024-01-20 14:09:09 +08:00
parent 0e778e77c2
commit 8ed2ab56f2
6 changed files with 42 additions and 21 deletions

View File

@@ -3,6 +3,8 @@ package com.jsowell.pile.dto;
import com.jsowell.common.core.domain.BaseEntity;
import lombok.*;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor
@@ -14,4 +16,6 @@ public class MemberGroupDTO extends BaseEntity {
private String phoneNumber;
private String groupCode;
private List<String> merchantIdList;
}

View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberGroup;
import com.jsowell.pile.dto.MemberGroupDTO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.MemberDiscountVO;
import com.jsowell.pile.vo.web.MemberGroupVO;
@@ -65,7 +66,7 @@ public interface MemberGroupMapper {
*/
public int deleteMemberGroupByIds(Long[] ids);
List<MemberGroupVO> queryMemberGroupList(MemberGroup memberGroup);
List<MemberGroupVO> queryMemberGroupList(MemberGroupDTO dto);
/**
* 查询会员折扣

View File

@@ -10,15 +10,14 @@ import java.util.List;
/**
* 会员组Service接口
*
*
* @author jsowell
* @date 2023-12-26
*/
public interface MemberGroupService
{
public interface MemberGroupService {
/**
* 查询会员组
*
*
* @param id 会员组主键
* @return 会员组
*/
@@ -26,15 +25,12 @@ public interface MemberGroupService
/**
* 查询会员组列表
*
* @param memberGroup 会员组
* @return 会员组集合
*/
public List<MemberGroupVO> selectMemberGroupList(MemberGroup memberGroup);
public List<MemberGroupVO> selectMemberGroupList(MemberGroupDTO dto);
/**
* 新增会员组
*
*
* @param memberGroup 会员组
* @return 结果
*/
@@ -42,7 +38,7 @@ public interface MemberGroupService
/**
* 修改会员组
*
*
* @param memberGroup 会员组
* @return 结果
*/
@@ -50,7 +46,7 @@ public interface MemberGroupService
/**
* 批量删除会员组
*
*
* @param ids 需要删除的会员组主键集合
* @return 结果
*/
@@ -58,7 +54,7 @@ public interface MemberGroupService
/**
* 删除会员组信息
*
*
* @param id 会员组主键
* @return 结果
*/
@@ -66,6 +62,7 @@ public interface MemberGroupService
/**
* 查询会员折扣
*
* @param merchantId
* @param stationId
* @param memberId

View File

@@ -56,18 +56,21 @@ public class MemberGroupServiceImpl implements MemberGroupService {
*/
@Override
public MemberGroup selectMemberGroupById(Long id) {
return memberGroupMapper.selectMemberGroupById(id);
MemberGroup memberGroup = memberGroupMapper.selectMemberGroupById(id);
if (memberGroup != null) {
BigDecimal discount = memberGroup.getDiscount();
// 返回给前端乘以10
memberGroup.setDiscount(discount.multiply(BigDecimal.TEN));
}
return memberGroup;
}
/**
* 查询会员组列表
*
* @param memberGroup 会员组
* @return 会员组
*/
@Override
public List<MemberGroupVO> selectMemberGroupList(MemberGroup memberGroup) {
List<MemberGroupVO> resultList = memberGroupMapper.queryMemberGroupList(memberGroup);
public List<MemberGroupVO> selectMemberGroupList(MemberGroupDTO dto) {
List<MemberGroupVO> resultList = memberGroupMapper.queryMemberGroupList(dto);
if (CollectionUtils.isEmpty(resultList)) {
return Lists.newArrayList();
}