商城相关model

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

@@ -321,23 +321,32 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	}
 
 	@Override
-	@Transactional
 	public R importGoods(List<GoodsExcel> data, Boolean isCovered)
 	{
-		try {
+
 			if(org.springframework.util.CollectionUtils.isEmpty(data))
 			{
 				throw new SecurityException("导入数据不能为空");
 			}
-			//统计正确数据行数
-            List<Boolean> countList=new ArrayList<>();
+            StringBuffer errMsg= new StringBuffer();
+
+		    for(int i=0;i<data.size();i++)
+		    {
+				GoodsExcel goodsExcel = data.get(i);
+				String type = goodsExcel.getType();
+				GoodsType goodsType = goodsTypeMapper.selectGoodsTypeCname(type, AuthUtil.getTenantId());
+				if(goodsType==null)
+				{
+					errMsg.append("第"+i+"行未添加分类或者分类不存在,");
+				}
+
+			}
 
 			data.forEach(e->{
 				String type = e.getType();
 				GoodsType goodsType = goodsTypeMapper.selectGoodsTypeCname(type, AuthUtil.getTenantId());
 				if(goodsType!=null)
 				{
-					countList.add(true);
 					GoodsDesc goodsDesc=new GoodsDesc();
 					goodsDesc.setCode(e.getCode());
 					goodsDesc.setCname(e.getCname());
@@ -390,10 +399,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				}
 				else
 				{
-					countList.add(false);
+
 				}
 			});
-			List<Boolean> booleanList = countList.stream().filter(e -> e == true).collect(Collectors.toList());
+		/*	List<Boolean> booleanList = countList.stream().filter(e -> e == true).collect(Collectors.toList());
 			if(data.size()>booleanList.size())
 			{
 				return R.fail("导入中的数据,分类字段不存在或者未填分类字段");
@@ -405,13 +414,9 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			else
 			{
 				throw new SecurityException("导入失败,请仔细检查导入数据");
-			}
+			}*/
+ return R.success("ok");
 
-		}
-		catch (Exception e)
-		{
-			throw new SecurityException("导入失败,请仔细检查导入数据");
-		}
 	}
 
 }

blade-service/store-goods/src/main/java/com/store/goods/controller/GoodsDescController.java

@@ -40,6 +40,7 @@ import com.store.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *  控制器
@@ -74,6 +75,28 @@ public class GoodsDescController extends BladeController {
 		return R.data(detail);
 	}
 
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("app/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入goodsDesc")
+	public R<GoodsDesc> appDetail(GoodsDesc goodsDesc) {
+		GoodsDesc detail = goodsDescService.getOne(Condition.getQueryWrapper(goodsDesc));
+		LambdaQueryWrapper<GoodsItems> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper
+			.eq(GoodsItems::getGoodsStatus,1)
+			.eq(GoodsItems::getIsDeleted,0)
+			.eq(GoodsItems::getPid,detail.getId())
+			.eq(GoodsItems::getTenantId, AuthUtil.getTenantId());
+		List<GoodsItems> itemsList = goodsItemsService.list(itemsLambdaQueryWrapper);
+		detail.setItemsList(itemsList);
+		return R.data(detail);
+	}
+
+
+
 	/**
 	 * 分页
 	 */
@@ -147,11 +170,15 @@ public class GoodsDescController extends BladeController {
 					@ApiParam(value = "0:下架 1:上架", required = true) @RequestParam int flag)
 	{
 		List<Long> longs = Func.toLongList(ids);
+
 		if(CollectionUtils.isEmpty(longs))
 		{
 			throw new SecurityException("传入ids不能为空");
 		}
-		goodsDescService.batchOperationGoods(longs,flag);
+		LambdaQueryWrapper<GoodsItems> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.in(GoodsItems::getPid,longs).eq(GoodsItems::getIsDeleted,0);
+		List<Long> collect = goodsItemsService.list(lambdaQueryWrapper).stream().map(GoodsItems::getId).collect(Collectors.toList());
+		goodsDescService.batchOperationGoods(collect,flag);
 		return R.success("操作成功");
 	}
 

blade-service/store-goods/src/main/java/com/store/goods/entity/GoodsDesc.java

@@ -114,4 +114,7 @@ public class GoodsDesc implements Serializable {
 		@TableField(exist = false)
 		private List<GoodsItems> itemsList;
 
+	    @ApiModelProperty(value = "图片")
+		private String picture;
+
 }

blade-service/store-goods/src/main/java/com/store/goods/service/impl/GoodsDescServiceImpl.java

@@ -55,6 +55,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	@Transactional
 	public void batchOperationGoods(List<Long> ids, int flag)
 	{
+
 		List<GoodsItems> goodsItemsList = goodsItemsMapper.selectBatchIds(ids);
 		if(CollectionUtils.isEmpty(goodsItemsList))
 		{
@@ -84,6 +85,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			if(CollectionUtils.isNotEmpty(itemsList))
 			{
 				itemsList.forEach(item->{
+					item.setPid(goodsDesc.getId());
 					item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 					item.setCreateUser(AuthUtil.getUserId());
 					item.setCreateTime(new Date());
@@ -103,6 +105,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				itemsList.forEach(item->{
 					if(item.getId()==null)
 					{
+						item.setPid(goodsDesc.getId());
 						item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 						item.setCreateUser(AuthUtil.getUserId());
 						item.setCreateTime(new Date());