commit
740cbc4d5c
stdiet-custom/src/main/java/com/stdiet/custom/service/impl
stdiet-ui/src
@ -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);
|
||||
}
|
||||
|
||||
@ -128,47 +117,47 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
|
||||
*/
|
||||
@Override
|
||||
@Async
|
||||
public void regenerateRecipesPlan(Long orderId){
|
||||
if(orderId == null || orderId <= 0){
|
||||
public void regenerateRecipesPlan(Long orderId) {
|
||||
if (orderId == null || orderId <= 0) {
|
||||
return;
|
||||
}
|
||||
SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId);
|
||||
//订单为空、金额小于0不进行食谱生成、更新,只对2021年开始的订单进行食谱计划生成
|
||||
if(sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021){
|
||||
if (sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021) {
|
||||
return;
|
||||
}
|
||||
System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear());
|
||||
try{
|
||||
// System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear());
|
||||
try {
|
||||
//获取redis中该订单对应的锁
|
||||
if(synchrolockUtil.lock(String.format(generateRecipesPlanLockKey, orderId))){
|
||||
if (synchrolockUtil.lock(String.format(generateRecipesPlanLockKey, orderId))) {
|
||||
SysRecipesPlan queryParam = new SysRecipesPlan();
|
||||
queryParam.setOrderId(orderId);
|
||||
List<SysRecipesPlan> oldRecipesPlanList = sysRecipesPlanMapper.selectSysRecipesPlanList(queryParam);
|
||||
//判断是否已存在食谱
|
||||
if(oldRecipesPlanList != null && oldRecipesPlanList.size() > 0){
|
||||
if (oldRecipesPlanList != null && oldRecipesPlanList.size() > 0) {
|
||||
Long[] orderIdArray = new Long[1];
|
||||
orderIdArray[0] = orderId;
|
||||
//删除该订单对于食谱
|
||||
delRecipesPlanByOrderId(orderIdArray);
|
||||
}
|
||||
//判断订单金额、开始时间、结束时间,为空则直接返回,不重新生成食谱计划
|
||||
if(sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null){
|
||||
if (sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null) {
|
||||
return;
|
||||
}
|
||||
SysOrderPause pauseParam = new SysOrderPause();
|
||||
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);
|
||||
if(planList != null && planList.size() > 0){
|
||||
List<SysRecipesPlan> planList = generatePlan(sysOrder, oldRecipesPlanList,
|
||||
DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()), pauseList);
|
||||
if (planList != null && planList.size() > 0) {
|
||||
sysRecipesPlanMapper.insertBatch(planList);
|
||||
}
|
||||
/*for (SysRecipesPlan sysRecipesPlan : planList) {
|
||||
getTestDate(sysRecipesPlan.getStartDate(), sysRecipesPlan.getEndDate());
|
||||
}*/
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
// 一定要释放锁
|
||||
@ -176,32 +165,34 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
|
||||
}
|
||||
}
|
||||
|
||||
public void getTestDate(Date date, Date date2){
|
||||
public void getTestDate(Date date, Date date2) {
|
||||
LocalDate d = DateUtils.dateToLocalDate(date);
|
||||
LocalDate d2 = DateUtils.dateToLocalDate(date2);
|
||||
String s1 = d.getYear() +"-" + d.getMonthValue() + "-" + d.getDayOfMonth();
|
||||
String s2 = d2.getYear() +"-" + d2.getMonthValue() + "-" + d2.getDayOfMonth();
|
||||
LocalDate d2 = DateUtils.dateToLocalDate(date2);
|
||||
String s1 = d.getYear() + "-" + d.getMonthValue() + "-" + d.getDayOfMonth();
|
||||
String s2 = d2.getYear() + "-" + d2.getMonthValue() + "-" + d2.getDayOfMonth();
|
||||
System.out.println(s1 + " " + s2);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单ID、订单开始服务时间、结束时间、暂停列表生成食谱计划列表
|
||||
* @param orderId 订单ID
|
||||
*
|
||||
* @param sysOrder 订单对象
|
||||
* @param oldRecipesPlanList 旧的食谱计划
|
||||
* @param serverStartDate 服务开始时间
|
||||
* @param serverEndDate 服务结束时间
|
||||
* @param pauseList 暂停列表
|
||||
* @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;
|
||||
LocalDate planEndDate = planStartDate.plusDays(6);
|
||||
while (true){
|
||||
while (true) {
|
||||
SysRecipesPlan sysRecipesPlan = new SysRecipesPlan();
|
||||
//判断是否大于服务到期时间
|
||||
if(ChronoUnit.DAYS.between(planEndDate, serverEndDate) <= 0){
|
||||
if (ChronoUnit.DAYS.between(planEndDate, serverEndDate) <= 0) {
|
||||
planEndDate = serverEndDate;
|
||||
breakFlag = true;
|
||||
}
|
||||
@ -210,14 +201,15 @@ 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);
|
||||
sysRecipesPlan.setSendTime(DateUtils.localDateToDate(LocalDate.now().minusDays(1)));
|
||||
}*/
|
||||
//将旧食谱计划中的发送状态、发送时间、食谱复制到新食谱计划中
|
||||
boolean existFlag =oldRecipesPlanList.size() >= planList.size()+1;
|
||||
boolean existFlag = oldRecipesPlanList.size() >= planList.size() + 1;
|
||||
sysRecipesPlan.setSendFlag(existFlag ? oldRecipesPlanList.get(planList.size()).getSendFlag() : 0);
|
||||
sysRecipesPlan.setSendTime(existFlag ? oldRecipesPlanList.get(planList.size()).getSendTime() : null);
|
||||
sysRecipesPlan.setRecipesId(existFlag ? oldRecipesPlanList.get(planList.size()).getRecipesId() : null);
|
||||
@ -227,7 +219,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
|
||||
planStartDate = planEndDate.plusDays(1);
|
||||
planEndDate = planStartDate.plusDays(6);
|
||||
|
||||
if(breakFlag){
|
||||
if (breakFlag) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -236,25 +228,26 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
|
||||
|
||||
/**
|
||||
* 根据食谱开始时间、结束时间、暂停列表获取在食谱计划范围内的暂停天数
|
||||
*
|
||||
* @param planStartDate 计划开始时间
|
||||
* @param planEndDate 计划结束时间
|
||||
* @param pauseList 暂停列表
|
||||
* @param planEndDate 计划结束时间
|
||||
* @param pauseList 暂停列表
|
||||
* @return
|
||||
*/
|
||||
public long getPauseDayeCount(LocalDate planStartDate, LocalDate planEndDate, List<SysOrderPause> pauseList){
|
||||
public long getPauseDayeCount(LocalDate planStartDate, LocalDate planEndDate, List<SysOrderPause> pauseList) {
|
||||
long pauseDay = 0;
|
||||
//判断这个时间内是否存在暂停
|
||||
if(pauseList != null && pauseList.size() > 0){
|
||||
for(SysOrderPause sysOrderPause : pauseList){
|
||||
if (pauseList != null && pauseList.size() > 0) {
|
||||
for (SysOrderPause sysOrderPause : pauseList) {
|
||||
LocalDate pauseStartDate = DateUtils.dateToLocalDate(sysOrderPause.getPauseStartDate());
|
||||
LocalDate pauseEndDate = DateUtils.dateToLocalDate(sysOrderPause.getPauseEndDate());
|
||||
if(ChronoUnit.DAYS.between(pauseEndDate, planStartDate) > 0 || ChronoUnit.DAYS.between(planEndDate, pauseStartDate) > 0){
|
||||
if (ChronoUnit.DAYS.between(pauseEndDate, planStartDate) > 0 || ChronoUnit.DAYS.between(planEndDate, pauseStartDate) > 0) {
|
||||
continue;
|
||||
}
|
||||
if(ChronoUnit.DAYS.between(pauseStartDate, planStartDate) > 0){
|
||||
if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) > 0) {
|
||||
pauseStartDate = planStartDate;
|
||||
}
|
||||
if(ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0){
|
||||
if (ChronoUnit.DAYS.between(planEndDate, pauseEndDate) > 0) {
|
||||
pauseEndDate = planEndDate;
|
||||
}
|
||||
pauseDay += ChronoUnit.DAYS.between(pauseStartDate, pauseEndDate);
|
||||
@ -265,31 +258,34 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService
|
||||
|
||||
/**
|
||||
* 根据订单ID删除所有食谱安排计划
|
||||
*
|
||||
* @param orderIds 订单ID
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public int delRecipesPlanByOrderId(Long[] orderIds){
|
||||
public int delRecipesPlanByOrderId(Long[] orderIds) {
|
||||
return sysRecipesPlanMapper.delRecipesPlanByOrderId(orderIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 多条件查询食谱计划列表
|
||||
*
|
||||
* @param sysRecipesPlan
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<SysRecipesPlan> selectPlanListByCondition(SysRecipesPlan sysRecipesPlan){
|
||||
public List<SysRecipesPlan> selectPlanListByCondition(SysRecipesPlan sysRecipesPlan) {
|
||||
return sysRecipesPlanMapper.selectPlanListByCondition(sysRecipesPlan);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据订单ID查询食谱计划
|
||||
*
|
||||
* @param sysRecipesPlan
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<SysRecipesPlan> selectPlanListByOrderId(SysRecipesPlan sysRecipesPlan){
|
||||
public List<SysRecipesPlan> selectPlanListByOrderId(SysRecipesPlan sysRecipesPlan) {
|
||||
return sysRecipesPlanMapper.selectPlanListByOrderId(sysRecipesPlan);
|
||||
}
|
||||
}
|
@ -5,7 +5,15 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'App'
|
||||
}
|
||||
import { createNamespacedHelpers } from "vuex";
|
||||
const { mapActions } = createNamespacedHelpers("global");
|
||||
export default {
|
||||
name: "App",
|
||||
created() {
|
||||
this.init();
|
||||
},
|
||||
methods: {
|
||||
...mapActions(["init"]),
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@ -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
|
||||
});
|
||||
|
62
stdiet-ui/src/store/modules/global.js
Normal file
62
stdiet-ui/src/store/modules/global.js
Normal file
@ -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
|
||||
};
|
@ -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) {
|
||||
|
@ -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="carbonRatio" label="碳水/100g" align="center" />
|
||||
<el-table-column prop="fatRatio" label="F/100g" align="center" />
|
||||
<el-table-column prop="carbonRatio" label="C/100g" align="center" />
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
<el-form-item label="推荐人群">
|
||||
|
@ -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);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
@ -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>
|
||||
|
@ -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="食谱计划表"
|
||||
v-if="allRecipesPlanOpen"
|
||||
:title="allRecipesPlanTitle"
|
||||
: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 BodySignDetail from "@/components/BodySignDetail";
|
||||
// import OrderDetail from "@/components/OrderDetail";
|
||||
// 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,
|
||||
body_sign_dialog: BodySignDetail,
|
||||
// "order-dialog": OrderDetail,
|
||||
// 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;
|
||||
});
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user