From 20958c330b7ab40d63e2cee605ed5f2d240787d5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 16:12:25 +0800
Subject: [PATCH] 支付剩余时间
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 4 ++--
src/test/java/cc/mrbird/febs/AgentTest.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 04077f2..a9d26b9 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -40,7 +40,7 @@
<result property="presentPrice" column="sku_present_price" />
<result property="styleId" column="sku_style_id"/>
<result property="goodsId" column="sku_goods_id" />
- <result property="skuGoodsWeight" column="goods_weight" />
+ <result property="skuGoodsWeight" column="sku_goods_weight" />
<result property="sample" column="sample" />
</collection>
</collection>
@@ -60,7 +60,7 @@
c.original_price sku_original_price,
c.present_price sku_present_price,
c.style_id sku_style_id,
- c.goods_weight skuGoodsWeight,
+ c.goods_weight sku_goods_weight,
c.sample sample,
c.goods_id sku_goods_id
from mall_goods a
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 884a130..f56b2ef 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();
--
Gitblit v1.9.1