|
@@ -2,10 +2,7 @@ package com.xyzc.start.service.impl;
|
|
|
|
|
|
import com.xyzc.common.core.exception.ErrorCode;
|
|
|
import com.xyzc.common.core.utils.AssertUtils;
|
|
|
-import com.xyzc.common.core.utils.Result;
|
|
|
import com.xyzc.common.web.security.user.SecurityUser;
|
|
|
-import com.xyzc.start.domain.MemberCard;
|
|
|
-import com.xyzc.start.domain.Scheme;
|
|
|
import com.xyzc.start.domain.vo.*;
|
|
|
import com.xyzc.start.mapper.AiModelMapper;
|
|
|
import com.xyzc.start.mapper.EquityMapper;
|
|
@@ -14,12 +11,9 @@ import com.xyzc.start.mapper.SchemeMapper;
|
|
|
import com.xyzc.start.service.ISchemeService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.xbill.DNS.dnssec.R;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@RequiredArgsConstructor
|
|
@@ -45,17 +39,17 @@ public class SchemeServiceImpl implements ISchemeService {
|
|
|
// 让memberCardVos中根据memberId合并成新的List
|
|
|
List<List<MemberCardVo>> memberList = new ArrayList<>();
|
|
|
List<MemberCardVo> collect = new ArrayList<>();
|
|
|
- //TODO : 添加立省金额
|
|
|
for (MemberCardVo memberCardVo : memberCardVos) {
|
|
|
// collect不为空并且memberCardId不一致时新建一个list
|
|
|
- if (!collect.isEmpty() &&
|
|
|
- !collect.get(0).getMemberCardId().equals(memberCardVo.getMemberCardId())) {
|
|
|
+ if (!collect.isEmpty() && !collect.get(0).getMemberCardId().equals(memberCardVo.getMemberCardId())) {
|
|
|
memberList.add(collect);
|
|
|
collect = new ArrayList<>();
|
|
|
}
|
|
|
// 对当前值进行处理
|
|
|
memberCardVo.setSaveMoney(memberCardVo.getPrice().subtract(memberCardVo.getStrikethroughPrice()));
|
|
|
collect.add(memberCardVo);
|
|
|
+ memberCardVo.setMemberEquityList(grouth());
|
|
|
+
|
|
|
}
|
|
|
memberList.add(collect);
|
|
|
|
|
@@ -65,6 +59,37 @@ public class SchemeServiceImpl implements ISchemeService {
|
|
|
return scheme;
|
|
|
}
|
|
|
|
|
|
+ private static List<MemberEquityVo> grouth() {
|
|
|
+ ArrayList<MemberEquityVo> objects = new ArrayList<>();
|
|
|
+
|
|
|
+ MemberEquityVo memberCardVo = new MemberEquityVo();
|
|
|
+ memberCardVo.setMemberEquityid(1);
|
|
|
+ memberCardVo.setMemberEquityName("应用权益");
|
|
|
+ memberCardVo.setMemberEquityCount(230);
|
|
|
+
|
|
|
+ MemberEquityVo memberCardVo2 = new MemberEquityVo();
|
|
|
+ memberCardVo2.setMemberEquityid(2);
|
|
|
+ memberCardVo2.setMemberEquityName("AI绘画");
|
|
|
+ memberCardVo2.setMemberEquityCount(2320);
|
|
|
+
|
|
|
+ MemberEquityVo memberCardVo3 = new MemberEquityVo();
|
|
|
+ memberCardVo3.setMemberEquityid(2);
|
|
|
+ memberCardVo3.setMemberEquityName("AI绘画");
|
|
|
+ memberCardVo3.setMemberEquityCount(2320);
|
|
|
+
|
|
|
+ MemberEquityVo memberCardVo4 = new MemberEquityVo();
|
|
|
+ memberCardVo4.setMemberEquityid(2);
|
|
|
+ memberCardVo4.setMemberEquityName("AI绘画");
|
|
|
+ memberCardVo4.setMemberEquityCount(2320);
|
|
|
+
|
|
|
+ MemberEquityVo memberCardVo5= new MemberEquityVo();
|
|
|
+ memberCardVo5.setMemberEquityid(2);
|
|
|
+ memberCardVo5.setMemberEquityName("AI绘画");
|
|
|
+ memberCardVo5.setMemberEquityCount(2320);
|
|
|
+
|
|
|
+ return objects;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 根据id获取燃料信息
|
|
|
*
|
|
@@ -72,13 +97,13 @@ public class SchemeServiceImpl implements ISchemeService {
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public FuelPackageVo queryCurrentFuelById(Long fuelId) {
|
|
|
+ public List<FuelPackageVo> queryCurrentFuelById(Long fuelId) {
|
|
|
|
|
|
- return schemeMapper.queryFuelPackageById(SecurityUser.getUserId(), fuelId);
|
|
|
+ return schemeMapper.queryFuelPackageById(fuelId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取
|
|
|
+ * 分页查询燃料规则详情
|
|
|
*
|
|
|
* @param modelId 模型id
|
|
|
* @return
|
|
@@ -112,8 +137,14 @@ public class SchemeServiceImpl implements ISchemeService {
|
|
|
List<SchemeVo> currentFuel = schemeMapper.getCurrentFuel();
|
|
|
// 有且只有一个会员卡套餐生效
|
|
|
AssertUtils.isUnique(currentFuel, ErrorCode.SCHEME_NOT_UNIQUE);
|
|
|
+ SchemeVo scheme = currentFuel.get(0);
|
|
|
|
|
|
- return currentFuel.get(0);
|
|
|
+ // 根据套餐查询燃料
|
|
|
+ List<FuelPackageVo> fuelPackageVo = schemeMapper.queryFuelPackageById(scheme.getId());
|
|
|
+
|
|
|
+ scheme.setFuelPackageList(fuelPackageVo);
|
|
|
+
|
|
|
+ return scheme;
|
|
|
}
|
|
|
|
|
|
}
|