diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java index 935953d..ec9724c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java @@ -56,7 +56,7 @@ public class SupermarketProductController extends BaseController { @GetMapping("/getAddList") public TableDataInfo getAddList(SupermarketProduct supermarketProduct) { startPage(); - List list = supermarketProductService.selectSupermarketProductList(supermarketProduct); + List list = supermarketProductService.selectSupermarketAddProductList(supermarketProduct); return getDataTable(list); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java index 0eb31ab..28858f5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java @@ -20,7 +20,7 @@ import com.bonus.common.core.web.domain.BaseEntity; @ToString public class SupermarketProduct extends BaseEntity { private static final long serialVersionUID = 1L; - + /** 商城商品明细id */ private Long productId; @@ -76,6 +76,14 @@ public class SupermarketProduct extends BaseEntity { private String materialName; + private String materialType; + + private String materialTypeName; + + private String areaId; + + private String areaName; + private String unitName; public String getImgUrl() { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java index 5a88419..e524bc8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java @@ -28,6 +28,7 @@ public interface SupermarketProductMapper { */ public List selectSupermarketProductList(SupermarketProduct supermarketProduct); + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct); /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java index f5b24e1..72da950 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java @@ -26,6 +26,8 @@ public interface ISupermarketProductService { */ public List selectSupermarketProductList(SupermarketProduct supermarketProduct); + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct); + /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java index e60c925..5edba79 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java @@ -43,6 +43,10 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService return supermarketProductMapper.selectSupermarketProductList(supermarketProduct); } + @Override + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct) { + return supermarketProductMapper.selectSupermarketAddProductList(supermarketProduct); + } /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml index 7fa052d..27493eb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml @@ -48,6 +48,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + +