!84 修复创建模板问题

Merge pull request !84 from 德仔/develop

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

@@ -41,6 +41,7 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
         sysRecipesPlan.setStartNumDay(1);
         sysRecipesPlan.setEndNumDay(7);
         sysRecipesPlan.setType(1);
+        sysRecipesPlan.setCusId(0L);
         sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
         if (!StringUtils.isNull(sysRecipesPlan.getId())) {
             sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername());
@@ -60,7 +61,15 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
 
     @Override
     public int removeRecipesTemplate(Long id) {
-        return sysRecipesTemplateMapper.removeRecipesTemplate(id);
+        SysRecipesTemplate sysRecipesTemplate= sysRecipesTemplateMapper.getRecipesTemplateById(id);
+        if(StringUtils.isNull(sysRecipesTemplate)) {
+            return 0;
+        }
+        int rows = sysRecipesTemplateMapper.removeRecipesTemplate(sysRecipesTemplate.getId());
+        if(rows > 0) {
+            return sysRecipesPlanMapper.deleteSysRecipesPlanById(sysRecipesTemplate.getPlanId());
+        }
+        return 0;
     }
 
     @Override

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

@@ -132,9 +132,9 @@
         where id = #{id} and del_flag = 0
     </update>
 
-    <delete id="deleteSysRecipesPlanById" parameterType="Long">
-        delete from sys_recipes_plan where id = #{id}
-    </delete>
+    <update id="deleteSysRecipesPlanById" parameterType="Long">
+        update sys_recipes_plan set del_flag = 1 where id = #{id}
+    </update>
 
     <delete id="deleteSysRecipesPlanByIds" parameterType="String">
         delete from sys_recipes_plan where id in

stdiet-ui/src/api/custom/recipes.js

@@ -2,7 +2,7 @@ import request from "@/utils/request";
 
 export function addRecipesApi(data) {
   return request({
-    url: "/custom/recipes/",
+    url: "/custom/recipes",
     method: "post",
     data
   });

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

@@ -259,9 +259,7 @@ const actions = {
       dispatch("getRecipesInfo", { recipesId });
       payload.callback &&
         payload.callback({
-          recipesId: result.data,
           name: state.healthyData.name,
-          cusId: state.cusId,
           planId: state.planId
         });
     }

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

@@ -72,7 +72,9 @@
 import BarChart from "./BarChart";
 import PieChart from "./PieChart";
 import { createNamespacedHelpers } from "vuex";
-const { mapActions, mapState } = createNamespacedHelpers("recipes");
+const { mapActions, mapState, mapMutations } = createNamespacedHelpers(
+  "recipes"
+);
 export default {
   name: "RecipesAspectCom",
   components: {
@@ -96,8 +98,10 @@ export default {
     handleOnSave() {
       this.saveRecipes({
         callback: (query) => {
-          console.log(query);
-          this.$router.replace({ path: "/recipes/build", query });
+          // console.log(query);
+          this.$router.replace({
+            path: "/recipes/build/" + query.name + "/" + query.planId,
+          });
         },
       });
     },
@@ -105,9 +109,10 @@ export default {
       this.updateReviewStatus({ reviewStatus });
     },
     handleOnBack() {
-      this.updateReviewStatus({ recipesData: [] });
+      this.updateStateData({ recipesData: [] });
     },
     ...mapActions(["saveRecipes", "updateReviewStatus"]),
+    ...mapMutations(["updateStateData"]),
   },
 };
 </script>

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

@@ -430,6 +430,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.cusId = 0;
           if (this.form.id != null) {
             updateRecipesTemplate(this.form).then((response) => {
               if (response.code === 200) {