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

处理暂停日期

Browse Source
This commit is contained in:
huangdeliang 2021-03-29 19:42:00 +08:00
parent 6fe95722e2
commit 8f94c50d22
6 changed files with 116 additions and 55 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/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);

51
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,23 +77,46 @@ export default {
data: {},
},
menuData: [],
pauseDays: [],
};
},
created() {
async created() {
//
this.init();
//
getRecipesPlans(this.id).then((response) => {
if (response.code === 200) {
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");
}
return arr;
}, []);
// console.log(this.pauseDays);
}
const plansRes = await getRecipesPlans(this.id);
if (plansRes.code === 200) {
let curPlanId, curMenuId, curDate;
const toDay = dayjs().format("YYYY-MM-DD");
this.planList = response.data.reduce((arr, plan) => {
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, idx) => {
const date = dayjs(plan.startDate)
.add(idx, "day")
.format("YYYY-MM-DD");
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;
@ -125,15 +149,14 @@ export default {
this.fetchRecipesInfo(this.curMenuId);
}
});
getHealthyInfo(this.id).then((response) => {
if (response.code === 200) {
const healthyRes = await getHealthyInfo(this.id);
if (healthyRes.code === 200) {
this.healthyData = {
type: response.data.type,
data: dealHealthy(response.data.customerHealthy),
type: healthyRes.data.type,
data: dealHealthy(healthyRes.data.customerHealthy),
};
}
});
},
methods: {
handleOnPlanClick() {