diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/CusUserPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/CusUserPostController.java new file mode 100644 index 000000000..15f906caa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/CusUserPostController.java @@ -0,0 +1,33 @@ +package com.ruoyi.web.controller.custom; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.custom.domain.CusUserPost; +import com.ruoyi.custom.service.ICusUserPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 销售订单Controller + * + * @author wonder + * @date 2020-09-24 + */ +@RestController +@RequestMapping("/custom/post") +public class CusUserPostController extends BaseController { + @Autowired + private ICusUserPostService cusUserPostService; + + @GetMapping("/options") + public AjaxResult getOptions() { + AjaxResult ajax = AjaxResult.success(); + List userPosts = cusUserPostService.selectAllCusUserPost(); + + ajax.put(AjaxResult.DATA_TAG, userPosts); + return ajax; + } + +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java index 5a8656b3c..279a10fa1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java @@ -1,13 +1,10 @@ package com.ruoyi.web.controller.custom; -import java.util.ArrayList; import java.util.List; +import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.custom.UserPostOption; -import com.ruoyi.system.service.ISysPostService; +import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysUserService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -40,12 +37,11 @@ public class SysOrderController extends BaseController { @Autowired private ISysOrderService sysOrderService; - @Autowired - private ISysPostService postService; - @Autowired private ISysUserService userService; + @Autowired + private ISysDictDataService dictDataService; /** * 查询销售订单列表 @@ -54,8 +50,28 @@ public class SysOrderController extends BaseController { @GetMapping("/list") public TableDataInfo list(SysOrder sysOrder) { startPage(); -// List users = userService.selectUserList(); List list = sysOrderService.selectSysOrderList(sysOrder); + List userList = userService.selectAllUser(); + + for (SysOrder order : list) { + for (SysUser user : userList) { + if (user.getUserId().equals(order.getPreSaleId())) { + order.setPreSale(user.getNickName()); + } else if (user.getUserId().equals(order.getAfterSaleId())) { + order.setAfterSale(user.getNickName()); + } else if (user.getUserId().equals(order.getNutritionistId())) { + order.setNutritionist(user.getNickName()); + } else if (user.getUserId().equals(order.getNutriAssisId())) { + order.setNutriAssis(user.getNickName()); + } else if (user.getUserId().equals(order.getOperatorId())) { + order.setOperator(user.getNickName()); + } else if (user.getUserId().equals(order.getPlannerId())) { + order.setPlanner(user.getNickName()); + } else if (user.getUserId().equals(order.getPlannerAssisId())) { + order.setPlannerAssis(user.getNickName()); + } + } + } return getDataTable(list); } @@ -68,6 +84,27 @@ public class SysOrderController extends BaseController { @GetMapping("/export") public AjaxResult export(SysOrder sysOrder) { List list = sysOrderService.selectSysOrderList(sysOrder); + List userList = userService.selectAllUser(); + + for (SysOrder order : list) { + for (SysUser user : userList) { + if (user.getUserId().equals(order.getPreSaleId())) { + order.setPreSale(user.getNickName()); + } else if (user.getUserId().equals(order.getAfterSaleId())) { + order.setAfterSale(user.getNickName()); + } else if (user.getUserId().equals(order.getNutritionistId())) { + order.setNutritionist(user.getNickName()); + } else if (user.getUserId().equals(order.getNutriAssisId())) { + order.setNutriAssis(user.getNickName()); + } else if (user.getUserId().equals(order.getOperatorId())) { + order.setOperator(user.getNickName()); + } else if (user.getUserId().equals(order.getPlannerId())) { + order.setPlanner(user.getNickName()); + } else if (user.getUserId().equals(order.getPlannerAssisId())) { + order.setPlannerAssis(user.getNickName()); + } + } + } ExcelUtil util = new ExcelUtil(SysOrder.class); return util.exportExcel(list, "order"); } @@ -111,25 +148,5 @@ public class SysOrderController extends BaseController { return toAjax(sysOrderService.deleteSysOrderByIds(orderIds)); } - @GetMapping("/getOptions") - public AjaxResult getOptions() { - AjaxResult ajax = AjaxResult.success(); - List userPosts = postService.selectUserPostAll(); - - List userPostOptions = new ArrayList<>(); - - for (SysUserPost userPost : userPosts) { - SysPost post = postService.selectPostById(userPost.getPostId()); - SysUser user = userService.selectUserById(userPost.getUserId()); - UserPostOption userPostOption = new UserPostOption(); - userPostOption.setPostCode(post.getPostCode()); - userPostOption.setUserId(userPost.getUserId()); - userPostOption.setUserName(user.getNickName()); - userPostOptions.add(userPostOption); - } - - ajax.put(AjaxResult.DATA_TAG, userPostOptions); - return ajax; - } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 0527cdf48..d68606d21 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -9,8 +9,8 @@ spring: # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # password: wonderdb -# url: jdbc:mysql://47.97.194.44:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://localhost:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.97.194.44:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://localhost:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 password: 9gPUnV$#2s/j(7_( username: root # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 084a8456a..b57b95697 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,8 +9,8 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） -# profile: /Users/wonder/Documents/Workspaces/node/RuoYi-Vue/running/uploadPath - profile: /home/www/api/longShop/uploadPath + profile: /Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/uploadPath +# profile: /home/www/api/longShop/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index de098de6e..f25dadb56 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,8 +1,8 @@ - - + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/custom/UserPostOption.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/CusUserPost.java similarity index 64% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/custom/UserPostOption.java rename to ruoyi-custom/src/main/java/com/ruoyi/custom/domain/CusUserPost.java index 5ca5d0d56..468e3562e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/custom/UserPostOption.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/CusUserPost.java @@ -1,6 +1,12 @@ -package com.ruoyi.system.domain.custom; +package com.ruoyi.custom.domain; -public class UserPostOption { +import com.ruoyi.common.core.domain.BaseEntity; + +import java.io.Serializable; + +public class CusUserPost implements Serializable { + + private static final long serialVersionUID = 1L; private Long userId; @@ -8,6 +14,8 @@ public class UserPostOption { private String postCode; + private String postId; + public String getPostCode() { return postCode; } @@ -32,12 +40,21 @@ public class UserPostOption { this.userName = userName; } + public String getPostId() { + return postId; + } + + public void setPostId(String postId) { + this.postId = postId; + } + @Override public String toString() { return "UserPostOption{" + "userId=" + userId + ", userName='" + userName + '\'' + ", postCode='" + postCode + '\'' + + ", postid='" + postId + '\'' + '}'; } } diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java index 6d65687bc..b3d14d208 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java @@ -100,11 +100,34 @@ public class SysOrder extends BaseEntity @Excel(name = "推荐人") private String recommender; + /** 服务月数 */ + @Excel(name = "服务月数") + private String serveMonth; + + @Excel(name = "审核状态", dictType = "cus_review_status") + private String reviewStatus; + /** 成交日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd") private Date orderTime; + public String getReviewStatus() { + return reviewStatus; + } + + public void setReviewStatus(String reviewStatus) { + this.reviewStatus = reviewStatus; + } + + public void setServeMonth(String serveMonth) { + this.serveMonth = serveMonth; + } + + public String getServeMonth() { + return serveMonth; + } + public void setOrderId(Long orderId) { this.orderId = orderId; @@ -354,6 +377,8 @@ public class SysOrder extends BaseEntity .append("operator", getOperator()) .append("recommender", getRecommender()) .append("orderTime", getOrderTime()) + .append("serveMonth", getServeMonth()) + .append("reviewStatus", getReviewStatus()) .toString(); } } \ No newline at end of file diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/CusUserPostMapper.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/CusUserPostMapper.java new file mode 100644 index 000000000..92b125cbc --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/CusUserPostMapper.java @@ -0,0 +1,9 @@ +package com.ruoyi.custom.mapper; + +import com.ruoyi.custom.domain.CusUserPost; + +import java.util.List; + +public interface CusUserPostMapper { + public List selectAllCusUserPost(); +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ICusUserPostService.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ICusUserPostService.java new file mode 100644 index 000000000..4c356c2a6 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ICusUserPostService.java @@ -0,0 +1,10 @@ +package com.ruoyi.custom.service; + +import com.ruoyi.custom.domain.CusUserPost; + +import java.util.List; + +public interface ICusUserPostService { + + public List selectAllCusUserPost(); +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/CusUserPostImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/CusUserPostImpl.java new file mode 100644 index 000000000..c31f45424 --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/CusUserPostImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.custom.service.impl; + +import com.ruoyi.custom.domain.CusUserPost; +import com.ruoyi.custom.mapper.CusUserPostMapper; +import com.ruoyi.custom.service.ICusUserPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CusUserPostImpl implements ICusUserPostService { + + @Autowired + private CusUserPostMapper cusUserPostMapper; + + @Override + public List selectAllCusUserPost() { + return cusUserPostMapper.selectAllCusUserPost(); + } +} diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java index 0e20c4abf..f49d8c84d 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java @@ -54,6 +54,7 @@ public class SysOrderServiceImpl implements ISysOrderService public int insertSysOrder(SysOrder sysOrder) { sysOrder.setCreateTime(DateUtils.getNowDate()); + sysOrder.setOrderTime(DateUtils.getNowDate()); return sysOrderMapper.insertSysOrder(sysOrder); } diff --git a/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml new file mode 100644 index 000000000..2c4d3e812 --- /dev/null +++ b/ruoyi-custom/src/main/resources/mapper/custom/CusUserPostMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + SELECT u.user_id, u.nick_name, p.post_id, p.post_code + FROM sys_user u, sys_post p, sys_user_post up + WHERE up.user_id = u.user_id AND p.post_id = up.post_id + + + + + + \ No newline at end of file diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 71b579a42..31fb6b68a 100644 --- a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -5,58 +5,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - select order_id, customer, phone, amount, pay_type_id, pay_type, pre_sale_id, create_by, pre_sale, create_time, after_sale_id, update_by, after_sale, update_time, nutritionist_id, remark, nutritionist, nutri_assis_id, nutri_assis, account_id, account, planner_id, planner, planner_assis_id, planner_assis, operator_id, operator, recommender, order_time from sys_order + select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.serve_month, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time, o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.recommender, o.order_time from sys_order o + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS acc ON acc.dict_value = o.account_id + select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + where u.del_flag = '0' + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, diff --git a/ruoyi-ui/src/api/custom/order.js b/ruoyi-ui/src/api/custom/order.js index f057d49f6..f95363aff 100644 --- a/ruoyi-ui/src/api/custom/order.js +++ b/ruoyi-ui/src/api/custom/order.js @@ -2,11 +2,11 @@ import request from '@/utils/request' // 查询销售订单列表 export function listOrder(query) { - const [fromOrderTime, toOrderTime] = query.orderTime || [null, null]; + const [beginTime, endTime] = query.orderTime || [null, null]; const params = { ...query, - fromOrderTime, - toOrderTime, + beginTime, + endTime, orderTime: null } @@ -62,7 +62,7 @@ export function exportOrder(query) { export function getOptions() { return request({ - url: '/custom/order/getOptions', + url: '/custom/post/options', method: 'get' }) } diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue index 04b301158..6d70bb482 100644 --- a/ruoyi-ui/src/views/custom/order/index.vue +++ b/ruoyi-ui/src/views/custom/order/index.vue @@ -2,7 +2,7 @@
- + - - - - - - - - - - - - - - + - - + - - + - - + - - + @@ -81,8 +64,7 @@ - - + @@ -95,8 +77,7 @@ - - + @@ -107,8 +88,7 @@ - - + @@ -119,8 +99,7 @@ - - + @@ -131,19 +110,19 @@ - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - 新增 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -239,6 +192,7 @@ + @@ -311,100 +265,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -417,15 +277,112 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -487,6 +444,10 @@ plannerIdOptions: [], // 账号 accountIdOptions: [], + // 服务月数 + serveMonthOption: [], + // 审核状态 + reviewStatusOptions: [], // 策划助理字典 plannerAssisIdOptions: [], // 运营字典 @@ -507,7 +468,8 @@ plannerAssisId: null, operatorId: null, recommender: null, - orderTime: null + orderTime: null, + reviewStatus: null, }, // 表单参数 form: {}, @@ -519,15 +481,18 @@ amount: [ {required: true, message: "金额不能为空", trigger: "blur"} ], - orderTime: [ - {required: true, message: "成交日期不能为空", trigger: "blur"} - ], payTypeId: [ - {required: true, message: "首款方式不能为空", trigger: "blur"} + {required: true, message: "收款方式不能为空", trigger: "blur"} ], accountId: [ {required: true, message: "账号不能为空", trigger: "blur"} - ] + ], + serveMonth: [ + {required: true, message: "服务月数不能为空", trigger: "blur"} + ], + // reviewStatus: [ + // {required: true, message: "请对数据进行审核", trigger: "blur"} + // ] }, pickerOptions: { shortcuts: [{ @@ -561,7 +526,6 @@ created() { this.getList(); getOptions().then(response => { - console.log(response) const options = response.data.reduce((opts, cur) => { if (!opts[cur.postCode]) { opts[cur.postCode] = []; @@ -583,6 +547,12 @@ this.getDicts("cus_account").then(response => { this.accountIdOptions = response.data; }); + this.getDicts("cus_serve_month").then(response => { + this.serveMonthOption = response.data; + }); + this.getDicts("cus_review_status").then(response => { + this.reviewStatusOptions = response.data; + }) }, methods: { /** 查询销售订单列表 */ @@ -636,36 +606,29 @@ }, // 表单重置 reset() { + const defaultPayType = this.payTypeIdOptions.find(opt => opt.remark === 'default'); this.form = { orderId: null, customer: null, phone: null, amount: null, - payTypeId: null, - payType: null, + payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null, preSaleId: null, createBy: null, - preSale: null, createTime: null, afterSaleId: null, updateBy: null, - afterSale: null, updateTime: null, nutritionistId: null, remark: null, - nutritionist: null, nutriAssisId: null, - nutriAssis: null, accountId: null, - account: null, plannerId: null, - planner: null, plannerAssisId: null, - plannerAssis: null, operatorId: null, - operator: null, recommender: null, - orderTime: null + orderTime: null, + serveMonth: 1, }; this.resetForm("form"); }, @@ -673,33 +636,6 @@ handleQuery() { this.queryParams.pageNum = 1; this.getList(); - // this.getDicts("cus_pay_type").then(response => { - // this.payTypeIdOptions = response.data; - // }); - // this.getDicts("cus_pre_sale").then(response => { - // this.preSaleIdOptions = response.data; - // }); - // this.getDicts("cus_after_sale").then(response => { - // this.afterSaleIdOptions = response.data; - // }); - // this.getDicts("cus_nutri").then(response => { - // this.nutritionistIdOptions = response.data; - // }); - // this.getDicts("cus_nutri_assis").then(response => { - // this.nutriAssisIdOptions = response.data; - // }); - // this.getDicts("cus_planner").then(response => { - // this.plannerIdOptions = response.data; - // }); - // this.getDicts("cus_account").then(response => { - // this.accountIdOptions = response.data; - // }); - // this.getDicts("cus_planner_assis").then(response => { - // this.plannerAssisIdOptions = response.data; - // }); - // this.getDicts("cus_operator").then(response => { - // this.operatorIdOptions = response.data; - // }); }, /** 重置按钮操作 */ resetQuery() { @@ -732,19 +668,6 @@ submitForm() { this.$refs["form"].validate(valid => { if (valid) { - - // console.log(this.form) - - // this.form.payType = this.selectDictLabel(this.payTypeIdOptions, this.form.payTypeId); - // this.form.preSale = this.selectDictLabel(this.preSaleIdOptions, this.form.preSaleId); - // this.form.afterSale = this.selectDictLabel(this.afterSaleIdOptions, this.form.afterSaleId); - // this.form.nutritionist = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId); - // this.form.nutriAssis = this.selectDictLabel(this.nutriAssisIdOptions, this.form.nutriAssisId); - // this.form.account = this.selectDictLabel(this.accountIdOptions, this.form.accountId); - // this.form.planner = this.selectDictLabel(this.plannerIdOptions, this.form.plannerId); - // this.form.plannerAssis = this.selectDictLabel(this.plannerAssisIdOptions, this.form.plannerAssisId); - // this.form.operator = this.selectDictLabel(this.operatorIdOptions, this.form.operatorId); - if (this.form.orderId != null) { updateOrder(this.form).then(response => { if (response.code === 200) { diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql index cdf51279b..7ef13c130 100644 --- a/sql/ry_20200920.sql +++ b/sql/ry_20200920.sql @@ -712,27 +712,20 @@ create table sys_order ( order_id bigint(20) not null auto_increment comment '编号', customer varchar(30) not null comment '客户姓名', phone varchar(30) comment '电话', + review_status varchar(10) default 'no' comment '审核状态', pay_type_id bigint(20) comment '收款方式ID', - pay_type varchar(30) comment '收款方式', pre_sale_id bigint(20) comment '售前ID', - pre_sale varchar(30) comment '售前', after_sale_id bigint(20) comment '售后ID', - after_sale varchar(30) comment '售后', nutritionist_id bigint(20) comment '营养师ID', - nutritionist varchar(30) comment '营养师', nutri_assis_id bigint(20) comment '助理营养师ID', - nutri_assis varchar(30) comment '助理营养师', account_id bigint(20) comment '账号ID', - account varchar(30) comment '账号', planner_id bigint(20) comment '策划ID', - planner varchar(30) comment '策划', planner_assis_id bigint(20) comment '策划助理ID', - planner_assis varchar(30) comment '策划助理', operator_id bigint(20) comment '运营ID', - operator varchar(30) comment '运营', recommender varchar(30) comment '推荐人', + serve_month tinyint comment '服务月数', amount decimal(10,2) comment '金额', - order_time datetime comment '成交日期', + order_time datetime comment '成交日期', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者',