新增删除商品接口

src/main/java/com/study/mall/controller/GoodsController.java

@@ -80,6 +80,16 @@ public class GoodsController {
     }
 
     /**
+     * 删除商品
+     * @param ids 商品id集合
+     */
+    @DeleteMapping("admin")
+    public CommonResult<Void> delete(@RequestBody Long[] ids){
+        goodsService.removeBatchByIds(Arrays.asList(ids));
+        return CommonResult.ok();
+    }
+
+    /**
      * 修改商品排序
      * @param id 商品id
      * @param sort 新排序，不能小于0

src/main/java/com/study/mall/dto/ConfirmOrderDTO.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class ConfirmOrderDTO implements Serializable {
 
     /**
-     * 类型 1直接购买订单确认、2购物创建订单确认
+     * 类型 1直接购买订单确认、2购物车创建订单确认
      */
     @NotBlank(message = "类型不能为空")
     @Pattern(regexp = "(1|2)", message = "类型只能为1或者2")

src/main/java/com/study/mall/entity/GoodsEntity.java

@@ -2,6 +2,7 @@ package com.study.mall.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -114,4 +115,7 @@ public class GoodsEntity extends BaseOperateEntity implements Serializable {
 	 * 是否显示分享数量;0隐藏 1显示
 	 */
 	private String showShare;
+
+	@TableLogic(value = "0", delval = "1")
+	private String deleted;
 }

src/main/java/com/study/mall/service/impl/CartServiceImpl.java

@@ -87,7 +87,7 @@ public class CartServiceImpl implements CartService {
             cartItem.setCheck(true);
             cartItem.setGoodsName(goods.getName());
             cartItem.setGoodsCount(num);
-            cartItem.setLimitNum(10);
+            cartItem.setLimitNum(goods.getLimit() == 0 ? 10 : goods.getLimit());
 
             // 开启了Sku使用sku信息
             if (ObjectUtil.equal(goods.getEnableSku(), "1")) {

src/main/java/com/study/mall/service/impl/OrderInfoServiceImpl.java

@@ -50,6 +50,7 @@ import com.study.mall.vo.OrderStatisticsVO;
 import com.study.mall.vo.SubmitTokenVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.oschina.j2cache.cache.support.util.SpringUtil;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -83,7 +84,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoDao, OrderInfoEnt
     private final GoodsService goodsService;
     private final GoodsSkuService goodsSkuService;
     private final UserAddressService userAddressService;
-    private final OrderExpressInfoService orderExpressInfoService;
     private final StringRedisTemplate redisTemplate;
     private final RabbitTemplate rabbitTemplate;
 
@@ -492,6 +492,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoDao, OrderInfoEnt
 
         if (orderInfoList.size() > 0) {
             // 查询物流信息
+            OrderExpressInfoService orderExpressInfoService = SpringUtil.getBean(OrderExpressInfoService.class);
             List<Long> finishIds = orderExpressInfoService.getFinishIdsByOrderIds(orderInfoList.stream().map(OrderInfoEntity::getId).collect(Collectors.toList()));
 
             Map<Long, OrderInfoEntity> ordersMap = orderInfoList.stream().collect(Collectors.toMap(OrderInfoEntity::getId, Function.identity()));
@@ -719,6 +720,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoDao, OrderInfoEnt
         return selectCarItems.stream().map(e -> {
             OrderListForUserVO.OrderDetailVO detailVO = new OrderListForUserVO.OrderDetailVO();
             BeanUtils.copyProperties(e, detailVO);
+            detailVO.setGoodsAttr(e.getGoodAttr());
             return detailVO;
         }).collect(Collectors.toList());
     }

src/main/resources/static/doc/search.js

@@ -223,14 +223,18 @@ api[9].list.push({
 });
 api[9].list.push({
     order: '2',
-    desc: '新增分类',
+    desc: '分类树形列表(管理员)',
 });
 api[9].list.push({
     order: '3',
-    desc: '修改分类',
+    desc: '新增分类',
 });
 api[9].list.push({
     order: '4',
+    desc: '修改分类',
+});
+api[9].list.push({
+    order: '5',
     desc: '删除分类',
 });
 api.push({
@@ -281,34 +285,38 @@ api[11].list.push({
 });
 api[11].list.push({
     order: '4',
-    desc: '修改商品排序',
+    desc: '删除商品',
 });
 api[11].list.push({
     order: '5',
-    desc: '商品热门/精选状态修改',
+    desc: '修改商品排序',
 });
 api[11].list.push({
     order: '6',
-    desc: '商品详情（管理员端）',
+    desc: '商品热门/精选状态修改',
 });
 api[11].list.push({
     order: '7',
-    desc: '新增商品',
+    desc: '商品详情（管理员端）',
 });
 api[11].list.push({
     order: '8',
-    desc: '修改商品',
+    desc: '新增商品',
 });
 api[11].list.push({
     order: '9',
-    desc: '商品下架',
+    desc: '修改商品',
 });
 api[11].list.push({
     order: '10',
-    desc: '商品上架',
+    desc: '商品下架',
 });
 api[11].list.push({
     order: '11',
+    desc: '商品上架',
+});
+api[11].list.push({
+    order: '12',
     desc: '商品浏览量+1',
 });
 api.push({