商品表

alien-entity/src/main/java/shop/alien/entity/store/dto/StoreProductItemDto.java

@@ -1,10 +1,12 @@
 package shop.alien.entity.store.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -25,6 +27,10 @@ public class StoreProductItemDto implements Serializable {
     @ApiModelProperty("商品名称")
     private String prodName;
 
+    @ApiModelProperty(value = "总价")
+    @TableField("total_price")
+    private BigDecimal totalPrice;
+
     @ApiModelProperty("商品类型，整型枚举：1酒吧-酒水 2酒吧-餐食 3酒吧-套餐  4美食-餐食 5运动健身-单次 6运动健身-多次")
     private Integer prodType;
 

alien-store/src/main/java/shop/alien/store/controller/StoreProductBarController.java

@@ -39,12 +39,7 @@ public class StoreProductBarController {
         if (bar.getPrice() == null) {
             return R.fail("价格不能为空");
         }
-        if (bar.getCostPrice() == null) {
-            return R.fail("成本价不能为空");
-        }
-        if (bar.getCategory() == null || bar.getCategory().trim().isEmpty()) {
-            return R.fail("品类不能为空");
-        }
+
 
         R<StoreProductBar> result = storeProductBarService.addStoreProductBar(bar);
         if (result.getCode() == 200) {

alien-store/src/main/java/shop/alien/store/controller/StoreProductItemController.java

@@ -56,7 +56,10 @@ public class StoreProductItemController {
     @ApiOperation("根据ID查询商品")
     @ApiOperationSupport(order = 4)
     @GetMapping("/getById")
-    public R<List<StoreProductItemDto>> getStoreProductItemById(@RequestParam(value = "id") Integer id,@RequestParam(value = "id")Integer modelType) {
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "modelType", value = "1酒吧2美食3运动", dataType = "int", paramType = "query"),
+    })
+    public R<List<StoreProductItemDto>> getStoreProductItemById(@RequestParam(value = "id") Integer id,@RequestParam(value = "modelType")Integer modelType) {
         log.info("StoreProductItemController.getStoreProductItemById?id={}", id);
         return storeProductItemService.getStoreProductItemById(id, modelType);
     }

alien-store/src/main/java/shop/alien/store/service/impl/StoreProductItemServiceImpl.java

@@ -166,7 +166,7 @@ public class StoreProductItemServiceImpl extends ServiceImpl<StoreProductItemMap
     public R<List<StoreProductItemDto>> getStoreProductItemById(Integer id,Integer modelType) {
         log.info("StoreProductItemServiceImpl.getStoreProductItemById?id={}", id);
         StoreProductItem storeProductItem = this.getById(id);
-        if (storeProductItem == null) {
+        if (storeProductItem != null) {
             ArrayList<StoreProductItemDto> list = new ArrayList<>();
             StoreProductItemDto storeProductItemDto = new StoreProductItemDto();
             list.add(storeProductItemDto);