From abf4cf2dc25ea7422d0a2d54a0f1b3855a719dc3 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 24 Sep 2020 21:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysOrderController.java | 28 +- .../com/ruoyi/custom/domain/SysCommision.java | 11 +- .../com/ruoyi/custom/domain/SysOrder.java | 359 +++++++++ .../ruoyi/custom}/mapper/SysOrderMapper.java | 24 +- .../custom}/service/ISysOrderService.java | 24 +- .../service/impl/SysOrderServiceImpl.java | 28 +- .../mapper/custom/SysOrderMapper.xml | 177 +++++ .../com/ruoyi/system/domain/SysOrder.java | 114 --- .../mapper/system/SysOrderMapper.xml | 97 --- ruoyi-ui/src/api/{system => custom}/order.js | 106 +-- ruoyi-ui/src/views/custom/order/index.vue | 737 ++++++++++++++++++ ruoyi-ui/src/views/system/order/index.vue | 360 --------- sql/ry_20200920.sql | 30 +- 13 files changed, 1407 insertions(+), 688 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{system => custom}/SysOrderController.java (83%) create mode 100644 ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-custom/src/main/java/com/ruoyi/custom}/mapper/SysOrderMapper.java (85%) rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-custom/src/main/java/com/ruoyi/custom}/service/ISysOrderService.java (85%) rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-custom/src/main/java/com/ruoyi/custom}/service/impl/SysOrderServiceImpl.java (85%) create mode 100644 ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java delete mode 100644 ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml rename ruoyi-ui/src/api/{system => custom}/order.js (75%) create mode 100644 ruoyi-ui/src/views/custom/order/index.vue delete mode 100644 ruoyi-ui/src/views/system/order/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java index 0e19fd8d9..65f916843 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.ruoyi.web.controller.custom; import java.util.List; import org.springframework.security.access.prepost.PreAuthorize; @@ -15,19 +15,19 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysOrder; -import com.ruoyi.system.service.ISysOrderService; +import com.ruoyi.custom.domain.SysOrder; +import com.ruoyi.custom.service.ISysOrderService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** * 销售订单Controller - * + * * @author wonder - * @date 2020-09-23 + * @date 2020-09-24 */ @RestController -@RequestMapping("/system/order") +@RequestMapping("/custom/order") public class SysOrderController extends BaseController { @Autowired @@ -36,7 +36,7 @@ public class SysOrderController extends BaseController /** * 查询销售订单列表 */ - @PreAuthorize("@ss.hasPermi('system:order:list')") + @PreAuthorize("@ss.hasPermi('custom:order:list')") @GetMapping("/list") public TableDataInfo list(SysOrder sysOrder) { @@ -48,7 +48,7 @@ public class SysOrderController extends BaseController /** * 导出销售订单列表 */ - @PreAuthorize("@ss.hasPermi('system:order:export')") + @PreAuthorize("@ss.hasPermi('custom:order:export')") @Log(title = "销售订单", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(SysOrder sysOrder) @@ -61,7 +61,7 @@ public class SysOrderController extends BaseController /** * 获取销售订单详细信息 */ - @PreAuthorize("@ss.hasPermi('system:order:query')") + @PreAuthorize("@ss.hasPermi('custom:order:query')") @GetMapping(value = "/{orderId}") public AjaxResult getInfo(@PathVariable("orderId") Long orderId) { @@ -71,7 +71,7 @@ public class SysOrderController extends BaseController /** * 新增销售订单 */ - @PreAuthorize("@ss.hasPermi('system:order:add')") + @PreAuthorize("@ss.hasPermi('custom:order:add')") @Log(title = "销售订单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SysOrder sysOrder) @@ -82,7 +82,7 @@ public class SysOrderController extends BaseController /** * 修改销售订单 */ - @PreAuthorize("@ss.hasPermi('system:order:edit')") + @PreAuthorize("@ss.hasPermi('custom:order:edit')") @Log(title = "销售订单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SysOrder sysOrder) @@ -93,11 +93,11 @@ public class SysOrderController extends BaseController /** * 删除销售订单 */ - @PreAuthorize("@ss.hasPermi('system:order:remove')") + @PreAuthorize("@ss.hasPermi('custom:order:remove')") @Log(title = "销售订单", businessType = BusinessType.DELETE) - @DeleteMapping("/{orderIds}") + @DeleteMapping("/{orderIds}") public AjaxResult remove(@PathVariable Long[] orderIds) { return toAjax(sysOrderService.deleteSysOrderByIds(orderIds)); } -} +} \ No newline at end of file diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java index 615ab27b7..048008203 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; + /** * 业务提成比例对象 sys_commision * @@ -27,7 +29,7 @@ public class SysCommision extends BaseEntity /** 金额 */ @Excel(name = "金额") - private Long amount; + private BigDecimal amount; /** 分成比例 */ @Excel(name = "分成比例") @@ -60,12 +62,9 @@ public class SysCommision extends BaseEntity { return nickName; } - public void setAmount(Long amount) - { - this.amount = amount; - } + public void setAmount(BigDecimal amount) { this.amount = amount; } - public Long getAmount() + public BigDecimal getAmount() { return amount; } 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 new file mode 100644 index 000000000..6d65687bc --- /dev/null +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java @@ -0,0 +1,359 @@ +package com.ruoyi.custom.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 销售订单对象 sys_order + * + * @author wonder + * @date 2020-09-24 + */ +public class SysOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long orderId; + + /** 客户姓名 */ + @Excel(name = "客户姓名") + private String customer; + + /** 电话 */ + @Excel(name = "电话") + private String phone; + + /** 金额 */ + @Excel(name = "金额") + private BigDecimal amount; + + /** 收款方式 */ + private Long payTypeId; + + /** 收款方式 */ + @Excel(name = "收款方式") + private String payType; + + /** 售前 */ + private Long preSaleId; + + /** 售前 */ + @Excel(name = "售前") + private String preSale; + + /** 售后 */ + private Long afterSaleId; + + /** 售后 */ + @Excel(name = "售后") + private String afterSale; + + /** 营养师 */ + private Long nutritionistId; + + /** 营养师 */ + @Excel(name = "营养师") + private String nutritionist; + + /** 助理营养师 */ + private Long nutriAssisId; + + /** 助理营养师 */ + @Excel(name = "助理营养师") + private String nutriAssis; + + /** 账号 */ + private Long accountId; + + /** 账号 */ + @Excel(name = "账号") + private String account; + + /** 策划 */ + private Long plannerId; + + /** 策划 */ + @Excel(name = "策划") + private String planner; + + /** 策划助理 */ + private Long plannerAssisId; + + /** 策划助理 */ + @Excel(name = "策划助理") + private String plannerAssis; + + /** 运营 */ + private Long operatorId; + + /** 运营 */ + @Excel(name = "运营") + private String operator; + + /** 推荐人 */ + @Excel(name = "推荐人") + private String recommender; + + /** 成交日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderTime; + + public void setOrderId(Long orderId) + { + this.orderId = orderId; + } + + public Long getOrderId() + { + return orderId; + } + public void setCustomer(String customer) + { + this.customer = customer; + } + + public String getCustomer() + { + return customer; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setAmount(BigDecimal amount) + { + this.amount = amount; + } + + public BigDecimal getAmount() + { + return amount; + } + public void setPayTypeId(Long payTypeId) + { + this.payTypeId = payTypeId; + } + + public Long getPayTypeId() + { + return payTypeId; + } + public void setPayType(String payType) + { + this.payType = payType; + } + + public String getPayType() + { + return payType; + } + public void setPreSaleId(Long preSaleId) + { + this.preSaleId = preSaleId; + } + + public Long getPreSaleId() + { + return preSaleId; + } + public void setPreSale(String preSale) + { + this.preSale = preSale; + } + + public String getPreSale() + { + return preSale; + } + public void setAfterSaleId(Long afterSaleId) + { + this.afterSaleId = afterSaleId; + } + + public Long getAfterSaleId() + { + return afterSaleId; + } + public void setAfterSale(String afterSale) + { + this.afterSale = afterSale; + } + + public String getAfterSale() + { + return afterSale; + } + public void setNutritionistId(Long nutritionistId) + { + this.nutritionistId = nutritionistId; + } + + public Long getNutritionistId() + { + return nutritionistId; + } + public void setNutritionist(String nutritionist) + { + this.nutritionist = nutritionist; + } + + public String getNutritionist() + { + return nutritionist; + } + public void setNutriAssisId(Long nutriAssisId) + { + this.nutriAssisId = nutriAssisId; + } + + public Long getNutriAssisId() + { + return nutriAssisId; + } + public void setNutriAssis(String nutriAssis) + { + this.nutriAssis = nutriAssis; + } + + public String getNutriAssis() + { + return nutriAssis; + } + public void setAccountId(Long accountId) + { + this.accountId = accountId; + } + + public Long getAccountId() + { + return accountId; + } + public void setAccount(String account) + { + this.account = account; + } + + public String getAccount() + { + return account; + } + public void setPlannerId(Long plannerId) + { + this.plannerId = plannerId; + } + + public Long getPlannerId() + { + return plannerId; + } + public void setPlanner(String planner) + { + this.planner = planner; + } + + public String getPlanner() + { + return planner; + } + public void setPlannerAssisId(Long plannerAssisId) + { + this.plannerAssisId = plannerAssisId; + } + + public Long getPlannerAssisId() + { + return plannerAssisId; + } + public void setPlannerAssis(String plannerAssis) + { + this.plannerAssis = plannerAssis; + } + + public String getPlannerAssis() + { + return plannerAssis; + } + public void setOperatorId(Long operatorId) + { + this.operatorId = operatorId; + } + + public Long getOperatorId() + { + return operatorId; + } + public void setOperator(String operator) + { + this.operator = operator; + } + + public String getOperator() + { + return operator; + } + public void setRecommender(String recommender) + { + this.recommender = recommender; + } + + public String getRecommender() + { + return recommender; + } + public void setOrderTime(Date orderTime) + { + this.orderTime = orderTime; + } + + public Date getOrderTime() + { + return orderTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("orderId", getOrderId()) + .append("customer", getCustomer()) + .append("phone", getPhone()) + .append("amount", getAmount()) + .append("payTypeId", getPayTypeId()) + .append("payType", getPayType()) + .append("preSaleId", getPreSaleId()) + .append("createBy", getCreateBy()) + .append("preSale", getPreSale()) + .append("createTime", getCreateTime()) + .append("afterSaleId", getAfterSaleId()) + .append("updateBy", getUpdateBy()) + .append("afterSale", getAfterSale()) + .append("updateTime", getUpdateTime()) + .append("nutritionistId", getNutritionistId()) + .append("remark", getRemark()) + .append("nutritionist", getNutritionist()) + .append("nutriAssisId", getNutriAssisId()) + .append("nutriAssis", getNutriAssis()) + .append("accountId", getAccountId()) + .append("account", getAccount()) + .append("plannerId", getPlannerId()) + .append("planner", getPlanner()) + .append("plannerAssisId", getPlannerAssisId()) + .append("plannerAssis", getPlannerAssis()) + .append("operatorId", getOperatorId()) + .append("operator", getOperator()) + .append("recommender", getRecommender()) + .append("orderTime", getOrderTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysOrderMapper.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java rename to ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysOrderMapper.java index 2897c8264..674bceb04 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/mapper/SysOrderMapper.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.custom.mapper; import java.util.List; -import com.ruoyi.system.domain.SysOrder; +import com.ruoyi.custom.domain.SysOrder; /** * 销售订单Mapper接口 - * + * * @author wonder - * @date 2020-09-23 + * @date 2020-09-24 */ -public interface SysOrderMapper +public interface SysOrderMapper { /** * 查询销售订单 - * + * * @param orderId 销售订单ID * @return 销售订单 */ @@ -21,7 +21,7 @@ public interface SysOrderMapper /** * 查询销售订单列表 - * + * * @param sysOrder 销售订单 * @return 销售订单集合 */ @@ -29,7 +29,7 @@ public interface SysOrderMapper /** * 新增销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface SysOrderMapper /** * 修改销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface SysOrderMapper /** * 删除销售订单 - * + * * @param orderId 销售订单ID * @return 结果 */ @@ -53,9 +53,9 @@ public interface SysOrderMapper /** * 批量删除销售订单 - * + * * @param orderIds 需要删除的数据ID * @return 结果 */ public int deleteSysOrderByIds(Long[] orderIds); -} +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysOrderService.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java rename to ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysOrderService.java index 828b45445..dcf29743e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysOrderService.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service; +package com.ruoyi.custom.service; import java.util.List; -import com.ruoyi.system.domain.SysOrder; +import com.ruoyi.custom.domain.SysOrder; /** * 销售订单Service接口 - * + * * @author wonder - * @date 2020-09-23 + * @date 2020-09-24 */ -public interface ISysOrderService +public interface ISysOrderService { /** * 查询销售订单 - * + * * @param orderId 销售订单ID * @return 销售订单 */ @@ -21,7 +21,7 @@ public interface ISysOrderService /** * 查询销售订单列表 - * + * * @param sysOrder 销售订单 * @return 销售订单集合 */ @@ -29,7 +29,7 @@ public interface ISysOrderService /** * 新增销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -37,7 +37,7 @@ public interface ISysOrderService /** * 修改销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -45,7 +45,7 @@ public interface ISysOrderService /** * 批量删除销售订单 - * + * * @param orderIds 需要删除的销售订单ID * @return 结果 */ @@ -53,9 +53,9 @@ public interface ISysOrderService /** * 删除销售订单信息 - * + * * @param orderId 销售订单ID * @return 结果 */ public int deleteSysOrderById(Long orderId); -} +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java rename to ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java index 71973b7e9..0e20c4abf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java @@ -1,28 +1,28 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.custom.service.impl; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.SysOrderMapper; -import com.ruoyi.system.domain.SysOrder; -import com.ruoyi.system.service.ISysOrderService; +import com.ruoyi.custom.mapper.SysOrderMapper; +import com.ruoyi.custom.domain.SysOrder; +import com.ruoyi.custom.service.ISysOrderService; /** * 销售订单Service业务层处理 - * + * * @author wonder - * @date 2020-09-23 + * @date 2020-09-24 */ @Service -public class SysOrderServiceImpl implements ISysOrderService +public class SysOrderServiceImpl implements ISysOrderService { @Autowired private SysOrderMapper sysOrderMapper; /** * 查询销售订单 - * + * * @param orderId 销售订单ID * @return 销售订单 */ @@ -34,7 +34,7 @@ public class SysOrderServiceImpl implements ISysOrderService /** * 查询销售订单列表 - * + * * @param sysOrder 销售订单 * @return 销售订单 */ @@ -46,7 +46,7 @@ public class SysOrderServiceImpl implements ISysOrderService /** * 新增销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -59,7 +59,7 @@ public class SysOrderServiceImpl implements ISysOrderService /** * 修改销售订单 - * + * * @param sysOrder 销售订单 * @return 结果 */ @@ -72,7 +72,7 @@ public class SysOrderServiceImpl implements ISysOrderService /** * 批量删除销售订单 - * + * * @param orderIds 需要删除的销售订单ID * @return 结果 */ @@ -84,7 +84,7 @@ public class SysOrderServiceImpl implements ISysOrderService /** * 删除销售订单信息 - * + * * @param orderId 销售订单ID * @return 结果 */ @@ -93,4 +93,4 @@ public class SysOrderServiceImpl implements ISysOrderService { return sysOrderMapper.deleteSysOrderById(orderId); } -} +} \ 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 new file mode 100644 index 000000000..71b579a42 --- /dev/null +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into sys_order + + 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, + + + #{customer}, + #{phone}, + #{amount}, + #{payTypeId}, + #{payType}, + #{preSaleId}, + #{createBy}, + #{preSale}, + #{createTime}, + #{afterSaleId}, + #{updateBy}, + #{afterSale}, + #{updateTime}, + #{nutritionistId}, + #{remark}, + #{nutritionist}, + #{nutriAssisId}, + #{nutriAssis}, + #{accountId}, + #{account}, + #{plannerId}, + #{planner}, + #{plannerAssisId}, + #{plannerAssis}, + #{operatorId}, + #{operator}, + #{recommender}, + #{orderTime}, + + + + + update sys_order + + customer = #{customer}, + phone = #{phone}, + amount = #{amount}, + pay_type_id = #{payTypeId}, + pay_type = #{payType}, + pre_sale_id = #{preSaleId}, + create_by = #{createBy}, + pre_sale = #{preSale}, + create_time = #{createTime}, + after_sale_id = #{afterSaleId}, + update_by = #{updateBy}, + after_sale = #{afterSale}, + update_time = #{updateTime}, + nutritionist_id = #{nutritionistId}, + remark = #{remark}, + nutritionist = #{nutritionist}, + nutri_assis_id = #{nutriAssisId}, + nutri_assis = #{nutriAssis}, + account_id = #{accountId}, + account = #{account}, + planner_id = #{plannerId}, + planner = #{planner}, + planner_assis_id = #{plannerAssisId}, + planner_assis = #{plannerAssis}, + operator_id = #{operatorId}, + operator = #{operator}, + recommender = #{recommender}, + order_time = #{orderTime}, + + where order_id = #{orderId} + + + + delete from sys_order where order_id = #{orderId} + + + + delete from sys_order where order_id in + + #{orderId} + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java deleted file mode 100644 index cc3e8be85..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOrder.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.ruoyi.system.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 销售订单对象 sys_order - * - * @author wonder - * @date 2020-09-23 - */ -public class SysOrder extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long orderId; - - /** 业务员 */ - private Long userId; - - /** 用户昵称 */ - @Excel(name = "用户昵称") - private String nickName; - - /** 金额 */ - @Excel(name = "金额") - private Long amount; - - /** 成交日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date saleTime; - - /** 销售渠道 */ - @Excel(name = "销售渠道") - private Long channelId; - - public void setOrderId(Long orderId) - { - this.orderId = orderId; - } - - public Long getOrderId() - { - return orderId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setNickName(String nickName) - { - this.nickName = nickName; - } - - public String getNickName() - { - return nickName; - } - public void setAmount(Long amount) - { - this.amount = amount; - } - - public Long getAmount() - { - return amount; - } - public void setSaleTime(Date saleTime) - { - this.saleTime = saleTime; - } - - public Date getSaleTime() - { - return saleTime; - } - public void setChannelId(Long channelId) - { - this.channelId = channelId; - } - - public Long getChannelId() - { - return channelId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("orderId", getOrderId()) - .append("userId", getUserId()) - .append("nickName", getNickName()) - .append("amount", getAmount()) - .append("saleTime", getSaleTime()) - .append("channelId", getChannelId()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml deleted file mode 100644 index c05cd3f59..000000000 --- a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select order_id, user_id, nick_name, amount, sale_time, channel_id, create_by, create_time, update_by, update_time, remark from sys_order - - - - - - - - insert into sys_order - - user_id, - nick_name, - amount, - sale_time, - channel_id, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{userId}, - #{nickName}, - #{amount}, - #{saleTime}, - #{channelId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update sys_order - - user_id = #{userId}, - nick_name = #{nickName}, - amount = #{amount}, - sale_time = #{saleTime}, - channel_id = #{channelId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where order_id = #{orderId} - - - - delete from sys_order where order_id = #{orderId} - - - - delete from sys_order where order_id in - - #{orderId} - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/order.js b/ruoyi-ui/src/api/custom/order.js similarity index 75% rename from ruoyi-ui/src/api/system/order.js rename to ruoyi-ui/src/api/custom/order.js index d15b76592..fa76f76ae 100644 --- a/ruoyi-ui/src/api/system/order.js +++ b/ruoyi-ui/src/api/custom/order.js @@ -1,53 +1,53 @@ -import request from '@/utils/request' - -// 查询销售订单列表 -export function listOrder(query) { - return request({ - url: '/system/order/list', - method: 'get', - params: query - }) -} - -// 查询销售订单详细 -export function getOrder(orderId) { - return request({ - url: '/system/order/' + orderId, - method: 'get' - }) -} - -// 新增销售订单 -export function addOrder(data) { - return request({ - url: '/system/order', - method: 'post', - data: data - }) -} - -// 修改销售订单 -export function updateOrder(data) { - return request({ - url: '/system/order', - method: 'put', - data: data - }) -} - -// 删除销售订单 -export function delOrder(orderId) { - return request({ - url: '/system/order/' + orderId, - method: 'delete' - }) -} - -// 导出销售订单 -export function exportOrder(query) { - return request({ - url: '/system/order/export', - method: 'get', - params: query - }) -} \ No newline at end of file +import request from '@/utils/request' + +// 查询销售订单列表 +export function listOrder(query) { + return request({ + url: '/custom/order/list', + method: 'get', + params: query + }) +} + +// 查询销售订单详细 +export function getOrder(orderId) { + return request({ + url: '/custom/order/' + orderId, + method: 'get' + }) +} + +// 新增销售订单 +export function addOrder(data) { + return request({ + url: '/custom/order', + method: 'post', + data: data + }) +} + +// 修改销售订单 +export function updateOrder(data) { + return request({ + url: '/custom/order', + method: 'put', + data: data + }) +} + +// 删除销售订单 +export function delOrder(orderId) { + return request({ + url: '/custom/order/' + orderId, + method: 'delete' + }) +} + +// 导出销售订单 +export function exportOrder(query) { + return request({ + url: '/custom/order/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue new file mode 100644 index 000000000..042745927 --- /dev/null +++ b/ruoyi-ui/src/views/custom/order/index.vue @@ -0,0 +1,737 @@ + + + diff --git a/ruoyi-ui/src/views/system/order/index.vue b/ruoyi-ui/src/views/system/order/index.vue deleted file mode 100644 index 49c7370ec..000000000 --- a/ruoyi-ui/src/views/system/order/index.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql index 121515d92..cdf51279b 100644 --- a/sql/ry_20200920.sql +++ b/sql/ry_20200920.sql @@ -693,7 +693,7 @@ create table sys_commision ( rule_id bigint(20) not null auto_increment comment '编号', user_id bigint(20) comment '用户ID', nick_name varchar(30) not null comment '用户昵称', - amount decimal comment '金额', + amount decimal(10,2) comment '金额', rate float comment '分成比例', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', @@ -710,11 +710,29 @@ create table sys_commision ( drop table if exists sys_order; create table sys_order ( order_id bigint(20) not null auto_increment comment '编号', - user_id bigint(20) comment '用户ID', - nick_name varchar(30) comment '用户昵称', - amount decimal comment '金额', - sale_time datetime comment '成交日期', - channel_id bigint(20) comment '销售渠道ID', + customer varchar(30) not null comment '客户姓名', + phone varchar(30) 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 '推荐人', + amount decimal(10,2) comment '金额', + order_time datetime comment '成交日期', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者',