删除上架相关文件

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/shoppingCart/entity/PjShoppingCart.java

@@ -18,7 +18,6 @@ package com.gubersail.dealer.admin.api.shoppingCart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gubersail.dealer.admin.api.productLaunch.entity.PjProductLaunchFiles;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -254,12 +253,6 @@ public class PjShoppingCart implements Serializable {
 	private Long productLaunchId;
 
 	/**
-	 * 附件明细集合
-	 */
-	@TableField(exist = false)
-	private List<PjProductLaunchFiles> filesList;
-
-	/**
 	 * 库存
 	 */
 	@ApiModelProperty(value = "库存")

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/shoppingCart/controller/ShoppingCartController.java

@@ -2,16 +2,11 @@ package com.gubersail.admin.shoppingCart.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.gubersail.admin.productLaunch.service.IProductLaunchFilesService;
 import com.gubersail.admin.shoppingCart.service.IShoppingCartService;
-import com.gubersail.dealer.admin.api.order.entity.PjOrder;
-import com.gubersail.dealer.admin.api.productLaunch.entity.PjProductLaunch;
 import com.gubersail.dealer.admin.api.shoppingCart.entity.PjShoppingCart;
-import com.gubersail.dealer.admin.api.productLaunch.entity.PjProductLaunchFiles;
 import com.gubersail.dealer.admin.api.shoppingCart.vo.ShoppingCartVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +39,6 @@ import java.util.stream.Collectors;
 public class ShoppingCartController extends BladeController {
 
 	private final IShoppingCartService shoppingCartService;
-	private final IProductLaunchFilesService productLaunchFilesService;
 
 	/**
 	 * 详情
@@ -80,11 +74,6 @@ public class ShoppingCartController extends BladeController {
 
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		map.forEach((k, v) -> {
-			if (ObjectUtil.isNotEmpty(v)) {
-				v.forEach(e -> {
-					e.setFilesList(productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>().eq("pid", e.getProductLaunchId()).eq("is_deleted", 0)));
-				});
-			}
 			Map<String, Object> objectMap = new HashMap<>();
 			objectMap.put("name", k);
 			objectMap.put("list", v);

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -13,7 +13,6 @@ import com.gubersail.admin.goods.mapper.GoodsDescMapper;
 import com.gubersail.admin.integral.service.IPjIntegralDetailService;
 import com.gubersail.admin.order.mapper.OrderItemsMapper;
 import com.gubersail.admin.order.service.IOrderService;
-import com.gubersail.admin.productLaunch.mapper.ProductLaunchMapper;
 import com.gubersail.admin.shoppingCart.mapper.ShoppingCartMapper;
 import com.gubersail.admin.shoppingCart.service.IShoppingCartService;
 import com.gubersail.admin.util.BillCodeUtil;
@@ -25,7 +24,6 @@ import com.gubersail.dealer.admin.api.goods.entity.PjGoodsDesc;
 import com.gubersail.dealer.admin.api.integral.entity.PjIntegralDetail;
 import com.gubersail.dealer.admin.api.order.entity.PjOrder;
 import com.gubersail.dealer.admin.api.order.entity.PjOrderItems;
-import com.gubersail.dealer.admin.api.productLaunch.entity.PjProductLaunch;
 import com.gubersail.dealer.admin.api.shoppingCart.entity.PjShoppingCart;
 import com.gubersail.dealer.admin.api.shoppingCart.vo.ShoppingCartVO;
 import lombok.AllArgsConstructor;
@@ -48,7 +46,6 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 配件批发购物车服务实现类
@@ -65,7 +62,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 	private final ICorpsDescService corpsDescService;
 	private final IOrderService orderService;
 	private final OrderItemsMapper orderItemsMapper;
-	private final ProductLaunchMapper productLaunchMapper;
 	private final ISysClient sysClient;
 	private IUserSearchClient userSearchClient;
 
@@ -167,7 +163,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					ids.append(order.getId()).append(",");
 					//保存销售明细信息
 					if (ObjectUtil.isNotEmpty(shoppingCartList)) {
-						List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
 						shoppingCartList.forEach(e -> {
 							PjOrderItems orderItems = new PjOrderItems();
 							BeanUtils.copyProperties(e, orderItems);
@@ -186,7 +181,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							orderItems.setInventory(e.getInventory());
 							orderItems.setTotalAmount(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
 							orderItems.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-							orderItems.setUrl(ObjectUtils.isNotNull(e.getFilesList()) && !e.getFilesList().isEmpty() ? e.getFilesList().get(0).getUrl() : "");
 							orderItems.setGoodsName(e.getGoodsName());
 							orderItemsMapper.insert(orderItems);
 							PjGoodsDesc goodsDesc = goodsDescMapper.selectById(orderItems.getGoodsId());
@@ -198,13 +192,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							//生成完毕删除购物车
 							e.setIsDeleted(1);
 							baseMapper.updateById(e);
-							PjProductLaunch productLaunch = productLaunchMapper.selectById(e.getProductLaunchId());
-							if (ObjectUtils.isNotNull(productLaunch)) {
-								if (productLaunch.getInventory().compareTo(orderItems.getGoodsNum()) < 0) {
-									throw new RuntimeException("商品：" + orderItems.getGoodsName() + "库存不足");
-								}
-								pjProductLaunchList.add(productLaunch);
-							}
 						});
 						BigDecimal totalMoney = BigDecimal.ZERO;
 						order.setNumberRows(shoppingCartList.size());//行数
@@ -391,7 +378,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							orderItems.setInventory(e.getInventory());
 							orderItems.setTotalAmount(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
 							orderItems.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-							orderItems.setUrl(ObjectUtils.isNotNull(e.getFilesList()) && !e.getFilesList().isEmpty() ? e.getFilesList().get(0).getUrl() : "");
 							orderItems.setGoodsName(e.getGoodsName());
 							orderItemsMapper.insert(orderItems);
 							PjGoodsDesc goodsDesc = goodsDescMapper.selectById(orderItems.getGoodsId());
@@ -545,7 +531,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					orderService.save(order);
 					//保存销售明细信息
 					if (ObjectUtil.isNotEmpty(shoppingCartList)) {
-						List<PjProductLaunch> pjProductLaunchList = new ArrayList<>();
 						shoppingCartList.forEach(e -> {
 							PjOrderItems orderItems = new PjOrderItems();
 							BeanUtils.copyProperties(e, orderItems);
@@ -564,7 +549,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							orderItems.setInventory(e.getInventory());
 							orderItems.setTotalAmount(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
 							orderItems.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-							orderItems.setUrl(ObjectUtils.isNotNull(e.getFilesList()) && !e.getFilesList().isEmpty() ? e.getFilesList().get(0).getUrl() : "");
 							orderItems.setGoodsName(e.getGoodsName());
 							orderItemsMapper.insert(orderItems);
 							PjGoodsDesc goodsDesc = goodsDescMapper.selectById(orderItems.getGoodsId());
@@ -576,12 +560,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							//生成完毕删除购物车
 							e.setIsDeleted(1);
 							baseMapper.updateById(e);
-							PjProductLaunch productLaunch = productLaunchMapper.selectById(e.getProductLaunchId());
-							if (ObjectUtils.isNotNull(productLaunch)) {
-								productLaunch.setInventory(productLaunch.getInventory().subtract(orderItems.getGoodsNum()));
-								productLaunchMapper.updateById(productLaunch);
-								pjProductLaunchList.add(productLaunch);
-							}
 						});
 						BigDecimal totalMoney;
 						order.setNumberRows(shoppingCartList.size());//行数
@@ -793,7 +771,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							orderItems.setInventory(e.getInventory());
 							orderItems.setTotalAmount(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
 							orderItems.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-							orderItems.setUrl(ObjectUtils.isNotNull(e.getFilesList()) && !e.getFilesList().isEmpty() ? e.getFilesList().get(0).getUrl() : "");
 							orderItems.setGoodsName(e.getGoodsName());
 							orderItemsMapper.insert(orderItems);
 							PjGoodsDesc goodsDesc = goodsDescMapper.selectById(orderItems.getGoodsId());
@@ -805,15 +782,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							//生成完毕删除购物车
 							e.setIsDeleted(1);
 							baseMapper.updateById(e);
-							PjProductLaunch productLaunch = productLaunchMapper.selectById(e.getProductLaunchId());
-							if (ObjectUtils.isNotNull(productLaunch)) {
-								if (productLaunch.getInventory().compareTo(orderItems.getGoodsNum()) < 0) {
-									throw new RuntimeException("商品：" + orderItems.getGoodsName() + "库存不足");
-								} else {
-									productLaunch.setInventory(productLaunch.getInventory().subtract(orderItems.getGoodsNum()));
-									productLaunchMapper.updateById(productLaunch);
-								}
-							}
 						});
 						BigDecimal totalMoney;
 						order.setNumberRows(shoppingCartList.size());//行数