Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!181 处理暂停日期

Browse Source 
Merge pull request !181 from 德仔/develop
This commit is contained in:
德仔 2021-03-29 19:43:17 +08:00 committed by Gitee
commit 57c5470a23
10 changed files with 216 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWapController.java
View File

@ -2,6 +2,8 @@ package com.stdiet.web.controller.custom;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.custom.domain.SysOrderPause;
import com.stdiet.custom.service.ISysOrderPauseService;
import com.stdiet.custom.service.ISysRecipesService;
import com.stdiet.custom.service.ISysWapServices;
import com.stdiet.system.service.ISysDictTypeService;
@ -11,9 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@RestController
@RequestMapping("/wap")
@ -27,6 +27,9 @@ public class SysWapController extends BaseController {
@Autowired
ISysDictTypeService iSysDictTypeService;
@Autowired
ISysOrderPauseService iSysOrderPauseService;
/**
* 客户食谱详情
*
@ -38,6 +41,17 @@ public class SysWapController extends BaseController {
return AjaxResult.success(iSysWapServices.getRecipesPlanListInfo(outId));
}
@GetMapping(value = "/recipes/plan/pause/{outId}")
public AjaxResult planPauses(@PathVariable String outId) {
SysOrderPause sysOrderPause = new SysOrderPause();
sysOrderPause.setOutId(outId);
List<SysOrderPause> list = iSysOrderPauseService.selectSysOrderPauseList(sysOrderPause);
for (SysOrderPause pause : list) {
pause.setCusId(null);
}
return AjaxResult.success(list);
}
/**
* 获取用户信息
*

2
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java
View File

@ -1,6 +1,7 @@
package com.stdiet.custom.domain;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import lombok.Data;
@ -224,6 +225,7 @@ public class SysCustomerPhysicalSigns {
private JSONArray avoidFood;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date createTime;
private Date updateTime;

2
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java
View File

@ -29,6 +29,8 @@ public class SysOrderPause {
private Long cusId;
private String outId;
/**
* 服务暂停开始时间
*/

7
stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml
View File

@ -8,6 +8,7 @@
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="cusId" column="cus_id"/>
<result property="outId" column="out_id"/>
<result property="pauseStartDate" column="pause_start_date"/>
<result property="pauseEndDate" column="pause_end_date"/>
<result property="reason" column="reason"/>
@ -24,7 +25,7 @@
</sql>
<sql id="selectSysOrderPauseVo">
select id, order_id, cus_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
select id, order_id, cus_id, out_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
</sql>
<select id="selectSysOrderPauseList" parameterType="SysOrderPause" resultMap="SysOrderPauseResult">
@ -36,6 +37,7 @@
where sop.del_flag = 0
<if test="orderId != null ">and sop.order_id = #{orderId}</if>
<if test="cusId != null ">and sop.cus_id = #{cusId}</if>
<if test="outId != null ">and sop.out_id = #{outId}</if>
<if test="pauseStartDate != null ">and sop.pause_start_date = #{pauseStartDate}</if>
<if test="pauseEndDate != null ">and sop.pause_end_date = #{pauseEndDate}</if>
<if test="reason != null and reason != ''">and sop.reason = #{reason}</if>
@ -52,6 +54,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
<if test="cusId != null">cus_id,</if>
<if test="cusId != null">out_id,</if>
<if test="pauseStartDate != null">pause_start_date,</if>
<if test="pauseEndDate != null">pause_end_date,</if>
<if test="reason != null">reason,</if>
@ -65,6 +68,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
<if test="cusId != null">#{cusId},</if>
<if test="cusId != null">md5(#{cusId}),</if>
<if test="pauseStartDate != null">#{pauseStartDate},</if>
<if test="pauseEndDate != null">#{pauseEndDate},</if>
<if test="reason != null">#{reason},</if>
@ -82,6 +86,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="cusId != null">cus_id = #{cusId},</if>
<if test="outId != null">out_id = #{outId},</if>
<if test="pauseStartDate != null">pause_start_date = #{pauseStartDate},</if>
<if test="pauseEndDate != null">pause_end_date = #{pauseEndDate},</if>
<if test="reason != null">reason = #{reason},</if>

11
stdiet-ui/src/api/custom/recipesShow.js
View File

@ -49,3 +49,14 @@ export function getRecipesFullInfo(id) {
}
});
}
export function getPlanPause(id) {
return request({
url: "/wap/recipes/plan/pause/" + id,
method: "get",
headers: {
isToken: false
}
});
}

