diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index a386f35c0..ab5a41633 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -171,7 +171,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { } //判断是否提成单,拆分单中的副单,体验单,定金单 if (sysOrder.getAfterSaleCommissOrder().intValue() == 1 || ("1".equals(sysOrder.getOrderType()) && sysOrder.getMainOrderId().intValue() != 0) || - "2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) { +// "2".equals(sysOrder.getOrderType()) || // 体验单也需要生成计划 2021.05.29 + "1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) { System.out.println("---------------------" + sysOrder.getOrderId() + "不生成食谱------------------------"); continue; } diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue index 682a58ccd..45498bca8 100644 --- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue +++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue @@ -70,7 +70,7 @@ {{ `第${scope.row.startNumDay} 至 ${scope.row.endNumDay}天` }} - +