商户PC端 价目表搜索

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

@@ -96,7 +96,7 @@ public class CuisineTypeResponseDto {
 
         @ApiModelProperty("提交时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-        private Date createTime;
+        private Date createdTime;
 
         @ApiModelProperty("审核时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -360,6 +360,10 @@ public class StorePriceController {
         LambdaQueryWrapper<StorePrice> queryWrapper = new LambdaQueryWrapper<>();
         if(null==origin){
             queryWrapper.eq(StorePrice::getShelfStatus, 1);
+        }else if(origin==0){
+            queryWrapper.in(StorePrice::getShelfStatus, 1,2);
+        }else{
+            queryWrapper.eq(StorePrice::getShelfStatus, origin);
         }
         if (storeId != null) {
             queryWrapper.eq(StorePrice::getStoreId, storeId);

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

@@ -176,7 +176,7 @@ public class StoreCuisineServiceImpl extends ServiceImpl<StoreCuisineMapper, Sto
         data.setPeopleLimit(base.getPeopleLimit());
         data.setUsageRule(base.getUsageRule());
         data.setRawJson(base.getRawJson());
-        data.setCreateTime(base.getCreatedTime());
+        data.setCreatedTime(base.getCreatedTime());
         data.setAuditTime(base.getAuditTime());
         data.setAuditStatus(base.getStatus());
         data.setShelfStatus(base.getShelfStatus());