修复超市商品新增错误

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenSpuUpdateStockReqDTO.java

@@ -0,0 +1,47 @@
+package com.bsd.pjcloud.canteen.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 商品 SKU 更新库存 Request DTO
+ *
+ * @author LeeYan9
+ * @since 2022-08-26
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CanteenSpuUpdateStockReqDTO {
+
+    /**
+     * 商品 SKU
+     */
+    @NotNull(message = "商品 SPU 不能为空")
+    private List<Item> items;
+
+    @Data
+    public static class Item {
+
+        /**
+         * 商品 SKU 编号
+         */
+        @NotNull(message = "商品 SPU 编号不能为空")
+        private Long id;
+
+        /**
+         * 库存变化数量
+         *
+         * 正数：增加库存
+         * 负数：扣减库存
+         */
+        @NotNull(message = "库存变化数量不能为空")
+        private Integer incrCount;
+
+    }
+
+}

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -126,4 +127,11 @@ public class CanteenSpuController {
 
 
 
+
+    @PostMapping("/updateSkuStock")
+    @SysLog("更新库存")
+    public R updateSkuStock(@RequestBody CanteenSpuUpdateStockReqDTO updateStockReqDTO){
+
+        return canteenSpuService.updateSkuStock(updateStockReqDTO);
+    }
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenSpuService.java

@@ -2,8 +2,10 @@ package com.bsd.pjcloud.canteen.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.common.core.util.R;
 
 import java.util.List;
 
@@ -18,4 +20,10 @@ public interface CanteenSpuService extends IService<CanteenSpuEntity> {
     Object selectFoodList(LambdaQueryWrapper<CanteenSpuEntity> wrapper);
 
 
+    /**
+     * 更新库存
+     * @param updateStockReqDTO
+     * @return
+     */
+    R updateSkuStock(CanteenSpuUpdateStockReqDTO updateStockReqDTO);
 }

pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java

@@ -2,10 +2,12 @@ package com.bsd.pjcloud.canteen.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
+import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.collections4.CollectionUtils;
@@ -26,5 +28,26 @@ public class CanteenSpuServiceImpl extends ServiceImpl<CanteenSpuMapper, Canteen
         return baseMapper.selectListByScope(wrapper, DataScope.of());
     }
 
+    @Override
+    public R updateSkuStock(CanteenSpuUpdateStockReqDTO updateStockReqDTO) {
+        // 更新 SKU 库存
+//        updateStockReqDTO.getItems().forEach(item -> {
+//            int i = onlineFoodSpuMapper.updateStock(item.getId(), item.getIncrCount());
+//            if (item.getIncrCount() < 0) {
+//                if (i == 0) {
+//                   R.failed("商品库存不足");
+//                }
+//            }
+//        });
+//
+//        // 更新 SPU 库存
+//        List<OnlineFoodSkuDO> skus = onlineFoodSkuMapper.selectBatchIds(
+//                convertSet(updateStockReqDTO.getItems(), OnlineFoodSkuUpdateStockReqDTO.Item::getId));
+//        Map<Long, Integer> spuStockIncrCounts = FoodSkuConvert.INSTANCE.convertSpuStockMap(
+//                updateStockReqDTO.getItems(), skus);
+//        onlineFoodSpuService.updateSpuStock(spuStockIncrCounts);
+        return null;
+    }
+
 
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java

@@ -310,9 +310,11 @@ public class SupermarketSpuEntity extends Model<SupermarketSpuEntity> {
     private Long tenantId;
 
 	@Schema(description = "辅助条码集合对象")
+	@TableField(exist = false)
 	private List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList;
 
 	@Schema(description = "包装对象集合对象")
+	@TableField(exist = false)
 	private List<SupermarketUnitEntity> supermarketUnitEntityList;
 
 }