2024.04新增内容

mitao

2024-04-30 ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7

 meiya-rest/src/main/java/com/sinata/rest/modular/mall/controller/MallGoodsGroupController.java

@@ -2,15 +2,20 @@

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;
import com.sinata.rest.common.ApiUtils;
import com.sinata.rest.core.juhe.TelecomUtil;
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;
@@ -20,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.*;
@@ -39,6 +45,7 @@
@RestController
@RequestMapping("/mall/goodsGroup")
@Api(tags = "商城-套餐商品")
@SuppressWarnings("unchecked")
public class MallGoodsGroupController {

    @Autowired
@@ -52,6 +59,12 @@

    @Autowired
    private IMallVipEquityService mallVipEquityService;

    @Autowired
    private TelecomUtil telecomUtil;

    @Autowired
    private IMallGoodsService mallGoodsService;

    @GetMapping(value = "/myShare")
    @ApiOperation(value = "我的推广")
@@ -82,46 +95,55 @@
                        .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) {
        return memUserService.applySaleUser(body);
    }

    @PostMapping(value = "/real-name-authentication")
    @ApiOperation(value = "三网手机实名认证")
    public ApiUtils realNameAuthentication(@RequestBody BodyUserAuthentication body) {
        return ApiUtils.returnOK(telecomUtil.verify(body.getRealName(),body.getIdCard(),body.getPhone()));
    }
//    @GetMapping(value = "/directTeam")
//    @ApiOperation(value = "我的直属团队")
//    @ApiImplicitParams({