mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 19:45:09 +08:00
汇鑫大厦用户扫码自动把用户加入集团
This commit is contained in:
@@ -25,7 +25,7 @@ public interface MemberGroupMapper {
|
||||
* @param id 会员组主键
|
||||
* @return 会员组
|
||||
*/
|
||||
public MemberGroup selectMemberGroupById(Long id);
|
||||
MemberGroup selectMemberGroupById(Long id);
|
||||
|
||||
/**
|
||||
* 查询会员组列表
|
||||
@@ -33,7 +33,7 @@ public interface MemberGroupMapper {
|
||||
* @param memberGroup 会员组
|
||||
* @return 会员组集合
|
||||
*/
|
||||
public List<MemberGroup> selectMemberGroupList(MemberGroup memberGroup);
|
||||
List<MemberGroup> selectMemberGroupList(MemberGroup memberGroup);
|
||||
|
||||
/**
|
||||
* 新增会员组
|
||||
@@ -41,7 +41,7 @@ public interface MemberGroupMapper {
|
||||
* @param memberGroup 会员组
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMemberGroup(MemberGroup memberGroup);
|
||||
int insertMemberGroup(MemberGroup memberGroup);
|
||||
|
||||
/**
|
||||
* 修改会员组
|
||||
@@ -49,7 +49,7 @@ public interface MemberGroupMapper {
|
||||
* @param memberGroup 会员组
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMemberGroup(MemberGroup memberGroup);
|
||||
int updateMemberGroup(MemberGroup memberGroup);
|
||||
|
||||
/**
|
||||
* 删除会员组
|
||||
@@ -57,7 +57,7 @@ public interface MemberGroupMapper {
|
||||
* @param id 会员组主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMemberGroupById(Long id);
|
||||
int deleteMemberGroupById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除会员组
|
||||
@@ -65,7 +65,7 @@ public interface MemberGroupMapper {
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMemberGroupByIds(Long[] ids);
|
||||
int deleteMemberGroupByIds(Long[] ids);
|
||||
|
||||
List<MemberGroupVO> queryMemberGroupList(MemberGroupDTO dto);
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -101,6 +100,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
|
||||
// 生成编号
|
||||
memberGroup.setGroupCode(generateGroupCode());
|
||||
memberGroup.setCreateTime(DateUtils.getNowDate());
|
||||
memberGroup.setDelFlag(DelFlagEnum.NORMAL.getValue());
|
||||
try {
|
||||
String createBy = SecurityUtils.getLoginUser().getUsername();
|
||||
memberGroup.setCreateBy(createBy);
|
||||
@@ -108,10 +108,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
|
||||
|
||||
}
|
||||
|
||||
if (isBetween(memberGroup.getDiscount())) {
|
||||
// 入库除以10
|
||||
memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
|
||||
}
|
||||
// if (isBetween(memberGroup.getDiscount())) {
|
||||
// // 入库除以10
|
||||
// memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
|
||||
// }
|
||||
return memberGroupMapper.insertMemberGroup(memberGroup);
|
||||
}
|
||||
|
||||
@@ -288,11 +288,21 @@ public class MemberGroupServiceImpl implements MemberGroupService {
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据运营商id查询会员组
|
||||
* @param merchantId 运营商id
|
||||
* @return 会员组VO
|
||||
*/
|
||||
@Override
|
||||
public MemberGroupVO queryByMerchantId(String merchantId) {
|
||||
return memberGroupMapper.queryByMerchantId(merchantId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据站点id查询会员组
|
||||
* @param stationId 站点id
|
||||
* @return 会员组VO
|
||||
*/
|
||||
@Override
|
||||
public MemberGroupVO queryByStationId(String stationId) {
|
||||
return memberGroupMapper.queryByStationId(stationId);
|
||||
|
||||
Reference in New Issue
Block a user