10
stdiet-ui/src/components/OrderDrawer/index.vue
View File

@ -166,14 +166,13 @@ export default {
fetchOrderList() {
this.loading = true;
listOrder({ cusId: this.data.id }).then((res) => {
this.orderList = res.rows.reduce((arr, cur) => {
this.orderList = res.rows.reduce((arr, cur, idx) => {
const tarOrder = arr.find((ord) => ord.startTime === cur.startTime);
if (tarOrder) {
if (!tarOrder.children) {
const firstObj = JSON.parse(JSON.stringify(tarOrder));
tarOrder.children = [{ ...firstObj, type: "main" }];
}
tarOrder.amount += cur.afterSaleCommissOrder == 0 ? cur.amount : 0;
tarOrder.orderId += cur.orderId;
tarOrder.type = "virtual";
tarOrder.children.push({ ...cur, type: "main" });
@ -181,6 +180,13 @@ export default {
cur.type = "main";
arr.push(cur);
}
if (idx === res.rows.length - 1 && arr.children) {
arr.forEach((obj) => {
obj.amount = arr.children.reduce((a, c) => {
return a + c.afterSaleCommissOrder === 0 ? c.amount : 0;
}, 0);
});
}
return arr;
}, []);
// console.log(this.orderList);

78
stdiet-ui/src/components/PhysicalSignsDialog/index.vue
View File

@ -16,22 +16,21 @@
<el-button
type="info"
v-show="dataType == 0"
@click="generateReport()"
@click="generateReport"
plain
>下载报告</el-button
>
<el-button
type="info"
v-show="dataType == 0"
@click="handleEditGuidanceClick()"
@click="handleEditGuidanceClick"
plain
>减脂指导</el-button
>
<el-button
v-hasPermi="['custom:healthy:edit']"
type="info"
v-show="dataType == 0"
@click="handleEditRemarkClick()"
@click="handleEditRemarkClick"
plain
>修改备注</el-button
>
@ -39,14 +38,14 @@
v-hasPermi="['custom:healthy:edit']"
type="warning"
v-show="dataType == 0"
@click="handleEditHealthyClick()"
@click="handleEditHealthyClick"
plain
>修改信息</el-button
>
<el-button
type="danger"
v-hasPermi="['custom:healthy:remove']"
@click="handleDelete()"
@click="handleDelete"
plain
>删除信息</el-button
>
@ -177,28 +176,39 @@
</div>
</div>
<!-- 客户体征 -->
<div v-else>
<table-detail-message
v-show="dataList.length > 0"
:data="dataList"
></table-detail-message>
<div
v-show="dataList.length == 0"
style="font-size: 20px; text-align: center"
<div v-else-if="dataList.length > 0 && dataType === 1">
<table-detail-message v-show="dataList.length > 0" :data="dataList" />
<!-- 备注 -->
<el-table
:data="remarkList"
:show-header="false"
border
:cell-style="remarkColumnStyle"
style="width: 100%"
>
<VueQr :text="copyValue" :logoSrc="logo" :size="256" />
<div style="text-align: center; margin-top: 20px">
<el-button
icon="el-icon-share"
size="small"
title="点击复制链接"
class="copyBtn"
type="primary"
:data-clipboard-text="copyValue"
@click="handleCopy()"
>健康评估表链接
</el-button>
</div>
<el-table-column width="140" prop="remarkTitle"> </el-table-column>
<el-table-column prop="remarkValue">
<template slot-scope="scope">
<auto-hide-message
:data="scope.row.remarkValue"
:maxLength="100"
/></template>
</el-table-column>
</el-table>
</div>
<div v-else style="font-size: 20px; text-align: center">
<VueQr :text="copyValue" :logoSrc="logo" :size="256" />
<div style="text-align: center; margin-top: 20px">
<el-button
icon="el-icon-share"
size="small"
title="点击复制链接"
class="copyBtn"
type="primary"
:data-clipboard-text="copyValue"
@click="handleCopy()"
>健康评估表链接
</el-button>
</div>
</div>
</div>
@ -207,19 +217,19 @@
<physicalSigns-guidance
ref="physicalSignsGuidanceDialog"
@close="editGuidanceShow(false)"
@refreshHealthyData="getCustomerHealthyByCusId()"
@refreshHealthyData="getCustomerHealthyByCusId"
></physicalSigns-guidance>
</div>
</div>
<!-- 编辑 -->
<physicalSigns-edit
ref="physicalSignsEditDialog"
@refreshHealthyData="getCustomerHealthyByCusId()"
@refreshHealthyData="getCustomerHealthyByCusId"
></physicalSigns-edit>
<!-- 编辑备注 -->
<physicalSigns-remark
ref="physicalSignsRemarkDialog"
@refreshHealthyData="getCustomerHealthyByCusId()"
@refreshHealthyData="getCustomerHealthyByCusId"
></physicalSigns-remark>
</el-dialog>
</template>
@ -433,9 +443,10 @@ export default {
if (res.data.customerHealthy) {
//判断是体征还是健康评估
this.dataType = res.data.type;
this.healthyData = res.data.customerHealthy;
this.dataList = [];
this.remarkList[0].remarkValue = this.healthyData.remark;
if (this.dataType == 0) {
this.healthyData = Object.assign({}, res.data.customerHealthy);
this.remarkList[0].remarkValue = this.healthyData.remark;
this.guidanceList[0].guidanceValue = this.healthyData.guidance;
this.getDataListByHealthyMessage(res.data.customerHealthy);
} else {
@ -847,7 +858,8 @@ export default {
handleEditRemarkClick() {
this.$refs["physicalSignsRemarkDialog"].showDialog(
this.data,
this.healthyData
this.healthyData,
this.dataType
);
},
handleEditGuidanceClick() {

90
stdiet-ui/src/components/PhysicalSignsRemark/index.vue
View File

@ -1,49 +1,61 @@
<template>
<el-dialog :visible.sync="visible" :title="title" width="500px" append-to-body @closed="onClosed">
<el-form ref="form" :model="form" :rules="rules" label-position="top" label-width="100px">
<el-form-item label="" prop="remark" >
<el-dialog
:visible.sync="visible"
:title="title"
width="500px"
append-to-body
@closed="onClosed"
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-position="top"
label-width="100px"
>
<el-form-item label="" prop="remark">
<el-input
type="textarea"
:rows="6"
maxlength="300"
show-word-limit
placeholder="请输入备注"
v-model="form.remark">
v-model="form.remark"
>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit()">确 定</el-button>
<el-button @click="onClosed()">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="onClosed">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getCustomerPhysicalSignsByCusId } from "@/api/custom/customer";
import { updateHealthy } from "@/api/custom/healthy";
import { editPhysicalSigns } from "@/api/custom/healthy";
export default {
name: "PhysicalSignsRemark",
components: {
},
components: {},
data() {
return {
visible: false,
title: "",
data: undefined,
type: 0,
form: {
id: null,
remark: null
remark: null,
},
rules: {
}
rules: {},
};
},
methods: {
showDialog(data, healthy) {
showDialog(data, healthy, type) {
console.log(healthy)
this.data = data;
this.title = "修改"+`「${data.name}」`+"备注";
this.type = type;
this.title = "修改" + `「${data.name}」` + "备注";
this.form.id = healthy.id;
this.form.remark = healthy.remark;
this.visible = true;
@ -52,37 +64,39 @@ export default {
this.visible = false;
this.data = null;
},
submit(){
submit() {
this.$refs.form.validate((valid) => {
if (valid) {
this.editCustomerHealthy();
} else {
this.$message({message: "数据未填写完整", type: "warning"});
this.$message({ message: "数据未填写完整", type: "warning" });
}
});
},
editCustomerHealthy(){
updateHealthy(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.onClosed();
this.$emit('refreshHealthyData');
}
}).catch(function() {
console.log("error");
});
}
}
editCustomerHealthy() {
(this.type === 0 ? updateHealthy : editPhysicalSigns)(this.form)
.then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.onClosed();
this.$emit("refreshHealthyData");
}
})
.catch(function () {
console.log("error");
});
},
},
};
</script>
<style scoped>
.margin-top-20{
margin-top:20px;
}
.p_title_1{
font-size: 18px;
font-weight: bold;
margin-top: 20px;
}
.margin-top-20 {
margin-top: 20px;
}
.p_title_1 {
font-size: 18px;
font-weight: bold;
margin-top: 20px;
}
</style>

4
stdiet-ui/src/views/custom/customer/index.vue
View File

@ -74,9 +74,7 @@
<el-button type="cyan" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>

121
stdiet-ui/src/views/custom/recipesShow/index.vue
View File

@ -39,6 +39,7 @@ import {
getRecipesPlans,
getHealthyInfo,
getRecipesMenuInfoApi,
getPlanPause,
} from "@/api/custom/recipesShow";
import { dealHealthy } from "@/utils/healthyData";
import UserInfoDrawer from "./UserInfoDrawer";
@ -76,64 +77,86 @@ export default {
data: {},
},
menuData: [],
pauseDays: [],
};
},
created() {
async created() {
//
this.init();
//
getRecipesPlans(this.id).then((response) => {
if (response.code === 200) {
let curPlanId, curMenuId, curDate;
const toDay = dayjs().format("YYYY-MM-DD");
this.planList = response.data.reduce((arr, plan) => {
if (plan.menus) {
arr.push({
menus: plan.menus.map((menu, idx) => {
const date = dayjs(plan.startDate)
.add(idx, "day")
.format("YYYY-MM-DD");
if (toDay === date) {
curPlanId = plan.id;
curMenuId = menu.id;
curDate = date;
}
return {
date,
id: menu.id,
};
}),
recipesId: plan.recipesId,
label: `第${plan.startNumDay} 至 ${plan.endNumDay}天`,
id: plan.id,
});
}
return arr;
}, []);
if (!curMenuId) {
curMenuId = this.planList[0].menus[0].id;
curPlanId = this.planList[0].id;
curDate = this.planList[0].menus[0].date;
const planPauseRes = await getPlanPause(this.id);
// console.log(planPauseRes.data);
if (planPauseRes.code === 200) {
this.pauseDays = planPauseRes.data.reduce((arr, cur) => {
let startDate = cur.pauseStartDate;
while (dayjs(startDate) <= dayjs(cur.pauseEndDate)) {
arr.push(startDate);
startDate = dayjs(startDate).add(1, "days").format("YYYY-MM-DD");
}
this.curMenuId = curMenuId;
this.curPlanId = curPlanId;
this.curDate = curDate;
return arr;
}, []);
// console.log(this.pauseDays);
}
// console.log({
// planList: this.planList,
// });
const plansRes = await getRecipesPlans(this.id);
this.fetchRecipesInfo(this.curMenuId);
if (plansRes.code === 200) {
let curPlanId, curMenuId, curDate;
const toDay = dayjs().format("YYYY-MM-DD");
this.planList = plansRes.data.reduce((arr, plan) => {
if (plan.menus) {
let tmpDate = dayjs(plan.startDate).subtract(1, "days");
arr.push({
menus: plan.menus.map((menu) => {
tmpDate = tmpDate.add(1, "days");
// 跳过暂停日子
while (
this.pauseDays.includes(tmpDate.clone().format("YYYY-MM-DD"))
) {
tmpDate = tmpDate.add(1, "days");
}
const date = tmpDate.format("YYYY-MM-DD");
if (toDay === date) {
curPlanId = plan.id;
curMenuId = menu.id;
curDate = date;
}
return {
date,
id: menu.id,
};
}),
recipesId: plan.recipesId,
label: `第${plan.startNumDay} 至 ${plan.endNumDay}天`,
id: plan.id,
});
}
return arr;
}, []);
if (!curMenuId) {
curMenuId = this.planList[0].menus[0].id;
curPlanId = this.planList[0].id;
curDate = this.planList[0].menus[0].date;
}
});
getHealthyInfo(this.id).then((response) => {
if (response.code === 200) {
this.healthyData = {
type: response.data.type,
data: dealHealthy(response.data.customerHealthy),
};
}
});
this.curMenuId = curMenuId;
this.curPlanId = curPlanId;
this.curDate = curDate;
// console.log({
// planList: this.planList,
// });
this.fetchRecipesInfo(this.curMenuId);
}
const healthyRes = await getHealthyInfo(this.id);
if (healthyRes.code === 200) {
this.healthyData = {
type: healthyRes.data.type,
data: dealHealthy(healthyRes.data.customerHealthy),
};
}
},
methods: {
handleOnPlanClick() {