调试商品信息

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -156,4 +156,5 @@ public class GoodsDesc implements Serializable {
 	@TableField(exist = false)
 	private List<GoodsPrice>  bugGoodsPrice;
 
+
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsPrice.java

@@ -85,10 +85,8 @@ public class GoodsPrice implements Serializable {
 	//是否已删除（0 否 1是）
 	@TableLogic
 	private Integer isDeleted;
-	//枚举
-	private Long type;
 
-	private String goodsTypeId;
+
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -18,6 +18,7 @@ package org.springblade.client.goods.controller;
 
 import com.alibaba.nacos.api.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,20 +28,26 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.entity.GoodsPrice;
 import org.springblade.client.entity.GoodsType;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
+import org.springblade.client.goods.service.IGoodsPriceService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 商品详情表 控制器
  *
@@ -54,6 +61,8 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class GoodsDescController extends BladeController {
 
 	private final IGoodsDescService goodsDescService;
+	@Autowired
+	private IGoodsPriceService goodsPriceService;
 
 	/**
 	 * 详情
@@ -104,6 +113,25 @@ public class GoodsDescController extends BladeController {
 		return R.data(iPage);
 	}
 
+	@GetMapping("/findById")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsDesc")
+	public R list(@RequestParam(name = "id", required = true) String id)
+	{
+		GoodsDesc goodsDesc = goodsDescService.getById(id);
+		LambdaQueryWrapper<GoodsPrice> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsPrice::getPid,id);
+		List<GoodsPrice> priceList = goodsPriceService.list(lambdaQueryWrapper);
+		if(!CollectionUtils.isEmpty(priceList))
+		{
+			List<GoodsPrice> sale = priceList.stream().filter(e -> e.getBillType().equals("0")).collect(Collectors.toList());
+			List<GoodsPrice> buy = priceList.stream().filter(e -> e.getBillType().equals("1")).collect(Collectors.toList());
+			goodsDesc.setSaleGoodsPrice(sale);
+			goodsDesc.setBugGoodsPrice(buy);
+		}
+		return R.data(goodsDesc);
+	}
+
 	/**
 	 * 分页 商品详情表
 	 */
@@ -116,6 +144,19 @@ public class GoodsDescController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	@DeleteMapping("delete")
+	public R delete(@RequestParam(name = "id", required = true) String id)
+	{
+		 goodsDescService.removeById(id);
+		return R.success("操作成功");
+	}
+
+	@DeleteMapping("priceDelete")
+	public R priceDelete(@RequestParam(name = "id", required = true) String id)
+	{
+		goodsPriceService.removeById(id);
+		return R.success("操作成功");
+	}
 
 	/**
 	 * 自定义分页 商品详情表

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -24,20 +24,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.entity.GoodsPrice;
 import org.springblade.client.entity.GoodsTypeDesc;
 import org.springblade.client.goods.mapper.GoodsDescMapper;
+import org.springblade.client.goods.mapper.GoodsPriceMapper;
+import org.springblade.client.goods.mapper.GoodsTypeDescMapper;
+import org.springblade.client.goods.mapper.GoodsTypeMapper;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 商品详情表 服务实现类
@@ -50,6 +52,15 @@ import java.util.Objects;
 public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc> implements IGoodsDescService {
 	private GoodsTypeDescServiceImpl goodsTypeDescService;  //商品-商品类别对应表
 	private GoodsTypeServiceImpl goodsTypeService;//商品类别信息
+	@Autowired
+	private GoodsTypeMapper goodsTypeMapper;
+	@Autowired
+	private GoodsDescMapper goodsDescMapper;
+	@Autowired
+	private GoodsPriceMapper goodsPriceMapper;
+	@Autowired
+	private GoodsTypeDescMapper goodsTypeDescMapper;
+
 
 	@Override
 	public IPage<GoodsDescVO> selectGoodsDescPage(IPage<GoodsDescVO> page, GoodsDescVO goodsDesc) {
@@ -163,9 +174,51 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	}
 
 	@Override
+	@Transactional
 	public void modify(GoodsDesc goodsDesc)
 	{
-
+		List<GoodsPrice> chilList=new ArrayList<>();
+		chilList.addAll(goodsDesc.getBugGoodsPrice());
+		chilList.addAll(goodsDesc.getSaleGoodsPrice());
+		Long id = goodsDesc.getId();
+		//代表主表、子表都是新增,
+		if(id==null)
+		{
+			goodsDesc.setTenantId(AuthUtil.getTenantId());
+			goodsDesc.setCreateTime(new Date());
+			goodsDesc.setCreateUser(SecureUtil.getUserId());
+			 goodsDescMapper.insert(goodsDesc);
+			 chilList.forEach(e->{
+				 e.setTenantId(AuthUtil.getTenantId());
+				 e.setPid(goodsDesc.getId());
+				 e.setCreateTime(new Date());
+				 e.setCreateUser(SecureUtil.getUserId());
+				 goodsPriceMapper.insert(e);
+			 });
+		}
+		//主表修改,子表看情况
+		else
+		{
+			goodsDescMapper.updateById(goodsDesc);
+			chilList.forEach(e->{
+				//新增
+				if(e.getId()==null)
+				{
+					e.setTenantId(AuthUtil.getTenantId());
+					e.setPid(goodsDesc.getId());
+					e.setCreateTime(new Date());
+					e.setCreateUser(SecureUtil.getUserId());
+					goodsPriceMapper.insert(e);
+				}
+				//修改
+				else
+				{
+					e.setUpdateTime(new Date());
+					e.setUpdateUser(SecureUtil.getUserId());
+					goodsPriceMapper.updateById(e);
+				}
+			});
+		}
 	}
 
 }