From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容
---
meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
index 473a457..876ac40 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.sinata.common.enums.mall.EnumMallGoodsGroupType;
import com.sinata.common.enums.mall.EnumMallOrderState;
import com.sinata.common.user.VoUserGradeParent;
@@ -10,9 +11,11 @@
import com.sinata.rest.modular.mall.controller.body.BodyApplySaleUser;
import com.sinata.rest.modular.mall.controller.body.BodyUserAuthentication;
import com.sinata.rest.modular.mall.controller.vo.*;
+import com.sinata.rest.modular.mall.model.MallGoods;
import com.sinata.rest.modular.mall.model.MallOrder;
import com.sinata.rest.modular.mall.model.MallVipEquity;
import com.sinata.rest.modular.mall.model.MyUserSubstanceCoupon;
+import com.sinata.rest.modular.mall.service.IMallGoodsService;
import com.sinata.rest.modular.mall.service.IMallOrderService;
import com.sinata.rest.modular.mall.service.IMallVipEquityService;
import com.sinata.rest.modular.member.model.MemUser;
@@ -22,6 +25,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +45,7 @@
@RestController
@RequestMapping("/mall/goodsGroup")
@Api(tags = "商城-套餐商品")
+@SuppressWarnings("unchecked")
public class MallGoodsGroupController {
@Autowired
@@ -57,6 +62,9 @@
@Autowired
private TelecomUtil telecomUtil;
+
+ @Autowired
+ private IMallGoodsService mallGoodsService;
@GetMapping(value = "/myShare")
@ApiOperation(value = "我的推广")
@@ -87,40 +95,45 @@
.ne(MallOrder::getOrderType, EnumMallGoodsGroupType.GOODS.index)
.eq(MallOrder::getUserId, userId)
// 订单材料受益人，0未申请入司
- .eq(MallOrder::getUseUserId, 0)
+// .eq(MallOrder::getUseUserId, 0)
.in(MallOrder::getState, Arrays.asList(
EnumMallOrderState.WAIT_CHECK.index,
EnumMallOrderState.USE.index,
EnumMallOrderState.SUCCESS.index
- ))
+ )).orderByAsc(MallOrder::getUseUserId)
);
// 权益列表
List<MallVipEquity> vipEquityList = mallVipEquityService.list();
List<VoMallOrderEquity> voList = BeanUtil.copyToList(list, VoMallOrderEquity.class);
- voList.stream().map(o -> {
- List<String> contentList = new ArrayList();
- for (MallVipEquity eq : vipEquityList) {
- if (o.getOrderType().equals(eq.getGroupType())) {
- contentList.add(eq.getContent());
- }
- }
- o.setEquityContent(contentList);
-
- // 销售人员ID
- MemUser saleUser = memUserService.getById(o.getSaleUserId());
- if (saleUser != null) {
- o.setSaleUserNickName(saleUser.getNickName());
- o.setSaleUserRealName(saleUser.getRealName());
- }
-
- return o;
- }).collect(Collectors.toList());
+ voList.stream().map(o -> toVoMallOrderEquity(o, vipEquityList)).collect(Collectors.toList());
return ApiUtils.returnOK(voList);
}
+ private VoMallOrderEquity toVoMallOrderEquity(VoMallOrderEquity o,List<MallVipEquity> vipEquityList) {
+ List<String> contentList = new ArrayList();
+ for (MallVipEquity eq : vipEquityList) {
+ if (o.getOrderType().equals(eq.getGroupType())) {
+ contentList.add(eq.getContent());
+ }
+ }
+ o.setEquityContent(contentList);
+ // 销售人员ID
+ MemUser saleUser = memUserService.getById(o.getSaleUserId());
+ if (saleUser != null) {
+ o.setSaleUserNickName(saleUser.getNickName());
+ o.setSaleUserRealName(saleUser.getRealName());
+ }
+ MallGoods goods = mallGoodsService.getById(o.getGoodsId());
+ Optional.ofNullable(goods).ifPresent(item ->{
+ o.setGoodsName(item.getGoodsName());
+ o.setPriceSale(item.getPriceSale());
+ o.setGoodsImage(item.getGoodsImage());
+ });
+ return o;
+ }
@PostMapping(value = "/applySaleUser")
@ApiOperation(value = "推荐他人入司")
public ApiUtils applySaleUser(@RequestBody BodyApplySaleUser body) {
--
Gitblit v1.7.1