!68 修复未生成食谱逻辑错误

Merge pull request !68 from 德仔/develop

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

@@ -1,24 +1,24 @@
 package com.stdiet.custom.service.impl;
 
+import com.stdiet.common.utils.DateUtils;
+import com.stdiet.common.utils.SynchrolockUtil;
+import com.stdiet.custom.domain.SysOrder;
+import com.stdiet.custom.domain.SysOrderPause;
+import com.stdiet.custom.domain.SysRecipesPlan;
+import com.stdiet.custom.mapper.SysRecipesPlanMapper;
+import com.stdiet.custom.service.ISysOrderPauseService;
+import com.stdiet.custom.service.ISysOrderService;
+import com.stdiet.custom.service.ISysRecipesPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import com.stdiet.common.utils.DateUtils;
-import com.stdiet.common.utils.SynchrolockUtil;
-import com.stdiet.custom.domain.SysOrder;
-import com.stdiet.custom.domain.SysOrderPause;
-import com.stdiet.custom.service.ISysOrderPauseService;
-import com.stdiet.custom.service.ISysOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.QueryAnnotation;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import com.stdiet.custom.mapper.SysRecipesPlanMapper;
-import com.stdiet.custom.domain.SysRecipesPlan;
-import com.stdiet.custom.service.ISysRecipesPlanService;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 食谱计划Service业务层处理
@@ -28,22 +28,17 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service("sysRecipesPlanService")
 @Transactional
