From bb9e7463868328e7a7285facdad3b057eadcb089 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Feb 2023 10:03:25 +0800
Subject: [PATCH] 提示代理人改成合伙人
---
src/test/java/cc/mrbird/febs/AgentTest.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 884a130..553b8b8 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
import cc.mrbird.febs.mall.dto.AddOrderItemDto;
import cc.mrbird.febs.mall.dto.AgentLevelUpdateDto;
import cc.mrbird.febs.mall.dto.ApiCreateOrderVerifyDto;
@@ -13,14 +14,15 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.quartz.ProfitJob;
import cc.mrbird.febs.mall.service.IAgentService;
-import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo;
-import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,7 @@
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -72,6 +75,43 @@
private MallOrderItemMapper mallOrderItemMapper;
@Autowired
private MallGoodsMapper mallGoodsMapper;
+ @Autowired
+ private MallGoodsImagesMapper goodsImagesMapper;
+ @Test
+ public void goodsDetails(){
+ Long id = 68L;
+ MallGoods mallGoods = mallGoodsMapper.selectGoodsDetailById(id);
+ if (mallGoods == null) {
+ throw new FebsException("商品不存在");
+ }
+ List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
+ MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
+
+ List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
+ if(ObjectUtil.isNotEmpty(styles)){
+ for(GoodsDetailsStyleVo goodsDetailsStyleVo : styles){
+ List<GoodsDetailsSkuVo> skus = goodsDetailsStyleVo.getSkus();
+ if(CollUtil.isNotEmpty(skus) ){
+ for(GoodsDetailsSkuVo goodsDetailsSkuVo : skus){
+ if(StrUtil.isNotEmpty(goodsDetailsSkuVo.getSample())){
+ goodsDetailsSkuVo.setSampleFlag(true);
+ }else{
+ goodsDetailsSkuVo.setSampleFlag(false);
+ }
+ }
+ }
+ }
+ }
+
+ if (CollUtil.isNotEmpty(mallGoods.getStyles())) {
+ Map<String, BigDecimal> stockAndVolume = mallGoodsMapper.selectGoodsStockAndVolume(id);
+ mallGoodsDetailsVo.setStock(stockAndVolume.get("stock").intValue());
+ mallGoodsDetailsVo.setVolume(stockAndVolume.get("volume").intValue());
+ }
+ mallGoodsDetailsVo.setImages(images);
+
+ }
+
@Test
public void levelTest(){
ApiCreateOrderVerifyDto apiCreateOrderVerifyDto = new ApiCreateOrderVerifyDto();
@@ -103,7 +143,7 @@
}else{
//验证用户的等级
if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
- System.out.println(sku.getSkuName() + "请先申请成为代理人");
+ System.out.println(sku.getSkuName() + "请先申请成为合伙人");
}
}
--
Gitblit v1.9.1