liyafei 3 месяцев назад
Родитель
Сommit
f49c1e6756

+ 1 - 0
alien-entity/src/main/java/shop/alien/mapper/StoreCuisineComboMapper.java

@@ -18,3 +18,4 @@ public interface StoreCuisineComboMapper extends BaseMapper<StoreCuisineCombo> {
 
 
 
+

+ 1 - 0
alien-entity/src/main/java/shop/alien/mapper/StoreCuisineMapper.java

@@ -18,3 +18,4 @@ public interface StoreCuisineMapper extends BaseMapper<StoreCuisine> {
 
 
 
+

+ 1 - 0
alien-entity/src/main/resources/mapper/StoreCuisineComboMapper.xml

@@ -28,3 +28,4 @@
 
 
 
+

+ 2 - 2
alien-store/src/main/java/shop/alien/store/aspect/AiAuditAspect.java

@@ -89,10 +89,10 @@ public class AiAuditAspect {
     }
 
     /**
-     * 将审核结果写入入参的status字段(通过=1,不通过=0
+     * 将审核结果写入入参的status字段(通过=1,不通过=2
      */
     private void applyStatus(Object[] args, boolean passed) {
-        int status = passed ? 1 : 0;
+        int status = passed ? 1 : 2;
         for (Object arg : args) {
             if (arg == null) {
                 continue;

+ 2 - 2
alien-store/src/main/java/shop/alien/store/controller/StoreCuisineController.java

@@ -68,8 +68,8 @@ public class StoreCuisineController {
     @ApiOperation("获取所有美食单品名称,用于添加套餐")
     @ApiOperationSupport(order = 1)
     @GetMapping("/getSingleName")
-    public R<List<StoreCuisine>> getSingleName() {
-        return R.data(storeCuisineService.getSingleName());
+    public R<List<StoreCuisine>> getSingleName(Integer storeId) {
+        return R.data(storeCuisineService.getSingleName(storeId));
     }
 
     @ApiOperation("根据id与类型获取美食单品或套餐详情")

+ 1 - 0
alien-store/src/main/java/shop/alien/store/service/StoreCuisineComboService.java

@@ -35,3 +35,4 @@ public interface StoreCuisineComboService extends IService<StoreCuisineCombo> {
 
 
 
+

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/StoreCuisineService.java

@@ -29,7 +29,7 @@ public interface StoreCuisineService extends IService<StoreCuisine> {
     /**
      * 获取所有单品名称(cuisine_type = 1),用于添加套餐时选择
      */
-    List<StoreCuisine> getSingleName();
+    List<StoreCuisine> getSingleName(Integer storeId);
 
     /**
      * 根据 id 与类型获取详情(新格式):

+ 5 - 1
alien-store/src/main/java/shop/alien/store/service/impl/StoreCuisineServiceImpl.java

@@ -98,9 +98,13 @@ public class StoreCuisineServiceImpl extends ServiceImpl<StoreCuisineMapper, Sto
      * 获取所有单品名称(cuisine_type = 1),用于添加套餐
      */
     @Override
-    public List<StoreCuisine> getSingleName() {
+    public List<StoreCuisine> getSingleName(Integer storeId) {
         return lambdaQuery()
                 .eq(StoreCuisine::getCuisineType, 1)
+                .eq(StoreCuisine::getStatus, 1)
+                .eq(StoreCuisine::getShelfStatus, 1)
+                .eq(StoreCuisine::getDeleteFlag, 0)
+                .eq(StoreCuisine::getStoreId, storeId)
                 .list();
     }