-public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
+public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
-{
+    public static final String generateRecipesPlanLockKey = "generateRecipesPlanLock::%s";
     @Autowired
     private SysRecipesPlanMapper sysRecipesPlanMapper;
-
     @Autowired
     private ISysOrderService sysOrderService;
-
     @Autowired
     private ISysOrderPauseService sysOrderPauseService;
-
     @Autowired
     private SynchrolockUtil synchrolockUtil;
 
-    public static final String generateRecipesPlanLockKey = "generateRecipesPlanLock::%s";
-
     /**
      * 查询食谱计划
      *
@@ -51,8 +46,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 食谱计划
      */
     @Override
-    public SysRecipesPlan selectSysRecipesPlanById(Long id)
+    public SysRecipesPlan selectSysRecipesPlanById(Long id) {
-    {
         return sysRecipesPlanMapper.selectSysRecipesPlanById(id);
     }
 
@@ -63,8 +57,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 食谱计划
      */
     @Override
-    public List<SysRecipesPlan> selectSysRecipesPlanList(SysRecipesPlan sysRecipesPlan)
+    public List<SysRecipesPlan> selectSysRecipesPlanList(SysRecipesPlan sysRecipesPlan) {
-    {
         return sysRecipesPlanMapper.selectSysRecipesPlanList(sysRecipesPlan);
     }
 
@@ -75,8 +68,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 结果
      */
     @Override
-    public int insertSysRecipesPlan(SysRecipesPlan sysRecipesPlan)
+    public int insertSysRecipesPlan(SysRecipesPlan sysRecipesPlan) {
-    {
         sysRecipesPlan.setCreateTime(DateUtils.getNowDate());
         return sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
     }
@@ -88,8 +80,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 结果
      */
     @Override
-    public int updateSysRecipesPlan(SysRecipesPlan sysRecipesPlan)
+    public int updateSysRecipesPlan(SysRecipesPlan sysRecipesPlan) {
-    {
         sysRecipesPlan.setUpdateTime(DateUtils.getNowDate());
         //目前只能修改发送状态，所以修改时加上发送时间
         sysRecipesPlan.setSendTime(DateUtils.getNowDate());
@@ -103,8 +94,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 结果
      */
     @Override
-    public int deleteSysRecipesPlanByIds(Long[] ids)
+    public int deleteSysRecipesPlanByIds(Long[] ids) {
-    {
         return sysRecipesPlanMapper.deleteSysRecipesPlanByIds(ids);
     }
 
@@ -115,8 +105,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
      * @return 结果
      */
     @Override
-    public int deleteSysRecipesPlanById(Long id)
+    public int deleteSysRecipesPlanById(Long id) {
-    {
         return sysRecipesPlanMapper.deleteSysRecipesPlanById(id);
     }
 
@@ -137,7 +126,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
         if (sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021) {
             return;
         }
-        System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear());
+//        System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear());
         try {
             //获取redis中该订单对应的锁
             if (synchrolockUtil.lock(String.format(generateRecipesPlanLockKey, orderId))) {
@@ -159,7 +148,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
                 pauseParam.setOrderId(sysOrder.getOrderId());
                 //暂停记录列表
                 List<SysOrderPause> pauseList = sysOrderPauseService.selectSysOrderPauseList(pauseParam);
-                List<SysRecipesPlan> planList = generatePlan(orderId, oldRecipesPlanList, DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()), pauseList);
+                List<SysRecipesPlan> planList = generatePlan(sysOrder, oldRecipesPlanList,
+                        DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()), pauseList);
                 if (planList != null && planList.size() > 0) {
                     sysRecipesPlanMapper.insertBatch(planList);
                 }
@@ -167,8 +157,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
                      getTestDate(sysRecipesPlan.getStartDate(), sysRecipesPlan.getEndDate());
                  }*/
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e) {
             e.printStackTrace();
         } finally {
             // 一定要释放锁
@@ -186,14 +175,16 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
 
     /**
      * 根据订单ID、订单开始服务时间、结束时间、暂停列表生成食谱计划列表
-     * @param orderId 订单ID
+     *
+     * @param sysOrder           订单对象
      * @param oldRecipesPlanList 旧的食谱计划
      * @param serverStartDate    服务开始时间
      * @param serverEndDate      服务结束时间
      * @param pauseList          暂停列表
      * @return
      */
-    public List<SysRecipesPlan> generatePlan(Long orderId, List<SysRecipesPlan> oldRecipesPlanList, LocalDate serverStartDate, LocalDate serverEndDate, List<SysOrderPause> pauseList){
+    public List<SysRecipesPlan> generatePlan(SysOrder sysOrder, List<SysRecipesPlan> oldRecipesPlanList,
+                                             LocalDate serverStartDate, LocalDate serverEndDate, List<SysOrderPause> pauseList) {
         List<SysRecipesPlan> planList = new ArrayList<>();
         boolean breakFlag = false;
         LocalDate planStartDate = serverStartDate;
@@ -210,7 +201,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
             planEndDate = planEndDate.plusDays(pauseDay);
             sysRecipesPlan.setStartDate(DateUtils.localDateToDate(planStartDate));
             sysRecipesPlan.setEndDate(DateUtils.localDateToDate(planEndDate));
-            sysRecipesPlan.setOrderId(orderId);
+            sysRecipesPlan.setOrderId(sysOrder.getOrderId());
+            sysRecipesPlan.setCusId(sysOrder.getCusId());
             /*//当开始时间小于等于当前时间，默认为已发送，发送时间为前一天
             if(ChronoUnit.DAYS.between(planStartDate, LocalDate.now()) >= 0){
                 sysRecipesPlan.setSendFlag(1);
@@ -236,6 +228,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
 
     /**
      * 根据食谱开始时间、结束时间、暂停列表获取在食谱计划范围内的暂停天数
+     *
      * @param planStartDate 计划开始时间
      * @param planEndDate   计划结束时间
      * @param pauseList     暂停列表
@@ -265,6 +258,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
 
     /**
      * 根据订单ID删除所有食谱安排计划
+     *
      * @param orderIds 订单ID
      * @return
      */
@@ -275,6 +269,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
 
     /**
      * 多条件查询食谱计划列表
+     *
      * @param sysRecipesPlan
      * @return
      */
@@ -285,6 +280,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
 
     /**
      * 根据订单ID查询食谱计划
+     *
      * @param sysRecipesPlan
      * @return
      */

stdiet-ui/src/App.vue

@@ -5,7 +5,15 @@
 </template>
 
 <script>
+import { createNamespacedHelpers } from "vuex";
+const { mapActions } = createNamespacedHelpers("global");
 export default {
-  name:  'App'
+  name: "App",
-}
+  created() {
+    this.init();
+  },
+  methods: {
+    ...mapActions(["init"]),
+  },
+};
 </script>

stdiet-ui/src/store/index.js

@@ -6,6 +6,7 @@ import tagsView from "./modules/tagsView";
 import permission from "./modules/permission";
 import settings from "./modules/settings";
 import recipes from "./modules/recipes";
+import global from "./modules/global";
 
 import getters from "./getters";
 
@@ -18,7 +19,8 @@ const store = new Vuex.Store({
     tagsView,
     permission,
     settings,
-    recipes
+    recipes,
+    global
   },
   getters
 });

stdiet-ui/src/store/modules/global.js

@@ -0,0 +1,62 @@
+import { getOptions } from "@/api/custom/order";
+
+const oriState = {
+  nutritionistIdOptions: [],
+  nutriAssisIdOptions: [],
+  preSaleIdOptions: [],
+  afterSaleIdOptions: [],
+  plannerIdOptions: [],
+  plannerAssisIdOptions: [],
+  operatorIdOptions: [],
+  operatorAssisIdOptions: [],
+};
+
+const mutations = {
+  save(state, payload) {
+    Object.keys(payload).forEach(key => {
+      state[key] = payload[key];
+    });
+  },
+  clean(state) {
+    Object.keys(oriState).forEach(key => {
+      state[key] = oriState[key];
+    });
+  }
+};
+const actions = {
+  async init({ commit }, payload) {
+    const { data: optionsData } = await getOptions();
+    const options = optionsData.reduce((opts, cur) => {
+      if (!opts[cur.postCode]) {
+        opts[cur.postCode] = [
+          // { dictValue: null, dictLabel: "全部", remark: null }
+        ];
+      }
+      opts[cur.postCode].push({
+        dictValue: cur.userId,
+        dictLabel: cur.userName,
+        remark: cur.remark
+      });
+      return opts;
+    }, {});
+    commit("save", {
+      nutritionistIdOptions: options["nutri"] || [],
+      nutriAssisIdOptions: options["nutri_assis"] || [],
+      preSaleIdOptions: options["pre_sale"] || [],
+      afterSaleIdOptions: options["after_sale"] || [],
+      plannerIdOptions: options["planner"] || [],
+      plannerAssisIdOptions: options["planner_assis"] || [],
+      operatorIdOptions: options["operator"] || [],
+      operatorAssisIdOptions: options["operator_assis"] || []
+    });
+  }
+};
+const getters = {};
+
+export default {
+  namespaced: true,
+  state: Object.assign({}, oriState),
+  mutations,
+  actions,
+  getters
+};

stdiet-ui/src/store/modules/recipes.js

@@ -1,4 +1,3 @@
-import { getOrder } from "@/api/custom/order";
 import { getCustomerPhysicalSignsByCusId } from "@/api/custom/customer";
 import { dealHealthy } from "@/utils/healthyData";
 import {
@@ -54,7 +53,7 @@ const mutations = {
     // console.log(payload);
     state.recipesData[payload.num].dishes = state.recipesData[
       payload.num
-    ].dishes.filter(obj => obj.id !== payload.dishesId);
+    ].dishes.filter(obj => obj.id !== payload.id);
   },
   updateStateData(state, payload) {
     Object.keys(payload).forEach(key => {
@@ -92,7 +91,7 @@ const actions = {
       commit("updateStateData", { dishesTypeOptions: response.data });
     });
 
-    //
+    // 健康数据
     if (payload.cusId) {
       dispatch("getHealthyData", payload);
     }
@@ -104,7 +103,6 @@ const actions = {
   },
   async getHealthyData({ commit }, payload) {
     commit("updateStateData", { healthDataLoading: true });
-    // 健康数据
     const healthyDataResult = await getCustomerPhysicalSignsByCusId(
       payload.cusId
     );
@@ -211,7 +209,9 @@ const actions = {
     };
     const result = await addRecipesApi(params);
     if (result.code === 200) {
-      dispatch("getRecipesInfo", { recipesId: result.data });
+      const recipesId = result.data;
+      commit("updateStateData", { recipesId });
+      dispatch("getRecipesInfo", { recipesId });
     }
     // console.log(params);
   },
@@ -238,10 +238,10 @@ const actions = {
           payload.data.id = result.data;
           commit("addRecipesDishes", payload);
         }
-      } else {
-        commit("addRecipesDishes", payload);
       }
       // console.log(result);
+    } else {
+      commit("addRecipesDishes", payload);
     }
   },
   async updateDishes({ commit, state }, payload) {

stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/ConfigDishes.vue

@@ -43,11 +43,11 @@
         </el-table-column>
         <el-table-column
           prop="proteinRatio"
-          label="蛋白质/100g"
+          label="P/100g"
           align="center"
         />
-        <el-table-column prop="fatRatio" label="脂肪/100g" align="center" />
+        <el-table-column prop="fatRatio" label="F/100g" align="center" />
-        <el-table-column prop="carbonRatio" label="碳水/100g" align="center" />
+        <el-table-column prop="carbonRatio" label="C/100g" align="center" />
       </el-table>
     </el-form-item>
     <el-form-item label="推荐人群">

stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue

@@ -92,7 +92,7 @@ export default {
       if (!data) {
         return;
       }
-      console.log(data);
+      // console.log(data);
       this.selDishes = data;
       this.active = 1;
       this.typeOptions = data.type.split(",").reduce((arr, cur, idx) => {
@@ -143,7 +143,7 @@ export default {
         type,
         igdList,
       });
-      console.log(this.selDishes);
+      // console.log(this.selDishes);
     },
   },
 };

stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue

@@ -296,13 +296,14 @@ export default {
       });
     },
     handleOnDishesConfirm(data) {
+      // console.log(data);
       this.addDishes({
         num: this.num - 1,
         data,
       });
     },
     ...mapActions(["updateDishes", "addDishes", "deleteDishes"]),
-    ...mapMutations(["setCurrentDay",]),
+    ...mapMutations(["setCurrentDay"]),
   },
 };
 </script>

stdiet-ui/src/views/custom/recipesPlan/index.vue

@@ -111,14 +111,14 @@
       :data="recipesPlanList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="客户姓名" align="center" prop="customer" />
-      <el-table-column
+      <!-- <el-table-column
         label="客户手机号"
         align="center"
         prop="hidePhone"
         width="180"
-      />
+      /> -->
       <el-table-column
         label="食谱日期范围"
         align="center"
@@ -236,8 +236,7 @@
 
     <!-- 查看完整计划 -->
     <el-dialog
-      title="食谱计划表"
+      :title="allRecipesPlanTitle"
-      v-if="allRecipesPlanOpen"
       :visible.sync="allRecipesPlanOpen"
       width="800px"
       append-to-body
@@ -269,7 +268,7 @@
       </el-form>
 
       <el-table v-loading="loading" :data="allRecipesPlanList" width="700px">
-        <el-table-column label="客户姓名" align="center" prop="customer" />
+        <!-- <el-table-column label="客户姓名" align="center" prop="customer" /> -->
         <!--<el-table-column label="营养师名称" align="center" prop="nutritionist" />
         <el-table-column label="营养师助理名称" align="center" prop="nutritionistAssis" />-->
 
@@ -313,9 +312,9 @@
     </el-dialog>
 
     <!-- 查看订单 -->
-    <order-dialog ref="orderDialog" />
+    <!-- <order-dialog ref="orderDialog" /> -->
     <!-- 查看体征 -->
-    <body_sign_dialog ref="bodySignDialog" />
+    <!-- <body_sign_dialog ref="bodySignDialog" /> -->
   </div>
 </template>
 
@@ -327,8 +326,8 @@ import {
   updateRecipesPlan,
 } from "@/api/custom/recipesPlan";
 import { getOptions } from "@/api/custom/order";
-import OrderDetail from "@/components/OrderDetail";
+// import OrderDetail from "@/components/OrderDetail";
-import BodySignDetail from "@/components/BodySignDetail";
+// import BodySignDetail from "@/components/BodySignDetail";
 import dayjs from "dayjs";
 import store from "@/store";
 
@@ -378,6 +377,7 @@ export default {
       allRecipesPlanList: [],
       //订单弹窗状态
       allRecipesPlanOpen: false,
+      allRecipesPlanTitle: '',
       //订单弹窗中查询参数
       allRecipesPlanQueryParam: {
         pageNum: 1,
@@ -394,8 +394,8 @@ export default {
     };
   },
   components: {
-    "order-dialog": OrderDetail,
+    // "order-dialog": OrderDetail,
-    body_sign_dialog: BodySignDetail,
+    // body_sign_dialog: BodySignDetail,
   },
   created() {
     getOptions().then((response) => {
@@ -476,6 +476,7 @@ export default {
             dayjs(item.endDate).format("YYYY-MM-DD");
         });
         this.allRecipesPlanOpen = true;
+        this.allRecipesPlanTitle = `「${this.allRecipesPlanList[0].customer}」食谱计划表`
         this.allRecipesPlanTotal = response.total;
       });
     },