From a369c2fdaf2625db058b96e66f230c3bcb549974 Mon Sep 17 00:00:00 2001 From: Derran Date: Fri, 14 Jun 2024 10:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderApplicationService.java | 1 - .../product/impl/ProductQueryServiceImpl.java | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java index bffd766..5bbabc7 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java @@ -276,7 +276,6 @@ public class OrderApplicationService extends BaseApplicationService { public UserSubmitOrderVo submitSiteActivityOrder(UserSubmitSiteActivityOrderDto dto, Long userId) { MarriageInformation marriageInformation = marriageInformationDao.selectById(dto.getMiId()); Product product = productQueryService.querySiteActivityBy(dto.getSiteActivityId(), marriageInformation.getGenderCode()); - SiteActivity siteActivity = siteActivityDao.selectById(dto.getSiteActivityId()); Order order = null; PaymentOrder paymentOrder = null; // if (dto.getOpenVip()) { diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java index 3bdca9c..6e77198 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java @@ -197,23 +197,28 @@ public class ProductQueryServiceImpl implements ProductQueryService { //特殊处理这么做是不对的 顺序：聊天卡、会员、包恋爱、包领证 List sortGroupVoList = new ArrayList<>(); //聊天卡 - UserPageProductByCustomerGroupVo target1Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CHAT_CARD); + UserPageProductByCustomerGroupVo target1Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.VIP); if (Objects.nonNull(target1Vo)) { sortGroupVoList.add(target1Vo); } + //聊天卡 + UserPageProductByCustomerGroupVo target2Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CHAT_CARD); + if (Objects.nonNull(target2Vo)) { + sortGroupVoList.add(target2Vo); + } //会员 sortGroupVoList.addAll(groupVoList.stream().filter(vo -> vo.getGroupType() == 1).collect(Collectors.toList())); groupVoList = groupVoList.stream().filter(vo -> vo.getGroupType() != 1).collect(Collectors.toList()); //包恋爱 - UserPageProductByCustomerGroupVo target2Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CONTRACT_LOVE); - if (Objects.nonNull(target2Vo)) { - sortGroupVoList.add(target2Vo); - } - //包领证 - UserPageProductByCustomerGroupVo target3Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CONTRACTED_MARRIAGE); + UserPageProductByCustomerGroupVo target3Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CONTRACT_LOVE); if (Objects.nonNull(target3Vo)) { sortGroupVoList.add(target3Vo); } + //包领证 + UserPageProductByCustomerGroupVo target4Vo = findTargetVo(groupVoList, 0, ProductSubCategoryEnum.CONTRACTED_MARRIAGE); + if (Objects.nonNull(target4Vo)) { + sortGroupVoList.add(target4Vo); + } sortGroupVoList.addAll(groupVoList); groupVoList = sortGroupVoList; return groupVoList;