From f92e07f1edf6fe600183364f1c7e6bb0c71db323 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Mon, 1 Mar 2021 19:00:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=81=E6=8F=90=E6=88=90=E5=88=86=E4=B8=BA=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=81=E6=9C=AA=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCommisionController.java | 1 + .../controller/custom/SysOrderController.java | 17 ++++ .../stdiet/custom/domain/SysCommision.java | 86 +------------------ .../com/stdiet/custom/domain/SysOrder.java | 4 + .../custom/dto/request/SysOrderCommision.java | 25 ++++++ .../custom/mapper/SysCommisionMapper.java | 8 +- .../stdiet/custom/mapper/SysOrderMapper.java | 3 +- .../custom/service/ISysCommisionService.java | 2 - .../service/ISysCommissionDayService.java | 1 + .../service/impl/SysCommisionServiceImpl.java | 5 -- .../impl/SysCommissionDayServiceImpl.java | 3 +- .../com/stdiet/custom/utils/OrderUtils.java | 10 +++ .../mapper/custom/SysCommisionMapper.xml | 15 +++- .../mapper/custom/SysOrderMapper.xml | 27 +++++- stdiet-ui/src/components/OrderAdd/index.vue | 2 +- stdiet-ui/src/components/OrderEdit/index.vue | 2 +- stdiet-ui/src/utils/orderType.js | 2 +- .../views/custom/commision/detail/index.vue | 21 +++++ .../custom/commision/detail_day/index.vue | 21 +++++ stdiet-ui/src/views/custom/customer/index.vue | 8 +- stdiet-ui/src/views/custom/order/index.vue | 51 +++++++++-- 21 files changed, 207 insertions(+), 107 deletions(-) create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java index defba24c1..c7fd11182 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java @@ -5,6 +5,7 @@ import java.math.RoundingMode; import java.util.List; import com.stdiet.custom.domain.SysCommissionDayDetail; +import com.stdiet.custom.dto.request.SysOrderCommision; import com.stdiet.custom.service.ISysCommissionDayService; import com.stdiet.framework.web.domain.server.Sys; import com.stdiet.system.domain.CusSalesman; diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java index de7b68781..8bf63065d 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java @@ -1,5 +1,6 @@ package com.stdiet.web.controller.custom; +import com.alibaba.fastjson.JSONArray; import com.stdiet.common.annotation.Log; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.domain.entity.SysUser; @@ -19,6 +20,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.net.URLDecoder; import java.time.temporal.ChronoUnit; import java.util.List; @@ -47,6 +49,7 @@ public class SysOrderController extends OrderBaseController { @GetMapping("/list") public OrderTableDataInfo list(SysOrder sysOrder) { startPage(); + dealOrderType(sysOrder); List list = sysOrderService.selectSysOrderList(sysOrder); List userList = userService.selectAllUser(); BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder); @@ -68,6 +71,20 @@ public class SysOrderController extends OrderBaseController { return getOrderDataTable(list, totalAmount); } + /** + * 处理订单类型 + * @param sysOrder + */ + private void dealOrderType(SysOrder sysOrder) { + if(StringUtils.isNotEmpty(sysOrder.getOrderType())){ + try { + JSONArray array = JSONArray.parseArray(URLDecoder.decode(sysOrder.getOrderType(),"UTF-8")); + sysOrder.setSearchOrderTypeArray(array.size() > 0 ? array : null); + }catch (Exception e){ + e.printStackTrace(); + } + } + } /** * 导出销售订单列表 diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java index 3fa6a8c45..a1fe6f18a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java @@ -1,5 +1,6 @@ package com.stdiet.custom.domain; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.stdiet.common.annotation.Excel; @@ -13,6 +14,7 @@ import java.math.BigDecimal; * @author wonder * @date 2020-09-24 */ +@Data public class SysCommision extends BaseEntity { private static final long serialVersionUID = 1L; @@ -58,86 +60,6 @@ public class SysCommision extends BaseEntity { @Excel(name = "提成", scale = 2) private BigDecimal commision; - public BigDecimal getCommision() { - return commision; - } - - public void setCommision(BigDecimal commision) { - this.commision = commision; - } - - public Long getPostId() { - return postId; - } - - public void setPostId(Long postId) { - this.postId = postId; - } - - public void setPostName(String postName) { - this.postName = postName; - } - - public String getPostName() { - return postName; - } - - public void setRuleId(Long ruleId) { - this.ruleId = ruleId; - } - - public Long getRuleId() { - return ruleId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getUserId() { - return userId; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getUserName() { - return userName; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setRate(Float rate) { - this.rate = rate; - } - - public Float getRate() { - return rate; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("ruleId", getRuleId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("postId", getPostId()) - .append("postName", getPostName()) - .append("amount", getAmount()) - .append("commision", getCommision()) - .append("rate", getRate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + //订单审核状态 + private String reviewStatus; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java index 797c799d0..07534dbd4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import com.stdiet.common.annotation.Excel; @@ -269,6 +270,9 @@ public class SysOrder extends BaseEntity { //拆分比例，如：1,9就是按照比例10%、90%拆分，非持久化字段 private String nutritionistRate; + //订单查询时的订单类型二维数组 + private JSONArray searchOrderTypeArray; + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java new file mode 100644 index 000000000..c29ad458c --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java @@ -0,0 +1,25 @@ +package com.stdiet.custom.dto.request; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class SysOrderCommision implements Serializable { + + private static final long serialVersionUID = 1L; + + //后台用户ID + private Long userId; + + //岗位ID + private Long postId; + + //订单审核状态 + private String reviewStatus; + + //订单截止结束时间 + private String endTime; + +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java index cca1dbfc3..d2b211970 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java @@ -2,6 +2,7 @@ package com.stdiet.custom.mapper; import java.util.List; import com.stdiet.custom.domain.SysCommision; +import com.stdiet.custom.dto.request.SysOrderCommision; /** * 业务提成比例Mapper接口 @@ -61,5 +62,10 @@ public interface SysCommisionMapper public List selectSysCommisionDetail(SysCommision sysCommision); - List selectSysCommisionDayDetail(SysCommision sysCommision); + /** + * 查询售后、营养师用户信息 + * @param sysCommision + * @return + */ + List getAfterSaleAndNutri(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java index 3782af713..e23a0259e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java @@ -6,6 +6,7 @@ import java.util.List; import com.stdiet.custom.domain.SysCommision; import com.stdiet.custom.domain.SysCommissionDayDetail; import com.stdiet.custom.domain.SysOrder; +import com.stdiet.custom.dto.request.SysOrderCommision; import org.apache.ibatis.annotations.Param; /** @@ -72,7 +73,7 @@ public interface SysOrderMapper public BigDecimal selectAllOrderAmount(SysOrder sysOrder); /** - * 获取订单信息 + * 获取订单信息（按天提成计算） * @return */ List selectSimpleOrderMessage(SysCommision sysCommision); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java index e39a7ae56..2a121d1bb 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java @@ -62,6 +62,4 @@ public interface ISysCommisionService public int deleteSysCommisionById(Long ruleId); public List selectSysCommisionDetail(SysCommision sysCommision); - - List selectSysCommisionDayDetail(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java index e5b48559b..cb92b0c40 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java @@ -4,6 +4,7 @@ import com.stdiet.custom.domain.SysCommision; import com.stdiet.custom.domain.SysCommissionDayDetail; import com.stdiet.custom.domain.SysOrder; import com.stdiet.custom.domain.SysOrderCommisionDayDetail; +import com.stdiet.custom.dto.request.SysOrderCommision; import java.time.LocalDate; import java.util.Date; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java index b043f756e..8cfa7824e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java @@ -98,9 +98,4 @@ public class SysCommisionServiceImpl implements ISysCommisionService public List selectSysCommisionDetail(SysCommision sysCommision) { return sysCommisionMapper.selectSysCommisionDetail(sysCommision); } - - @Override - public List selectSysCommisionDayDetail(SysCommision sysCommision){ - return sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); - } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index 471ba092f..95cc237a1 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -3,6 +3,7 @@ package com.stdiet.custom.service.impl; import com.alibaba.fastjson.JSONArray; import com.stdiet.common.utils.DateUtils; import com.stdiet.custom.domain.*; +import com.stdiet.custom.dto.request.SysOrderCommision; import com.stdiet.custom.mapper.SysCommisionMapper; import com.stdiet.custom.mapper.SysOrderMapper; import com.stdiet.custom.mapper.SysOrderPauseMapper; @@ -32,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { public List calculateCommissionByDay(SysCommision sysCommision){ List result = new ArrayList<>(); //查询用户 - List list = sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); + List list = sysCommisionMapper.getAfterSaleAndNutri(sysCommision); //合计 SysCommissionDayDetail total = new SysCommissionDayDetail(); total.setTotalCommissionAmount(new BigDecimal(0)); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java b/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java index d536639ce..fe82b06f3 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java @@ -10,6 +10,8 @@ public class OrderUtils { private static final String[] orderMoneyTypeArray = {"全款单","定金单","尾款单"}; + private static final String[] orderMainTypeArray = {"主单","副单"}; + /** * 根据订单对象获取订单类型名称 * @param sysOrder @@ -18,8 +20,16 @@ public class OrderUtils { public static final String getOrderTypeName(SysOrder sysOrder){ String orderTypeName = ""; orderTypeName += orderTypeArray[Integer.parseInt(sysOrder.getOrderType())]; + //比例拆分单需要确认出主单副单 + /*if("1".equals(sysOrder.getOrderType())){ + orderTypeName += "("+(sysOrder.getMainOrderId().intValue() == 0 ? orderMainTypeArray[0] : orderMainTypeArray[1])+")"; + }*/ orderTypeName += "/"+orderCountTypeArray[Integer.parseInt(sysOrder.getOrderCountType())]; orderTypeName += "/"+orderMoneyTypeArray[Integer.parseInt(sysOrder.getOrderMoneyType())]; + //判断是不是二开提成单 + if("1".equals(sysOrder.getOrderCountType()) && sysOrder.getAfterSaleCommissOrder().intValue() == 1){ + orderTypeName += "/提成单"; + } return orderTypeName; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml index 7ba3957bd..b4b9eebe8 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml @@ -32,7 +32,9 @@ SELECT ${column} AS user_id, ${postId} AS post_id, SUM(amount) AS amount FROM sys_order WHERE ${column} IS NOT NULL AND ${column} <> 0 AND del_flag = 0 - AND review_status = 'yes' + + AND review_status = #{reviewStatus} + AND date_format(order_time,'%y%m%d') >= date_format(${beginTime},'%y%m%d') @@ -47,6 +49,7 @@ JOIN ( + @@ -54,6 +57,7 @@ UNION + @@ -61,6 +65,7 @@ UNION + @@ -68,6 +73,7 @@ UNION + @@ -75,6 +81,7 @@ UNION + @@ -82,6 +89,7 @@ UNION + @@ -89,6 +97,7 @@ UNION + @@ -96,6 +105,7 @@ UNION + @@ -188,7 +198,8 @@ - SELECT su.user_id,su.nick_name as user_name,sp.post_id, sp.post_code,sp.post_name FROM sys_user su LEFT JOIN sys_user_post sup ON sup.user_id = su.user_id LEFT JOIN sys_post sp ON sp.post_id = sup.post_id diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 04006ff8a..e2c08582a 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -103,6 +103,8 @@ and del_flag = 0 + + AND after_sale_commiss_order = 0 @@ -139,6 +141,26 @@ and 0 > amount + + + + ( + + + order_type = #{type} + + + order_count_type = #{type} + + + order_money_type = #{type} + + + ) + + + + and o.del_flag = 0 order by order_time desc @@ -365,7 +387,10 @@ from sys_order o left join sys_user su_sale on su_sale.user_id = o.after_sale_id and su_sale.del_flag = 0 left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id and su_nutritionist.del_flag = 0 - where review_status = 'yes' and o.order_time >= '2021-01-01' and o.del_flag = 0 + where o.order_time >= '2021-01-01' and o.del_flag = 0 + + and review_status = #{reviewStatus} + and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId}) diff --git a/stdiet-ui/src/components/OrderAdd/index.vue b/stdiet-ui/src/components/OrderAdd/index.vue index 6e2c4e562..5c1faa71e 100644 --- a/stdiet-ui/src/components/OrderAdd/index.vue +++ b/stdiet-ui/src/components/OrderAdd/index.vue @@ -37,7 +37,7 @@ - + diff --git a/stdiet-ui/src/components/OrderEdit/index.vue b/stdiet-ui/src/components/OrderEdit/index.vue index f4e34b65f..72849f5f8 100644 --- a/stdiet-ui/src/components/OrderEdit/index.vue +++ b/stdiet-ui/src/components/OrderEdit/index.vue @@ -16,7 +16,7 @@ - + diff --git a/stdiet-ui/src/utils/orderType.js b/stdiet-ui/src/utils/orderType.js index 0265c859f..9f40a0fb7 100644 --- a/stdiet-ui/src/utils/orderType.js +++ b/stdiet-ui/src/utils/orderType.js @@ -25,7 +25,7 @@ export const orderCountTypeArray = [ } ] -//订单类型 +//订单类型（订单新增） export const orderTypeArray = [ { value: 0, diff --git a/stdiet-ui/src/views/custom/commision/detail/index.vue b/stdiet-ui/src/views/custom/commision/detail/index.vue index 30d219235..3c9e56b93 100644 --- a/stdiet-ui/src/views/custom/commision/detail/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail/index.vue @@ -48,6 +48,21 @@ > + + + + + { + this.reviewStatusOptions = response.data; + }); }, methods: { /** 查询业务提成比例列表 */ diff --git a/stdiet-ui/src/views/custom/commision/detail_day/index.vue b/stdiet-ui/src/views/custom/commision/detail_day/index.vue index a4dd3ae47..af3232316 100644 --- a/stdiet-ui/src/views/custom/commision/detail_day/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail_day/index.vue @@ -48,6 +48,21 @@ > + + + + + { + this.reviewStatusOptions = response.data; + }); }, methods: { /** 查询业务提成比例列表 */ diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue index 9d05de70d..5fb52682d 100644 --- a/stdiet-ui/src/views/custom/customer/index.vue +++ b/stdiet-ui/src/views/custom/customer/index.vue @@ -9,7 +9,7 @@ > - + - + diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue index 997aeaecc..757d69d80 100644 --- a/stdiet-ui/src/views/custom/order/index.vue +++ b/stdiet-ui/src/views/custom/order/index.vue @@ -11,7 +11,7 @@ + + + + + 总计：{{ toThousands(this.totalAmount) }} 元总计收款（已除去二开售后提成金额）：{{ toThousands(this.totalAmount) }} 元 @@ -459,7 +472,7 @@ import { delOrder, exportOrder, listOrder } from "@/api/custom/order"; import dayjs from "dayjs"; import orderPause from "./orderPause"; - +import * as orderTypeData from "@/utils/orderType"; import OrderDetail from "@/components/OrderDetail"; import OrderEdit from "@/components/OrderEdit"; import AutoHideMessage from "@/components/AutoHideMessage"; @@ -510,6 +523,9 @@ export default { conditioningProjectIdOption: [], // 审核状态 reviewStatusOptions: [], + //订单类型 + orderTypeOptions: orderTypeData["orderTypeArray"], + orderTypeProps: { multiple: true,expandTrigger: 'click' },//,checkStrictly:true // 查询参数 queryParams: { pageNum: 1, @@ -531,6 +547,8 @@ export default { reviewStatus: null, serveTimeId: null, }, + //查询时选择的订单类型数组 + searchOrderTypeArray: null }; }, computed: { @@ -578,6 +596,9 @@ export default { /** 查询销售订单列表 */ getList() { this.loading = true; + this.queryParams.orderType = this.searchOrderTypeArray != null ? encodeURIComponent(JSON.stringify(this.searchOrderTypeArray)) : null; + console.log(this.queryParams.searchOrderTypeArray); + //this.dealOrderTypeArray(); listOrder(this.addDateRange(this.queryParams, this.daterange)).then( (response) => { this.orderList = response.rows; @@ -586,7 +607,27 @@ export default { this.totalAmount = response.totalAmount; } ); - }, // 收款方式字典翻译 + }, + /*dealOrderTypeArray(){ + this.queryParams.orderType = ""; + this.queryParams.orderCountType = ""; + this.queryParams.orderMoneyType = ""; + if(this.searchOrderTypeArray == null){ + return; + } + this.searchOrderTypeArray.forEach((item,index) => { + if(this.queryParams.orderType.indexOf(item[0]+"") == -1){ + this.queryParams.orderType += this.queryParams.orderType != "" ? (","+item[0]) : item[0]; + } + if(this.queryParams.orderCountType.indexOf(item[1]+"") == -1){ + this.queryParams.orderCountType += this.queryParams.orderCountType != "" ? (","+item[1]) : item[1]; + } + if(this.queryParams.orderMoneyType.indexOf(item[2]+"") == -1){ + this.queryParams.orderMoneyType += this.queryParams.orderMoneyType != "" ? (","+item[2]) : item[2]; + } + }); + },*/ + // 收款方式字典翻译 payTypeIdFormat(row, column) { return this.selectDictLabel(this.payTypeIdOptions, row.payTypeId); }, @@ -711,7 +752,7 @@ export default { return "warning-row"; } return "success-row"; - }, + } }, watch: {}, }; From 3d20c30edc3277de1c6e125dfb9f03dff3b0ba49 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Mon, 1 Mar 2021 19:04:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysRecipesPlanModelController.java | 68 --- .../custom/SysRecipesTemplateController.java | 71 +++ ...PlanModel.java => SysRecipesTemplate.java} | 13 +- .../mapper/SysRecipesPlanModelMapper.java | 24 - .../mapper/SysRecipesTemplateMapper.java | 23 + .../service/ISysRecipesPlanModelService.java | 25 - .../service/ISysRecipesTemplateService.java | 24 + .../impl/SysRecipesPlanModelServiceImpl.java | 67 --- .../impl/SysRecipesTemplateServiceImpl.java | 70 +++ .../mapper/custom/SysRecipesPlanMapper.xml | 6 +- .../custom/SysRecipesPlanModelMapper.xml | 75 --- .../custom/SysRecipesTemplateMapper.xml | 96 ++++ stdiet-ui/src/api/custom/recipesPlanModel.js | 33 -- stdiet-ui/src/api/custom/recipesTemplate.js | 39 ++ stdiet-ui/src/store/modules/recipes.js | 19 +- .../RecipesView/RecipesAspectCom/index.vue | 6 + .../RecommendView/RecommendView/index.vue | 8 + .../RecommendView/TemplateView/index.vue | 97 ++++ .../recipesBuild/RecommendView/index.vue | 90 ++++ .../custom/recipesBuild/RecommondView.vue | 22 - .../recipesBuild/TemplateInfoView/index.vue | 89 ++++ .../src/views/custom/recipesBuild/index.vue | 18 +- .../src/views/custom/recipesModel/index.vue | 331 ------------- .../views/custom/recipesTemplate/index.vue | 458 ++++++++++++++++++ 24 files changed, 1118 insertions(+), 654 deletions(-) delete mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java rename stdiet-custom/src/main/java/com/stdiet/custom/domain/{SysRecipesPlanModel.java => SysRecipesTemplate.java} (51%) delete mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java delete mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java delete mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java delete mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml delete mode 100644 stdiet-ui/src/api/custom/recipesPlanModel.js create mode 100644 stdiet-ui/src/api/custom/recipesTemplate.js create mode 100644 stdiet-ui/src/views/custom/recipesBuild/RecommendView/RecommendView/index.vue create mode 100644 stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue create mode 100644 stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue delete mode 100644 stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue create mode 100644 stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue delete mode 100644 stdiet-ui/src/views/custom/recipesModel/index.vue create mode 100644 stdiet-ui/src/views/custom/recipesTemplate/index.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java deleted file mode 100644 index 6ade85a44..000000000 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.stdiet.web.controller.custom; - -import com.stdiet.common.core.controller.BaseController; -import com.stdiet.common.core.domain.AjaxResult; -import com.stdiet.common.core.page.TableDataInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; -import com.stdiet.custom.service.ISysRecipesPlanModelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 食谱模板 - * - * @author wonder - * @date 2021-02-27 - */ -@RestController -@RequestMapping("/recipes/model") -public class SysRecipesPlanModelController extends BaseController { - @Autowired - private ISysRecipesPlanModelService iSysRecipesPlanModelService; - - /** - * 查询 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesModel:list')") - @GetMapping("/list") - public TableDataInfo list(SysRecipesPlanModel sysRecipesPlanModel) { - startPage(); - List list = iSysRecipesPlanModelService.selectRecipesModelListByCondition(sysRecipesPlanModel); - return getDataTable(list); - } - - /** - * 添加 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesModel:edit')") - @PostMapping("/add") - public AjaxResult add(SysRecipesPlanModel sysRecipesPlanModel) { - return toAjax(iSysRecipesPlanModelService.insertRecipsesModel(sysRecipesPlanModel)); - } - - /** - * 更新 - * - * @param sysRecipesPlanModel - * @return - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')") - @PutMapping(value = "/update") - public AjaxResult update(SysRecipesPlanModel sysRecipesPlanModel) { - return toAjax(iSysRecipesPlanModelService.updateRecipesModel(sysRecipesPlanModel)); - } - - /** - * 删除 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:query')") - @DeleteMapping(value = "/delete/{id}") - public AjaxResult delete(@PathVariable("id") Long id) { - return AjaxResult.success(iSysRecipesPlanModelService.removeRecipesModel(id)); - } - - -} \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java new file mode 100644 index 000000000..ffb0c8cca --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java @@ -0,0 +1,71 @@ +package com.stdiet.web.controller.custom; + +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.core.page.TableDataInfo; +import com.stdiet.custom.domain.SysRecipesTemplate; +import com.stdiet.custom.service.ISysRecipesTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 食谱模板 + * + * @author wonder + * @date 2021-02-27 + */ +@RestController +@RequestMapping("/recipes/template") +public class SysRecipesTemplateController extends BaseController { + @Autowired + private ISysRecipesTemplateService iSysRecipesTemplateService; + + /** + * 查询 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @GetMapping("/list") + public TableDataInfo list(SysRecipesTemplate sysRecipesTemplate) { + startPage(); + List list = iSysRecipesTemplateService.selectRecipesTemplateListByCondition(sysRecipesTemplate); + return getDataTable(list); + } + + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @GetMapping(value = "/{id}") + public AjaxResult detail(@PathVariable Long id) { + return AjaxResult.success(iSysRecipesTemplateService.getRecipesTemplateById(id)); + } + + /** + * 添加 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:edit')") + @PostMapping("/add") + public AjaxResult add(@RequestBody SysRecipesTemplate sysRecipesTemplate) { + return toAjax(iSysRecipesTemplateService.insertRecipsesTemplate(sysRecipesTemplate)); + } + + /** + * 更新 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @PutMapping(value = "/update") + public AjaxResult update(@RequestBody SysRecipesTemplate sysRecipesTemplate) { + return toAjax(iSysRecipesTemplateService.updateRecipesTemplate(sysRecipesTemplate)); + } + + /** + * 删除 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:query')") + @DeleteMapping(value = "/delete/{id}") + public AjaxResult delete(@PathVariable("id") Long id) { + return AjaxResult.success(iSysRecipesTemplateService.removeRecipesTemplate(id)); + } + + +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java similarity index 51% rename from stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java rename to stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java index f491891cd..f09334a9a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java @@ -1,23 +1,32 @@ package com.stdiet.custom.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data -public class SysRecipesPlanModel { +public class SysRecipesTemplate { Long id; + String name; + Long nutritionistId; + String nutritionist; + Long nutriAssisId; + String nutriAssis; + Long planId; String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date createTime; String updateBy; @@ -25,4 +34,6 @@ public class SysRecipesPlanModel { String createBy; Long recipesId; + + Integer reviewStatus; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java deleted file mode 100644 index 12909be6c..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.stdiet.custom.mapper; - -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanListInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; - -import java.util.List; - -/** - * 食谱计划Mapper接口 - * - * @author wonder - * @date 2021-02-27 - */ -public interface SysRecipesPlanModelMapper -{ - List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); - - int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int removeRecipesModel(Long id); -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java new file mode 100644 index 000000000..ca5613d15 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java @@ -0,0 +1,23 @@ +package com.stdiet.custom.mapper; + +import com.stdiet.custom.domain.SysRecipesTemplate; + +import java.util.List; + +/** + * 食谱计划Mapper接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface SysRecipesTemplateMapper { + List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate); + + int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int removeRecipesTemplate(Long id); + + SysRecipesTemplate getRecipesTemplateById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java deleted file mode 100644 index f227cc3ce..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.stdiet.custom.service; - -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanListInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; - -import java.util.List; - -/** - * 食谱计划Service接口 - * - * @author wonder - * @date 2021-02-27 - */ -public interface ISysRecipesPlanModelService -{ - - List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); - - int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int removeRecipesModel(Long id); -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java new file mode 100644 index 000000000..c2ac9c22d --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java @@ -0,0 +1,24 @@ +package com.stdiet.custom.service; + +import com.stdiet.custom.domain.SysRecipesTemplate; + +import java.util.List; + +/** + * 食谱计划Service接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface ISysRecipesTemplateService { + + List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate); + + int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int removeRecipesTemplate(Long id); + + SysRecipesTemplate getRecipesTemplateById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java deleted file mode 100644 index f2e5876da..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.stdiet.custom.service.impl; - -import com.stdiet.common.utils.DateUtils; -import com.stdiet.common.utils.SecurityUtils; -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanModel; -import com.stdiet.custom.mapper.SysRecipesPlanMapper; -import com.stdiet.custom.mapper.SysRecipesPlanModelMapper; -import com.stdiet.custom.service.ISysRecipesPlanModelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * 食谱计划Service业务层处理 - * - * @author wonder - * @date 2021-02-27 - */ -@Service("sysRecipesPlanModelService") -@Transactional -public class SysRecipesPlanModelServiceImpl implements ISysRecipesPlanModelService { - - @Autowired - SysRecipesPlanModelMapper sysRecipesPlanModelMapper; - - @Autowired - SysRecipesPlanMapper sysRecipesPlanMapper; - - @Override - public List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel) { - return sysRecipesPlanModelMapper.selectRecipesModelListByCondition(sysRecipesPlanModel); - } - - @Override - public int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel) { - SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); - sysRecipesPlan.setStartNumDay(1); - sysRecipesPlan.setEndNumDay(7); - sysRecipesPlan.setType(1); - int rows = sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); - if (rows > 0) { - sysRecipesPlanModel.setCreateBy(SecurityUtils.getUsername()); - sysRecipesPlanModel.setCreateTime(DateUtils.getNowDate()); - sysRecipesPlanModel.setPlanId(sysRecipesPlan.getId()); - return sysRecipesPlanModelMapper.insertRecipsesModel(sysRecipesPlanModel); - } - return 0; - } - - @Override - public int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel) { - sysRecipesPlanModel.setUpdateBy(SecurityUtils.getUsername()); - sysRecipesPlanModel.setUpdateTime(DateUtils.getNowDate()); - return sysRecipesPlanModelMapper.updateRecipesModel(sysRecipesPlanModel); - } - - @Override - public int removeRecipesModel(Long id) { - return sysRecipesPlanModelMapper.removeRecipesModel(id); - } - - -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java new file mode 100644 index 000000000..ad260731a --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java @@ -0,0 +1,70 @@ +package com.stdiet.custom.service.impl; + +import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.SecurityUtils; +import com.stdiet.common.utils.StringUtils; +import com.stdiet.custom.domain.SysRecipesPlan; +import com.stdiet.custom.domain.SysRecipesTemplate; +import com.stdiet.custom.mapper.SysRecipesPlanMapper; +import com.stdiet.custom.mapper.SysRecipesTemplateMapper; +import com.stdiet.custom.service.ISysRecipesTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 食谱计划Service业务层处理 + * + * @author wonder + * @date 2021-02-27 + */ +@Service("sysRecipesPlanModelService") +@Transactional +public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService { + + @Autowired + SysRecipesTemplateMapper sysRecipesTemplateMapper; + + @Autowired + SysRecipesPlanMapper sysRecipesPlanMapper; + + @Override + public List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate) { + return sysRecipesTemplateMapper.selectRecipesTemplateListByCondition(sysRecipesTemplate); + } + + @Override + public int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate) { + SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); + sysRecipesPlan.setStartNumDay(1); + sysRecipesPlan.setEndNumDay(7); + sysRecipesPlan.setType(1); + sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); + if (!StringUtils.isNull(sysRecipesPlan.getId())) { + sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername()); + sysRecipesTemplate.setCreateTime(DateUtils.getNowDate()); + sysRecipesTemplate.setPlanId(sysRecipesPlan.getId()); + return sysRecipesTemplateMapper.insertRecipsesTemplate(sysRecipesTemplate); + } + return 0; + } + + @Override + public int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate) { + sysRecipesTemplate.setUpdateBy(SecurityUtils.getUsername()); + sysRecipesTemplate.setUpdateTime(DateUtils.getNowDate()); + return sysRecipesTemplateMapper.updateRecipesTemplate(sysRecipesTemplate); + } + + @Override + public int removeRecipesTemplate(Long id) { + return sysRecipesTemplateMapper.removeRecipesTemplate(id); + } + + @Override + public SysRecipesTemplate getRecipesTemplateById(Long id) { + return sysRecipesTemplateMapper.getRecipesTemplateById(id); + } +} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index 49e4a3da7..fcee81005 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -86,6 +86,7 @@ update_by, del_flag, review_status, + type, #{orderId}, @@ -104,6 +105,7 @@ #{updateBy}, #{delFlag}, #{reviewStatus}, + #{type}, @@ -163,7 +165,7 @@ select id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, review_status from sys_recipes_plan - where cus_id=#{cusId} order by create_time desc + where cus_id=#{cusId} order by id desc - select srpm.id, srpm.nutritionist_id, srpm.nutri_assis_id, srpm.remark, srpm.update_time, - srpm.create_time, srpm.update_by, srpm.create_by, srpm.plan_id, srp.recipes_id, srp.review_status - from sys_recipes_plan_model srpm - left join sys_recipes_plan srp on srp.id = srpm.plan_id - where del_flag = 0 - and nutri_assis_id = #{nutriAssisId} - and nutritionist_id = #{nutritionistId} - and review_status = #{reviewStatus} - order by srpm.create_time desc - - - - insert into sys_recipes_plan_model - - nutri_assis_id, - nutritionist_id, - create_time, - create_by, - update_time, - update_by, - remark, - review_status, - - - #{nutriAssisId}, - #{nutritionistId}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{remark}, - #{reviewStatus}, - - - - - update sys_recipes_plan_model - - nutri_assis_id = #{nutriAssisId}, - nutritionist_id = #{nutritionistId}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - remark = #{remark}, - review_status = #{reviewStatus}, - - where id = #{id} - - - - update sys_recipes_plan_model set del_flag=1 where id = #{id} - - - \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml new file mode 100644 index 000000000..6a212f21b --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into sys_recipes_template + + name, + plan_id, + nutri_assis_id, + nutritionist_id, + create_time, + create_by, + update_time, + update_by, + remark, + + + #{name}, + #{planId}, + #{nutriAssisId}, + #{nutritionistId}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{remark}, + + + + + update sys_recipes_template + + name = #{name}, + nutri_assis_id = #{nutriAssisId}, + nutritionist_id = #{nutritionistId}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + remark = #{remark}, + + where id = #{id} + + + + update sys_recipes_template set del_flag=1 where id = #{id} + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/recipesPlanModel.js b/stdiet-ui/src/api/custom/recipesPlanModel.js deleted file mode 100644 index dac431cb8..000000000 --- a/stdiet-ui/src/api/custom/recipesPlanModel.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from "@/utils/request"; - -export function listRecipesModel(query) { - return request({ - url: "/recipes/model/list", - method: "get", - params: query - }); -} - -export function addRecipesModel(data){ - return request({ - url: "/recipes/model/add", - method: "post", - data: data - }); -} - -export function updateRecipesModel(data) { - return request({ - url: "/recipes/model/update", - method: "put", - data: data - }); -} - - -export function deleteRecipesModel(id) { - return request({ - url: "/recipes/model/delete/" + id, - method: "get" - }); -} diff --git a/stdiet-ui/src/api/custom/recipesTemplate.js b/stdiet-ui/src/api/custom/recipesTemplate.js new file mode 100644 index 000000000..4d8167140 --- /dev/null +++ b/stdiet-ui/src/api/custom/recipesTemplate.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +export function listRecipesTemplate(query) { + return request({ + url: "/recipes/template/list", + method: "get", + params: query + }); +} + +export function getRecipesTemplateDetail(id) { + return request({ + url: "/recipes/template/" + id, + method: "get" + }); +} + +export function addRecipesTemplate(data) { + return request({ + url: "/recipes/template/add", + method: "post", + data: data + }); +} + +export function updateRecipesTemplate(data) { + return request({ + url: "/recipes/template/update", + method: "put", + data: data + }); +} + +export function deleteRecipesTemplate(id) { + return request({ + url: "/recipes/template/delete/" + id, + method: "delete" + }); +} diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index 84ff42331..89c1fef86 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -7,12 +7,14 @@ import { deleteDishesApi, addRecipesApi } from "@/api/custom/recipes"; +import { getRecipesTemplateDetail } from "@/api/custom/recipesTemplate"; import { getRecipesPlan, updateRecipesPlan } from "@/api/custom/recipesPlan"; import { getDicts } from "@/api/system/dict/data"; const oriState = { cusId: undefined, planId: undefined, + temId: undefined, recipesId: undefined, healthyData: {}, healthDataLoading: false, @@ -25,7 +27,8 @@ const oriState = { currentDay: -1, startNum: 0, endNum: 0, - reviewStatus: 0 + reviewStatus: 0, + templateInfo: undefined }; const mutations = { @@ -87,6 +90,7 @@ const actions = { cusId, recipesId, reviewStatus, + temId: payload.temId, planId: payload.planId, startNum: startNumDay, endNum: endNumDay @@ -108,12 +112,25 @@ const actions = { dispatch("getHealthyData", { cusId }).catch(err => rej(err)); } + // 模板信息 + if (payload.temId) { + dispatch("getRecipesTemplate", payload).catch(err => rej(err)); + } + // 食谱数据 if (recipesId) { dispatch("getRecipesInfo", { recipesId }).catch(err => rej(err)); } }); }, + async getRecipesTemplate({ commit, state }, { temId }) { + const response = await getRecipesTemplateDetail(temId); + if (response.code === 200) { + commit("updateStateData", { + templateInfo: response.data + }); + } + }, async updateReviewStatus({ commit, state }, payload) { const response = await updateRecipesPlan({ id: state.planId, diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue index 26f66188a..2c9bdccca 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue @@ -4,6 +4,9 @@ :style="`height: ${collapse ? 30 : 200}px`" >
+ 返回 +
推荐列表
+ + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue new file mode 100644 index 000000000..0a19d3dd4 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue @@ -0,0 +1,97 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue new file mode 100644 index 000000000..2bd6666ab --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue @@ -0,0 +1,90 @@ + + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue deleted file mode 100644 index 78b706c81..000000000 --- a/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue new file mode 100644 index 000000000..a12c12f2b --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue @@ -0,0 +1,89 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/index.vue b/stdiet-ui/src/views/custom/recipesBuild/index.vue index c8bdba22b..93a53752a 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/index.vue @@ -7,10 +7,11 @@ :name="healthyData.name" :analyseData="analyseData" /> - +
- + +
@@ -27,16 +28,21 @@ const { import HealthyView from "@/components/HealthyView"; import BodySignView from "@/components/BodySignView"; import RecipesView from "./RecipesView/index"; -import RecommondView from "./RecommondView"; +import RecommendView from "./RecommendView"; +import TemplateInfoView from "./TemplateInfoView"; export default { name: "BuildRecipies", data() { - return {}; + const { temId } = this.$route.query; + return { + temId, + }; }, mounted() { this.init({ planId: this.planId, + temId: this.temId, }).catch((err) => { this.$message.error(err.message); }); @@ -49,13 +55,15 @@ export default { HealthyView, BodySignView, RecipesView, - RecommondView, + RecommendView, + TemplateInfoView, }, props: ["name", "planId"], computed: { ...mapState([ "healthyData", "healthyDataType", + "templateInfo", "recipesData", "recipesDataLoading", "healthDataLoading", diff --git a/stdiet-ui/src/views/custom/recipesModel/index.vue b/stdiet-ui/src/views/custom/recipesModel/index.vue deleted file mode 100644 index 1a1b71554..000000000 --- a/stdiet-ui/src/views/custom/recipesModel/index.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - diff --git a/stdiet-ui/src/views/custom/recipesTemplate/index.vue b/stdiet-ui/src/views/custom/recipesTemplate/index.vue new file mode 100644 index 000000000..2b0bd7f78 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesTemplate/index.vue @@ -0,0 +1,458 @@ + + + + + +