Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCustomerHealthyMapper.java

@@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
 
 import java.util.List;
 
+import com.stdiet.common.core.domain.entity.SysDictData;
 import com.stdiet.custom.domain.SysCustomer;
 import com.stdiet.custom.domain.SysCustomerHealthy;
 import org.apache.ibatis.annotations.Param;
@@ -79,4 +80,12 @@ public interface SysCustomerHealthyMapper
      * @return
      */
     int deleteCustomerHealthyByCustomerId(@Param("customerId")Long customerId);
+
+
+    /**
+     * 根据类型、键值集合查询字典类型
+     * @param sysDictData
+     * @return
+     */
+    public  List<SysDictData> selectDictDataByTypeAndValue(SysDictData sysDictData);
 }

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java

@@ -3,6 +3,7 @@ package com.stdiet.custom.mapper;
 import java.util.List;
 import com.stdiet.custom.domain.SysRecipesPlan;
 import com.stdiet.custom.domain.SysRecipesPlanListInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 食谱计划Mapper接口
@@ -81,6 +82,13 @@ public interface SysRecipesPlanMapper
      */
     List<SysRecipesPlan> selectPlanListByCondition(SysRecipesPlan sysRecipesPlan);
 
+    /**
+     * 根据客户ID查询最后一天食谱计划
+     * @param customerId
+     * @return
+     */
+    SysRecipesPlan getLastDayRecipesPlan(@Param("customerId")Long customerId);
+
     /**
      * 根据订单ID查询食谱计划
      * @param sysRecipesPlan
@@ -93,6 +101,13 @@ public interface SysRecipesPlanMapper
     List<SysRecipesPlanListInfo> selectRecipesPlanListInfo(String outId);
 
     List<SysRecipesPlan> selectPlanListByCusId(Long cusId);
-
+    
     List<SysRecipesPlan> selectRecipesModelList(SysRecipesPlan sysRecipesPlan);
+
+    /**
+     * 批量更新食谱计划的开始时间、结束时间
+     * @param list
+     * @return
+     */
+    int updateMuchRecipesPlanDate(SysRecipesPlan sysRecipesPlan);
 }