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

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipes.java

@@ -13,5 +13,7 @@ public class SysRecipes {
 
     private Long planId;
 
+    private int reviewStatus;
+
     private List<SysRecipesDaily> menus;
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java

@@ -53,7 +53,7 @@ public class SysRecipesServiceImpl implements ISysRecipesService {
             // 更新食谱计划
             SysRecipesPlan sysRecipesPlan = new SysRecipesPlan();
             sysRecipesPlan.setId(sysRecipes.getPlanId());
-            sysRecipesPlan.setReviewStatus(3);// 设置制作中
+            sysRecipesPlan.setReviewStatus(sysRecipes.getReviewStatus());// 设置制作中
             sysRecipesPlan.setRecipesId(sysRecipes.getId());
             sysRecipesPlanMapper.updateSysRecipesPlan(sysRecipesPlan);
         }

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -480,7 +480,7 @@
 
     <!-- 根据客户ID查询该客户下所有订单 -->
     <select id="getAllOrderByCusId" parameterType="Long" resultMap="SysOrderResult">
-        select * from sys_order where del_flag = 0 and cus_id = #{cusId} order by order_id asc
+        select * from sys_order where del_flag = 0 and cus_id = #{cusId} order by order_time asc
     </select>
 
 </mapper>