From ffcf62c5f3fa3c8ef5f3e9c5503577fe414bee3b Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 1 Jun 2023 14:55:59 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index cbea3808..b0888995 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -296,7 +296,7 @@ public class OrderController extends BaseController { FinancialMaster fmUpdate = new FinancialMaster(); fmUpdate.setId(financialMaster.getId()); fmUpdate.setServerMoney(serverMoney); - financialMasterService.updateFinancialMaster(financialMaster); + financialMasterService.updateFinancialMaster(fmUpdate); } /** From d5847db0b9712328ffac02caae2d5f56c9d68af4 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 1 Jun 2023 21:35:06 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E5=8F=91=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/goods/standard/addTemplate.html | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index eaac00a4..5623da4a 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -247,13 +247,16 @@
- +
- +
- + +
+
+
@@ -274,7 +277,7 @@
- +
    @@ -345,12 +348,12 @@ 0
-
-
- -
-
+ + + + + +
From 3a829cae262aa5121ee00e486d5731c98678fdf7 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 1 Jun 2023 21:41:59 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=BE=85=E4=BB=98?= =?UTF-8?q?=E6=AC=BE/=E5=B7=B2=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderController.java | 1 + .../src/main/java/com/ghy/order/domain/OrderMaster.java | 2 ++ .../java/com/ghy/order/request/SysOrderAssignRequest.java | 3 +++ .../src/main/resources/mapper/order/OrderMasterMapper.xml | 8 ++++++++ 4 files changed, 14 insertions(+) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index b0888995..08c7c2ab 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -225,6 +225,7 @@ public class OrderController extends BaseController { orderMaster.setCustomerId(customer.getCustomerId()); orderMaster.setGoodsId(goods.getGoodsId()); orderMaster.setPayType(0); + orderMaster.setOrderMode(request.getOrderMode()); // 服务时间 String[] split = request.getServTime().split("-"); try { diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index d611cfbf..c496a307 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -139,4 +139,6 @@ public class OrderMaster extends BaseEntity { * 超时扣款次数 */ private Integer timeoutFineTimes; + + private String orderMode; } diff --git a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java index a7fb8ebc..5ef23d23 100644 --- a/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java +++ b/ghy-order/src/main/java/com/ghy/order/request/SysOrderAssignRequest.java @@ -47,4 +47,7 @@ public class SysOrderAssignRequest { private String servDate; private String servTime; + + private String orderMode; + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 7c99bcbe..8ffe7262 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -11,6 +11,7 @@ + @@ -38,6 +39,7 @@ customer_id, address_id, order_type, + order_mode, order_status, pay_type, pay_status, @@ -63,6 +65,7 @@ om.customer_id, om.address_id, om.order_type, + om.order_mode, om.order_status, om.pay_type, om.pay_status, @@ -82,6 +85,7 @@ FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id + LEFT JOIN financial_master fm ON om.id = fm.order_master_id -
- + 待付款 - + 已发布 @@ -79,19 +78,19 @@ 未排班 - + 待上门 - + 进行中 - + 确认审核 - + 完成 - + 关闭 @@ -305,6 +304,7 @@ var editFlag = [[${@permission.hasPermi('order:order:edit')}]]; var prefix = ctx + "order/master"; + var customParams = {}; $(function () { var panehHidden = false; @@ -414,6 +414,7 @@ var options = { url: prefix + "/list", exportUrl: prefix + "/export", + queryParams: queryParams, sortName: "createTime", sortOrder: "desc", modalName: "订单", @@ -520,6 +521,12 @@ $.table.init(options); } + function queryParams(params) { + var search = $.table.queryParams(params); + Object.assign(search, customParams) + return search; + } + function detail(id) { var url = "order/goods?orderId=" + id; $.modal.open("商品信息", url); @@ -539,8 +546,8 @@ }); } - function searchByOrderStatus(orderStatus) { - $('#orderStatus').val(orderStatus); + function searchOrderList(params) { + customParams = params; $.table.search(); } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index c496a307..2f9346f7 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -141,4 +141,6 @@ public class OrderMaster extends BaseEntity { private Integer timeoutFineTimes; private String orderMode; + + private Integer sysPayStatus; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 8ffe7262..2874b1f1 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -135,6 +135,12 @@ AND ( (om.order_mode in ('01','03','04')) OR (om.order_mode = '02' and fm.pay_status = 1) ) + + AND fm.pay_status = #{sysPayStatus} + + + AND om.order_mode = #{orderMode} + AND g.dept_goods_category_id = #{goodsCategoryId} From 8ad615c8b7499e5245342e250cd6c39e544eccfa Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 1 Jun 2023 23:40:19 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=BE=85=E4=BB=98?= =?UTF-8?q?=E6=AC=BE/=E5=B7=B2=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index f1b6ff73..cdbf22b3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -123,7 +123,7 @@ public class OrderMasterController extends BaseController { @GetMapping("/payQrcode/{orderId}") public String payQrcode(@PathVariable("orderId") String orderId, ModelMap mmap) { mmap.put("orderId", orderId); - return "/order/master-qrcode"; + return "order/master-qrcode"; } @GetMapping("/pc") From 5b54770a4088996bffcf382611db911b6e3c30f7 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sun, 4 Jun 2023 01:40:36 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E6=9C=AA=E7=BA=A6=E6=9C=AA=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderCallRecordController.java | 136 ++++++++++++++++++ .../order/OrderMasterController.java | 31 ++-- .../com/ghy/order/domain/OrderCallRecord.java | 36 +++++ .../com/ghy/order/domain/OrderMaster.java | 6 + .../order/mapper/OrderCallRecordMapper.java | 63 ++++++++ .../service/IOrderCallRecordService.java | 62 ++++++++ .../impl/OrderCallRecordServiceImpl.java | 96 +++++++++++++ .../mapper/order/OrderCallRecordMapper.xml | 67 +++++++++ .../mapper/order/OrderMasterMapper.xml | 14 +- 9 files changed, 501 insertions(+), 10 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java create mode 100644 ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java create mode 100644 ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java create mode 100644 ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java create mode 100644 ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java new file mode 100644 index 00000000..985bfab5 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java @@ -0,0 +1,136 @@ +package com.ghy.web.controller.order; + +import java.util.List; +import com.ghy.order.domain.OrderCallRecord; +import com.ghy.order.service.IOrderCallRecordService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ghy.common.annotation.Log; +import com.ghy.common.enums.BusinessType; +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.utils.poi.ExcelUtil; +import com.ghy.common.core.page.TableDataInfo; + +/** + * 订单约单记录Controller + * + * @author clunt + * @date 2023-06-04 + */ +@Controller +@RequestMapping("/order/record") +public class OrderCallRecordController extends BaseController +{ + private String prefix = "order/record"; + + @Autowired + private IOrderCallRecordService orderCallRecordService; + + @RequiresPermissions("worker:record:view") + @GetMapping() + public String record() + { + return prefix + "/record"; + } + + /** + * 查询订单约单记录列表 + */ + @RequiresPermissions("worker:record:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(OrderCallRecord orderCallRecord) + { + startPage(); + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + return getDataTable(list); + } + + /** + * App查询订单约单记录列表 + */ + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody OrderCallRecord orderCallRecord) + { + startPage(); + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + return getDataTable(list); + } + + + /** + * 导出订单约单记录列表 + */ + @RequiresPermissions("worker:record:export") + @Log(title = "订单约单记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(OrderCallRecord orderCallRecord) + { + List list = orderCallRecordService.selectOrderCallRecordList(orderCallRecord); + ExcelUtil util = new ExcelUtil(OrderCallRecord.class); + return util.exportExcel(list, "订单约单记录数据"); + } + + /** + * 新增订单约单记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存订单约单记录 + */ + @RequiresPermissions("worker:record:add") + @Log(title = "订单约单记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(OrderCallRecord orderCallRecord) + { + return toAjax(orderCallRecordService.insertOrderCallRecord(orderCallRecord)); + } + + /** + * 修改订单约单记录 + */ + @RequiresPermissions("worker:record:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + OrderCallRecord orderCallRecord = orderCallRecordService.selectOrderCallRecordById(id); + mmap.put("orderCallRecord", orderCallRecord); + return prefix + "/edit"; + } + + /** + * 修改保存订单约单记录 + */ + @RequiresPermissions("worker:record:edit") + @Log(title = "订单约单记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(OrderCallRecord orderCallRecord) + { + return toAjax(orderCallRecordService.updateOrderCallRecord(orderCallRecord)); + } + + /** + * 删除订单约单记录 + */ + @RequiresPermissions("worker:record:remove") + @Log(title = "订单约单记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(orderCallRecordService.deleteOrderCallRecordByIds(ids)); + } +} diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index cdbf22b3..c29b7b56 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -24,14 +24,8 @@ import com.ghy.goods.service.GoodsAreaService; import com.ghy.goods.service.GoodsImgsService; import com.ghy.goods.service.GoodsService; import com.ghy.goods.service.GoodsStandardService; -import com.ghy.order.domain.AfterServiceRecord; -import com.ghy.order.domain.OrderDetail; -import com.ghy.order.domain.OrderGoods; -import com.ghy.order.domain.OrderMaster; -import com.ghy.order.service.IAfterServiceRecordService; -import com.ghy.order.service.OrderDetailService; -import com.ghy.order.service.OrderGoodsService; -import com.ghy.order.service.OrderMasterService; +import com.ghy.order.domain.*; +import com.ghy.order.service.*; import com.ghy.payment.domain.FinancialChangeRecord; import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialMaster; @@ -110,6 +104,8 @@ public class OrderMasterController extends BaseController { private IAfterServiceRecordService afterServiceRecordService; @Resource private FinancialChangeRecordService financialChangeRecordService; + @Autowired + private IOrderCallRecordService orderCallRecordService; @RequiresPermissions("order:master:view") @GetMapping() @@ -726,6 +722,25 @@ public class OrderMasterController extends BaseController { } } + @PostMapping("/callCustomer") + @ResponseBody + public AjaxResult callCustomer(@RequestBody OrderMaster orderMaster) { + try { + int i = orderMasterService.updateOrderMaster(orderMaster); + if(i > 0){ + OrderCallRecord param = new OrderCallRecord(); + param.setOrderId(orderMaster.getId()); + param.setCallTime(new Date()); + param.setOrderType("01"); + orderCallRecordService.insertOrderCallRecord(param); + } + return AjaxResult.success(); + } catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error(); + } + } + /** * 校验主订单编码 */ diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java new file mode 100644 index 00000000..d080c14c --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java @@ -0,0 +1,36 @@ +package com.ghy.order.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; + +/** + * 订单约单记录对象 order_call_record + * + * @author clunt + * @date 2023-06-04 + */ +@Data +public class OrderCallRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 订单号 */ + @Excel(name = "订单号") + private Long orderId; + + /** 订单类型 01.主单 02.子单 */ + @Excel(name = "订单类型 01.主单 02.子单") + private String orderType; + + /** 联系时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date callTime; + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 2f9346f7..427dc6e4 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -143,4 +143,10 @@ public class OrderMaster extends BaseEntity { private String orderMode; private Integer sysPayStatus; + + /** + * 是否约单 + * */ + private String isCall; + } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java new file mode 100644 index 00000000..76925acb --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderCallRecordMapper.java @@ -0,0 +1,63 @@ +package com.ghy.order.mapper; + +import com.ghy.order.domain.OrderCallRecord; + +import java.util.List; + +/** + * 订单约单记录Mapper接口 + * + * @author clunt + * @date 2023-06-04 + */ +public interface OrderCallRecordMapper +{ + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + public OrderCallRecord selectOrderCallRecordById(Long id); + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录集合 + */ + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord); + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int insertOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int updateOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 删除订单约单记录 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + public int deleteOrderCallRecordById(Long id); + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOrderCallRecordByIds(String[] ids); + +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java b/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java new file mode 100644 index 00000000..3b41a67f --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/service/IOrderCallRecordService.java @@ -0,0 +1,62 @@ +package com.ghy.order.service; + +import com.ghy.order.domain.OrderCallRecord; + +import java.util.List; + +/** + * 订单约单记录Service接口 + * + * @author clunt + * @date 2023-06-04 + */ +public interface IOrderCallRecordService +{ + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + public OrderCallRecord selectOrderCallRecordById(Long id); + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录集合 + */ + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord); + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int insertOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + public int updateOrderCallRecord(OrderCallRecord orderCallRecord); + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的订单约单记录主键集合 + * @return 结果 + */ + public int deleteOrderCallRecordByIds(String ids); + + /** + * 删除订单约单记录信息 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + public int deleteOrderCallRecordById(Long id); +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java new file mode 100644 index 00000000..e72972c0 --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderCallRecordServiceImpl.java @@ -0,0 +1,96 @@ +package com.ghy.order.service.impl; + +import java.util.List; + +import com.ghy.order.domain.OrderCallRecord; +import com.ghy.order.mapper.OrderCallRecordMapper; +import com.ghy.order.service.IOrderCallRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ghy.common.core.text.Convert; + +/** + * 订单约单记录Service业务层处理 + * + * @author clunt + * @date 2023-06-04 + */ +@Service +public class OrderCallRecordServiceImpl implements IOrderCallRecordService +{ + @Autowired + private OrderCallRecordMapper orderCallRecordMapper; + + /** + * 查询订单约单记录 + * + * @param id 订单约单记录主键 + * @return 订单约单记录 + */ + @Override + public OrderCallRecord selectOrderCallRecordById(Long id) + { + return orderCallRecordMapper.selectOrderCallRecordById(id); + } + + /** + * 查询订单约单记录列表 + * + * @param orderCallRecord 订单约单记录 + * @return 订单约单记录 + */ + @Override + public List selectOrderCallRecordList(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.selectOrderCallRecordList(orderCallRecord); + } + + /** + * 新增订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + @Override + public int insertOrderCallRecord(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.insertOrderCallRecord(orderCallRecord); + } + + /** + * 修改订单约单记录 + * + * @param orderCallRecord 订单约单记录 + * @return 结果 + */ + @Override + public int updateOrderCallRecord(OrderCallRecord orderCallRecord) + { + return orderCallRecordMapper.updateOrderCallRecord(orderCallRecord); + } + + /** + * 批量删除订单约单记录 + * + * @param ids 需要删除的订单约单记录主键 + * @return 结果 + */ + @Override + public int deleteOrderCallRecordByIds(String ids) + { + return orderCallRecordMapper.deleteOrderCallRecordByIds(Convert.toStrArray(ids)); + } + + /** + * 删除订单约单记录信息 + * + * @param id 订单约单记录主键 + * @return 结果 + */ + @Override + public int deleteOrderCallRecordById(Long id) + { + return orderCallRecordMapper.deleteOrderCallRecordById(id); + } + +} \ No newline at end of file diff --git a/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml new file mode 100644 index 00000000..876ea0d8 --- /dev/null +++ b/ghy-order/src/main/resources/mapper/order/OrderCallRecordMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + select id, order_id, order_type, call_time from order_call_record + + + + + + + + insert into order_call_record + + order_id, + order_type, + call_time, + + + #{orderId}, + #{orderType}, + #{callTime}, + + + + + update order_call_record + + order_id = #{orderId}, + order_type = #{orderType}, + call_time = #{callTime}, + + where id = #{id} + + + + delete from order_call_record where id = #{id} + + + + delete from order_call_record where id in + + #{id} + + + + \ No newline at end of file diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 2874b1f1..66b35d78 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -30,6 +30,7 @@ + @@ -55,7 +56,8 @@ all_self_assigned, goods_id, timeout_, - timeout_fine_times + timeout_fine_times, + is_call FROM order_master @@ -81,7 +83,8 @@ om.all_self_assigned, om.goods_id, om.timeout_, - om.timeout_fine_times + om.timeout_fine_times, + om.is_call FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id @@ -177,6 +180,9 @@ AND om.timeout_ = #{timeout} + + AND om.ic_call = #{isCall} + order by om.create_time @@ -239,6 +245,9 @@ AND om.id in (${orderMasterIds}) + + AND om.ic_call = #{isCall} + @@ -280,6 +289,7 @@ all_self_assigned = #{allSelfAssigned}, all_self_assigned = null, has_dispatched_all = #{hasDispatchedAll}, + is_call = #{isCall}, update_time = SYSDATE() WHERE id = #{id} From de669894fc344b14bb56d525813043341d8d448f Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 4 Jun 2023 01:57:21 +0800 Subject: [PATCH 07/28] feat --- .../templates/goods/standard/addTemplate.html | 4 +- .../resources/templates/order/pc-master.html | 172 +++--------------- .../mapper/order/OrderMasterMapper.xml | 4 +- 3 files changed, 31 insertions(+), 149 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 5623da4a..8abb6c3e 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -586,7 +586,9 @@ contentType: 'application/json', success: function (result) { if (result.code == web_status.SUCCESS) { - $.modal.msgSuccess("提交成功") + $.modal.confirm('发单成功，是否前往发单管理？', function() { + $.modal.parentTab('发单管理', 'order/master/pc'); + }) } else { $.modal.msgError("请求失败") } diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 8c32b207..9111233d 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -50,6 +50,12 @@ .long-input { width: 400px; } + + .active-condition-btn { + background-color: #1c84c6; + border-color: #1c84c6; + color: #fff; + } @@ -61,56 +67,50 @@
-
+
- + 待付款 - + 已发布 - + 未约时 - + 未排班 - + 待上门 - + 进行中 - + 确认审核 - + 完成 - + 关闭 - + 今日待上门 - + 明日待上门 - + 售后 - + 急报中 - - 退单 - - - 售后纠纷 -
@@ -122,42 +122,6 @@
-
- 创建时间： -
- - -
- 至 -
- - -
-
-
- 服务时间： -
- - -
- 至 -
- - -
-
-
- 完成时间： -
- - -
- 至 -
- - -
-
类别筛选：
@@ -167,61 +131,6 @@
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- - - - -
-
- - -
@@ -233,41 +142,6 @@ class="fa fa-refresh"> 重置
-
- - 新订单 - - - 接单超时 - - - 约单超时 - - - 排单超时 - - - 无法排单 - - - 待上门超时 - - - 进行超时 - - - 售后超时 - - - 客诉中 - - - 审核中 - - - 一票价未改价 - -
@@ -546,6 +420,12 @@ }); } + function selectConditionBtn(e, params) { + $('.condition-btn .btn').removeClass('active-condition-btn'); + $(e).addClass('active-condition-btn'); + searchOrderList(params) + } + function searchOrderList(params) { customParams = params; $.table.search(); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 66b35d78..7bb03c12 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -181,7 +181,7 @@ AND om.timeout_ = #{timeout} - AND om.ic_call = #{isCall} + AND om.is_call = #{isCall} order by om.create_time @@ -246,7 +246,7 @@ AND om.id in (${orderMasterIds}) - AND om.ic_call = #{isCall} + AND om.is_call = #{isCall} From 0d6a963959f9684b32a8c31578545e6dd10fb0df Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 4 Jun 2023 23:40:38 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E5=8F=91=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E7=BA=A6=E6=9C=AA=E6=8E=92=E6=8C=89=E9=92=AE=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=B8=BA=E5=B7=B2=E6=8E=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/order/pc-master.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 9111233d..3e221ecb 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -78,12 +78,15 @@ 已发布 - - 未约时 - - - 未排班 + + 已接单 + + + + + + 待上门 From 009c391e44c50d2b3541a8dc6a9b968fe783ace3 Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 5 Jun 2023 00:56:03 +0800 Subject: [PATCH 09/28] fix --- .../ghy/web/controller/order/OrderMasterController.java | 2 ++ .../main/java/com/ghy/web/pojo/vo/OrderListResponse.java | 2 ++ .../src/main/java/com/ghy/order/domain/OrderMaster.java | 1 + .../src/main/resources/mapper/order/OrderMasterMapper.xml | 7 +++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c29b7b56..2cd1e492 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -218,6 +218,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setTimeout(master.getTimeout()); orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes()); orderListResponse.setAfterServiceRecordList(afterServiceRecords); + orderListResponse.setServerMoney(master.getServerMoney()); orderListResponses.add(orderListResponse); }); @@ -591,6 +592,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setTimeoutFineTimes(orderMaster.getTimeoutFineTimes()); orderListResponse.setFinalRecvMoney(finalRecvMoney); orderListResponse.setGoodsAreaList(goods.getGoodsAreaList()); + orderListResponse.setOrderMode(orderMaster.getOrderMode()); return AjaxResult.success(orderListResponse); } catch (Exception e) { diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 29843eed..026c8b62 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -147,4 +147,6 @@ public class OrderListResponse { * 超时扣款次数 */ private Integer timeoutFineTimes; + + private String orderMode; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 427dc6e4..e7f7be28 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -149,4 +149,5 @@ public class OrderMaster extends BaseEntity { * */ private String isCall; + private BigDecimal serverMoney; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 7bb03c12..54331221 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -31,6 +31,7 @@ + @@ -57,7 +58,8 @@ goods_id, timeout_, timeout_fine_times, - is_call + is_call, + order_mode FROM order_master @@ -84,7 +86,8 @@ om.goods_id, om.timeout_, om.timeout_fine_times, - om.is_call + om.is_call, + fm.server_money FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id From d65dedb62d0b6237d94834b08a68895de1f49427 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 7 Jun 2023 23:24:58 +0800 Subject: [PATCH 10/28] feat --- .../order/OrderMasterController.java | 12 ++ .../templates/goods/standard/addTemplate.html | 141 ++++++++++-------- .../resources/templates/order/pc-master.html | 132 +++++++++++++++- .../ghy/order/domain/OrderMasterCount.java | 23 +++ .../ghy/order/mapper/OrderMasterMapper.java | 3 + .../ghy/order/service/OrderMasterService.java | 3 + .../service/impl/OrderMasterServiceImpl.java | 6 + .../mapper/order/OrderMasterMapper.xml | 35 ++++- 8 files changed, 287 insertions(+), 68 deletions(-) create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 2cd1e492..c2103bd5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -875,4 +875,16 @@ public class OrderMasterController extends BaseController { int i = orderMasterService.reject(orderMaster); return AjaxResult.success(i); } + + @GetMapping("/differentStatus/count") + @ResponseBody + public AjaxResult differentStatusOrderCount() { + return AjaxResult.success(orderMasterService.differentStatusOrderCount()); + } + + @GetMapping("/count") + @ResponseBody + public AjaxResult OrderMasterCount(OrderMaster orderMaster) { + return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); + } } diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 8abb6c3e..c862e36f 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -2,6 +2,7 @@ + + + + + + + + + +
+
+
+
+
+ +
+ +
×
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index 14517cab..379fc92e 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -177,4 +177,6 @@ public class OrderDetail extends BaseEntity { private List workerIds; + private List masterIds; + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index beb7957a..431b9a1a 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -135,6 +135,12 @@ #{workerId} + + AND od.order_master_id in + + #{masterId} + + AND g.dept_goods_category_id = #{goodsCategoryId} From d11dfdc04d0ca357d1717de958534529665ba1b5 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 14 Jun 2023 23:16:28 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E5=88=9D=E7=89=88...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/order/master.html | 17 +- .../templates/order/orderWorker.html | 212 ++---------------- 2 files changed, 18 insertions(+), 211 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 4dc77cb3..f0cbd384 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -384,22 +384,7 @@ function showOrderWorker(id) { var url = "/order/detail/orderWorker/" + id; - layer.open({ - type: 2, - area: ['600px', '360px'], - fix: false, - //不固定 - maxmin: true, - shade: 0.3, - title: '指派师傅', - content: url, - btn: ['关闭'], - // 弹层外区域关闭 - shadeClose: true, - cancel: function(index) { - return true; - } - }); + $.modal.open("指派师傅", url, '800', '300'); } function selectRegion(regionLevelName, nextRegionLevelName) { diff --git a/ghy-admin/src/main/resources/templates/order/orderWorker.html b/ghy-admin/src/main/resources/templates/order/orderWorker.html index e5920b97..23b5f21f 100644 --- a/ghy-admin/src/main/resources/templates/order/orderWorker.html +++ b/ghy-admin/src/main/resources/templates/order/orderWorker.html @@ -1,210 +1,32 @@ - - - - - -
-
-
-
-
- -
- -
×
-
- -
-
-
- -
- -
-
-
+ +
+
+ +
+ +
+ +
-
-
-
-
+
-
- - - - From 043d8cf9f9e2d46f7736a97bf6303bdd142098dd Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 15 Jun 2023 00:17:23 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderDetailController.java | 60 +++- .../ghy/web/pojo/vo/OrderListResponse.java | 3 + .../resources/templates/order/master.html | 316 ++++++++++++++---- .../resources/templates/order/pc-master.html | 13 +- .../java/com/ghy/order/domain/OrderCount.java | 25 ++ .../com/ghy/order/domain/OrderDetail.java | 21 +- .../ghy/order/domain/OrderDetailCount.java | 12 + .../ghy/order/domain/OrderMasterCount.java | 13 +- .../ghy/order/mapper/OrderDetailMapper.java | 3 + .../ghy/order/service/OrderDetailService.java | 6 +- .../service/impl/OrderDetailServiceImpl.java | 5 + .../mapper/order/OrderDetailMapper.xml | 46 +++ 12 files changed, 441 insertions(+), 82 deletions(-) create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderCount.java create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderDetailCount.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index ee0424e5..e7df2abd 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -112,6 +112,10 @@ public class OrderDetailController extends BaseController { @PostMapping("/list") @ResponseBody public TableDataInfo list(OrderDetail orderDetail) { + if (orderDetail.getSearchAfterList() !=null && orderDetail.getSearchAfterList()) { + return this.afterServiceList(orderDetail); + } + if(StringUtils.isNotEmpty(orderDetail.getWorkerName()) || StringUtils.isNotEmpty(orderDetail.getWorkerPhone())){ Worker param = new Worker(); param.setName(orderDetail.getWorkerName()); @@ -150,7 +154,7 @@ public class OrderDetailController extends BaseController { List financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); Map financialMasterMap = financialMasters .stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); - + Set orderDetailIds = orderDetails.stream().map(OrderDetail::getId).collect(Collectors.toSet()); Map financialDetailMap = financialDetailService.selectByOrderDetailIds(orderDetailIds) .stream().collect(Collectors.toMap(FinancialDetail::getOrderDetailId, x -> x, (x, y) -> y)); @@ -599,6 +603,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderMasterId(detail.getOrderMasterId()); orderListResponse.setOrderMasterCode(detail.getOrderMasterCode()); + orderListResponse.setGoods(goods); orderListResponse.setGoodsName(goods.getGoodsName()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); orderListResponse.setDiscountMoney(financialDetail.getDiscountMoney()); @@ -995,4 +1000,57 @@ public class OrderDetailController extends BaseController { int i = orderDetailService.insertOrderAddSubtract(body); return AjaxResult.success(i); } + + @GetMapping("/differentStatus/count") + @ResponseBody + public AjaxResult differentStatusOrderCount(OrderDetail orderDetail) { + return AjaxResult.success(orderDetailService.differentStatusOrderCount(orderDetail)); + } + + @GetMapping("/count") + @ResponseBody + public AjaxResult OrderDetailCount(OrderDetail orderDetail) { + if(StringUtils.isNotEmpty(orderDetail.getWorkerName()) || StringUtils.isNotEmpty(orderDetail.getWorkerPhone())){ + Worker param = new Worker(); + param.setName(orderDetail.getWorkerName()); + param.setPhone(orderDetail.getWorkerPhone()); + List workList = workerService.getWorkList(param); + List ids = workList.stream().map(Worker::getWorkerId).collect(Collectors.toList()); + orderDetail.setWorkerIds(ids); + if(CollectionUtils.isEmpty(ids)){ + return AjaxResult.success(0); + } + } + if(orderDetail.getSysPayStatus() != null){ + FinancialMaster param = new FinancialMaster(); + param.setPayStatus(orderDetail.getSysPayStatus()); + List financialMasters = financialMasterService.selectFinancialMasterList(param); + List masterIds = financialMasters.stream().map(FinancialMaster::getOrderMasterId).collect(Collectors.toList()); + orderDetail.setMasterIds(masterIds); + if(CollectionUtils.isEmpty(masterIds)){ + return AjaxResult.success(0); + } + } + if (this.getSysUser().getDept().getParentId() != 101) { + orderDetail.setDeptId(this.getSysUser().getDept().getParentId()); + } + return AjaxResult.success(orderDetailService.countOrderDetailList(orderDetail)); + } + + @GetMapping("/after/count") + @ResponseBody + public AjaxResult AfterDetailOrderCount(OrderDetail orderDetail) { + AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); + afterServiceRecord.setExcludeAfterServiceFinished(Boolean.TRUE); + List afterServiceRecordList = afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); + // 踢重后的子单ids + List detailIds = afterServiceRecordList.stream().map(AfterServiceRecord::getOrderDetailId).distinct().collect(Collectors.toList()); + String ids = StringUtils.join(detailIds, ","); + if (StringUtils.isNotEmpty(ids)) { + orderDetail.setOrderDetailIds(ids); + } else { + orderDetail.setOrderDetailIds("0"); + } + return AjaxResult.success(orderDetailService.countOrderDetailList(orderDetail)); + } } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 026c8b62..2b13db58 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -2,6 +2,7 @@ package com.ghy.web.pojo.vo; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ghy.goods.domain.Goods; import com.ghy.goods.domain.GoodsArea; import com.ghy.order.domain.AfterServiceRecord; import com.ghy.payment.domain.FinancialChangeRecord; @@ -149,4 +150,6 @@ public class OrderListResponse { private Integer timeoutFineTimes; private String orderMode; + + private Goods goods; } diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 4dc77cb3..6afe8aa7 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -50,6 +50,12 @@ .long-input { width: 400px; } + + .active-condition-btn { + background-color: #1c84c6; + border-color: #1c84c6; + color: #fff; + } @@ -62,55 +68,62 @@ - -
- - -
+ + + +
- +
- +
- +
- -
-
- - - +
+ + + + + + + + +
+
-  搜索 -  重置
-
- +
+ 新订单 + (0) - + 接单超时 + (0) - + 约单超时 + (0) - + 排单超时 + (0) - + 无法排单 + (0) - + 待上门超时 + (0) - + 进行超时 + (0) - + 售后超时 + (0) - + 客诉中 + (0) - + 审核中 + (0) - + 一票价未改价 + (0)
@@ -304,6 +328,7 @@ var editFlag = [[${@permission.hasPermi('order:order:edit')}]]; var prefix = ctx + "order/detail"; + var customParams = {}; $(function () { var panehHidden = false; @@ -367,6 +392,110 @@ }) changeOrderMode(); + + + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/differentStatus/count', + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#newOrderNum').text(result.data.newOrderNum); + $('#acceptedOrderNum').text(result.data.acceptedOrderNum); + $('#canceledOrderNum').text(result.data.canceledOrderNum); + $('.confirmingOrderNum').text(result.data.confirmingOrderNum); + $('#finishedOrderNum').text(result.data.finishedOrderNum); + $('#servingOrderNum').text(result.data.servingOrderNum); + $('#waitForDoorOrderNum').text(result.data.waitForDoorOrderNum); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + + + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/differentStatus/count', + data: {timeout: 1}, + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#newTimeoutOrderNum').text(result.data.newOrderNum); + $('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum); + $('#servingTimeoutOrderNum').text(result.data.servingOrderNum); + $('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + + + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/count', + data: {sysPayStatus: 0}, + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#nonPaidOrderNum').text(result.data); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + + + var date = new Date(); + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/count', + data: { + orderStatus: 2, + expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00", + expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59" + }, + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#todayOrderNum').text(result.data); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/count', + data: { + orderStatus: 2, + expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 00:00:00", + expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 23:59:59" + }, + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#tomorrowOrderNum').text(result.data); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) + + + $.ajax({ + type: "GET", + dataType:"json", + url: prefix + '/after/count', + success: function (result) { + if (result.code == web_status.SUCCESS) { + $('#afterServiceOrderNum').text(result.data); + } else { + $.modal.msgError("数据加载错误，请重试！") + } + } + }) }); function changeOrderMode(orderMode) { @@ -433,6 +562,7 @@ var options = { url: prefix + "/list", exportUrl: prefix + "/export", + queryParams: queryParams, sortName: "createTime", sortOrder: "desc", modalName: "订单", @@ -544,6 +674,12 @@ $.table.init(options); } + function queryParams(params) { + var search = $.table.queryParams(params); + Object.assign(search, customParams) + return search; + } + function detail(id) { var url = "order/goods?orderId=" + id; $.modal.open("商品信息", url); @@ -563,8 +699,66 @@ }); } - function searchByOrderStatus(orderStatus) { - $('#orderStatus').val(orderStatus); + function changeConditionBtnChosenStyle(e) { + $('.condition-btn .btn').removeClass('active-condition-btn'); + if (e) { + $(e).addClass('active-condition-btn'); + } + } + + function selectConditionBtn(e, params = {}) { + changeConditionBtnChosenStyle(e); + searchOrderList(params) + } + + function selectOnDoorOrderToday(e) { + changeConditionBtnChosenStyle(e); + var date = new Date(); + selectConditionBtn(e, { + orderStatus: 2, + expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00", + expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59" + }) + } + + function selectOnDoorOrderTomorrow(e) { + changeConditionBtnChosenStyle(e); + var date = new Date(); + selectConditionBtn(e, { + orderStatus: 2, + expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 00:00:00", + expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate() + 1) + " 23:59:59" + }) + } + + function searchOrderList(params) { + customParams = params; + $.table.search(); + } + + function searchByForm() { + let params = { + createTimeStart: $('#createTimeStart').val() ? $('#createTimeStart').val() + " 00:00:00" : undefined, + createTimeEnd: $('#createTimeEnd').val() ? $('#createTimeEnd').val() + " 23:59:59" : undefined, + workBeginTimeStart: $('#workBeginTimeStart').val(), + workBeginTimeEnd: $('#workBeginTimeEnd').val() ? $('#workBeginTimeEnd').val() + " 23:59:59" : undefined, + workFinishTimeStart: $('#workFinishTimeStart').val(), + workFinishTimeEnd: $('#workFinishTimeEnd').val() ? $('#workFinishTimeEnd').val() + " 23:59:59" : undefined, + storeName: $('#storeName').val(), + storePhone: $('#storePhone').val(), + workerName: $('#workerName').val(), + workerPhone: $('#workerPhone').val(), + keyWords: $('#keyWords').val() + } + + customParams = Object.assign(customParams, params); + $.table.search(); + } + + function resetForm() { + $.form.reset(); + customParams = {}; + changeConditionBtnChosenStyle(); $.table.search(); } diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 043f5ef2..3154d5ed 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -118,11 +118,11 @@ 明日待上门 (0) - + 售后 (0) - + 急报中 (0) @@ -153,7 +153,7 @@
 搜索 -  重置
@@ -555,6 +555,13 @@ $.table.search(); } + function resetForm() { + $.form.reset(); + customParams = {}; + changeConditionBtnChosenStyle(); + $.table.search(); + } + function showPayQrcode(id) { var url = "payQrcode/" + id; diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderCount.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderCount.java new file mode 100644 index 00000000..6af1608a --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderCount.java @@ -0,0 +1,25 @@ +package com.ghy.order.domain; + +import lombok.Data; + +/** + * @description: 订单通用统计实体 + * @author: yangdanqi + * @date: 2023/6/14 + */ +@Data +public class OrderCount { + private Integer newOrderNum; + + private Integer acceptedOrderNum; + + private Integer waitForDoorOrderNum; + + private Integer servingOrderNum; + + private Integer confirmingOrderNum; + + private Integer finishedOrderNum; + + private Integer canceledOrderNum; +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index 379fc92e..03a42d57 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -8,8 +8,10 @@ import com.ghy.common.enums.PayTypeEnum; import com.ghy.goods.domain.Goods; import com.ghy.worker.domain.Worker; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -45,11 +47,11 @@ public class OrderDetail extends BaseEntity { @Excel(name = "消费者电话", cellType = Excel.ColumnType.STRING) private String customerPhone; - + private String addressPhone; private String addressName; - + private String address; @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC) @@ -179,4 +181,19 @@ public class OrderDetail extends BaseEntity { private List masterIds; + private Boolean searchAfterList; + + private Date workBeginTimeStart; + + private Date workBeginTimeEnd; + + private Date workFinishTimeStart; + + private Date workFinishTimeEnd; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeStart; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTimeEnd; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailCount.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailCount.java new file mode 100644 index 00000000..39a324af --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailCount.java @@ -0,0 +1,12 @@ +package com.ghy.order.domain; + +import lombok.Data; + +/** + * @description: 子单统计实体 + * @author: yangdanqi + * @date: 2023/6/14 + */ +@Data +public class OrderDetailCount extends OrderCount { +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java index b3a0552e..812295cf 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java @@ -8,16 +8,5 @@ import lombok.Data; * @date: 2023/6/7 */ @Data -public class OrderMasterCount { - private Integer acceptedOrderNum; - - private Integer waitForDoorOrderNum; - - private Integer servingOrderNum; - - private Integer confirmingOrderNum; - - private Integer finishedOrderNum; - - private Integer canceledOrderNum; +public class OrderMasterCount extends OrderCount { } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java index 97ff8196..bd314047 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java @@ -1,6 +1,7 @@ package com.ghy.order.mapper; import com.ghy.order.domain.OrderDetail; +import com.ghy.order.domain.OrderDetailCount; import com.ghy.order.domain.OrderStatusCount; import org.apache.ibatis.annotations.Param; @@ -114,4 +115,6 @@ public interface OrderDetailMapper { @Param("drawCashTime") Date drawCashTime, @Param("arrivalTime") Date arrivalTime); int deleteByMaster(Long masterId); + + OrderDetailCount differentStatusOrderCount(OrderDetail orderDetail); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java index 0a903973..9db2bf5f 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java @@ -1,9 +1,7 @@ package com.ghy.order.service; import com.ghy.common.enums.OrderStatus; -import com.ghy.order.domain.OrderAddSubtract; -import com.ghy.order.domain.OrderDetail; -import com.ghy.order.domain.OrderStatusCount; +import com.ghy.order.domain.*; import com.ghy.payment.domain.FinancialChangeRecord; import com.huifu.adapay.core.exception.BaseAdaPayException; @@ -186,4 +184,6 @@ public interface OrderDetailService { * @return 1 */ int insertOrderAddSubtract(OrderAddSubtract body); + + OrderDetailCount differentStatusOrderCount(OrderDetail orderDetail); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 70cd084b..367e17eb 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -849,4 +849,9 @@ public class OrderDetailServiceImpl implements OrderDetailService { insert.setPayType(body.getPayType()); return orderAddSubtractMapper.insert(insert); } + + @Override + public OrderDetailCount differentStatusOrderCount(OrderDetail orderDetail) { + return orderDetailMapper.differentStatusOrderCount(orderDetail); + } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 431b9a1a..0a620a2b 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -156,6 +156,24 @@ AND od.expect_time_end <= #{expectTimeEnd} + + AND od.create_time >= #{createTimeStart} + + + AND od.create_time <= #{createTimeEnd} + + + AND od.work_finish_time >= #{workFinishTimeStart} + + + AND od.work_finish_time <= #{workFinishTimeEnd} + + + AND od.work_begin_time >= #{workBeginTimeStart} + + + AND od.work_begin_time <= #{workBeginTimeEnd} + AND od.id in ( ${orderDetailIds} ) @@ -248,6 +266,18 @@ #{drawCashStatus} + + AND od.timeout_ = #{timeout} + + + AND od.order_master_id in + + #{masterId} + + + + AND od.id in ( ${orderDetailIds} ) + order by od.create_time @@ -412,4 +442,20 @@ update_time = NOW() WHERE draw_cash_id = #{drawCashId} + + From 316de8d63e353812927aca92ece000abe8c8127d Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 15 Jun 2023 00:34:18 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E6=8C=87=E6=B4=BE500=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 2 +- ghy-admin/src/main/resources/templates/order/master.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index e7df2abd..b8a176fe 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -681,7 +681,7 @@ public class OrderDetailController extends BaseController { List workList = workerService.getWorkList(new Worker()); mmap.put("orderId", orderId); mmap.put("workers", workList); - return "/order/orderWorker"; + return "order/orderWorker"; } /** diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index c0d26764..c517a62c 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -512,7 +512,7 @@ } function showOrderWorker(id) { - var url = "/order/detail/orderWorker/" + id; + var url = "order/detail/orderWorker/" + id; $.modal.open("指派师傅", url, '800', '300'); } From d1634edfcb505723da3e3a1aad58a2cad75ea1e1 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Fri, 16 Jun 2023 21:23:11 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E4=B8=BB=E5=8D=95+=E4=B8=BB=E5=8D=95?= =?UTF-8?q?=E6=8C=87=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderMasterController.java | 13 + .../templates/order/orderManager.html | 609 ++++++++++++++++++ 2 files changed, 622 insertions(+) create mode 100644 ghy-admin/src/main/resources/templates/order/orderManager.html diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c2103bd5..930d5135 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -127,6 +127,19 @@ public class OrderMasterController extends BaseController { return "order/pc-master"; } + @GetMapping("/manager") + public String orderManager() { + return "order/orderManager"; + } + + @GetMapping("/orderWorker/{orderId}") + public String orderWorker(@PathVariable("orderId") Long orderId, ModelMap mmap) { + List workList = workerService.getWorkList(new Worker()); + mmap.put("orderId", orderId); + mmap.put("workers", workList); + return "order/orderWorker"; + } + @PostMapping("/app/list") @ResponseBody public TableDataInfo appList(@RequestBody OrderMaster orderMaster) { diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html new file mode 100644 index 00000000..ef7edeef --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -0,0 +1,609 @@ + + + + + + + + + + + + +
+
+
+
+
+ + +
+ + + 待付款 + (0) + + + 已发布 + (0) + + + 已接单 + (0) + + + + + + + + + 待上门 + (0) + + + 进行中 + (0) + + + 确认审核 + (0) + + + 完成 + (0) + + + 关闭 + (0) + + + 今日待上门 + (0) + + + 明日待上门 + (0) + + + 售后 + (0) + + + 急报中 + (0) + +
+
+
+ 区域筛选： +
+ + + + +
+
+
+ 类别筛选： +
+ + + + +
+
+
+ + +
+
+  搜索 +  重置 +
+
+
+
+ + + +
+
+
+
+
+
+ + + + + + + + + + From 638c3bd51845e0b11aebd15fa306a385adaeca9b Mon Sep 17 00:00:00 2001 From: donqi Date: Sat, 17 Jun 2023 01:28:14 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/order/master.html | 8 +- .../templates/order/orderManager.html | 2 +- .../templates/order/orderWorker.html | 305 +++++++++++++++++- 3 files changed, 293 insertions(+), 22 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index c517a62c..c5f19b32 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -302,9 +302,9 @@ shiro:hasPermission="order:order:export"> 导出 - - 指派 - + + +
@@ -606,7 +606,7 @@ actions.push('查看 '); actions.push('师傅退单 '); actions.push('商家退单 '); - actions.push('指派 '); + if (row.payStatus == 0) { actions.push('付款 '); } diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index ef7edeef..81651286 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -360,7 +360,7 @@ function showOrderWorker(id) { var url = "order/master/orderWorker/" + id; - $.modal.open("指派师傅", url, '800', '300'); + $.modal.open("指派师傅", url, '800', '500'); } function selectRegion(regionLevelName, nextRegionLevelName) { diff --git a/ghy-admin/src/main/resources/templates/order/orderWorker.html b/ghy-admin/src/main/resources/templates/order/orderWorker.html index 23b5f21f..11c69802 100644 --- a/ghy-admin/src/main/resources/templates/order/orderWorker.html +++ b/ghy-admin/src/main/resources/templates/order/orderWorker.html @@ -3,31 +3,302 @@ + + + - -
-
- -
- -
- + +
+
+ +
-
- +
+
+ 可派单金额： + + 元 +
+
+
+ + +
+
+
+ +
+ +
+
+
+ +
+ + + + +
+
+
+ +
+ + + + +
+
+
+ + +
+
+  搜索 +  重置 +
+
+
+ +
+
+
+ - \ No newline at end of file + From 118107cc15dbcb495576ad2bd18d052a704cfd62 Mon Sep 17 00:00:00 2001 From: donqi Date: Sat, 17 Jun 2023 01:40:40 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E5=8F=91=E5=8D=95=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/goods/standard/addTemplate.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 68c25df6..6de63093 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -348,7 +348,7 @@
- +
@@ -534,15 +534,15 @@ function selectPublishWithPrice(e) { - if ($(e).is(':checked')) { - $('#payOnDoorMode').prop("checked", false); - } + + + } function changePayOnDoorMode(e) { - if ($(e).is(':checked')) { - $('#publishWithPrice').prop("checked", false); - } + + + } function validSpecialComponent() { From 0de3aa5058566be28a4d17ad1f18c512869fe942 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 18 Jun 2023 20:57:39 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A4=A7=E5=B8=88?= =?UTF-8?q?=E5=82=85=E7=9A=84=E4=B8=BB=E5=8D=95=E6=8C=87=E6=B4=BE=E6=97=B6?= =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E6=95=B4=E5=8D=95=E6=8C=87=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderMasterController.java | 6 +++ .../templates/order/orderManager.html | 37 +++++++++++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 930d5135..0c87980a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -140,6 +140,12 @@ public class OrderMasterController extends BaseController { return "order/orderWorker"; } + @GetMapping("/assignWholeOrder/{orderId}") + public String assignWholeOrder(@PathVariable("orderId") Long orderId, ModelMap mmap) { + mmap.put("orderId", orderId); + return "order/assignWholeOrder"; + } + @PostMapping("/app/list") @ResponseBody public TableDataInfo appList(@RequestBody OrderMaster orderMaster) { diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index 81651286..a47a366d 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -359,8 +359,35 @@ } function showOrderWorker(id) { - var url = "order/master/orderWorker/" + id; - $.modal.open("指派师傅", url, '800', '500'); + var url = "orderWorker/" + id; + layer.open({ + type: 2, + area: ['800px', '450px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: '指派师傅', + content: url, + // 弹层外区域关闭 + shadeClose: true + }); + } + + function showAssignWholeOrder(id) { + var url = "assignWholeOrder/" + id; + layer.open({ + type: 2, + area: ['800px', '450px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: '指派师傅', + content: url, + // 弹层外区域关闭 + shadeClose: true + }); } function selectRegion(regionLevelName, nextRegionLevelName) { @@ -452,7 +479,11 @@ var actions = []; actions.push('查看 '); actions.push('商家退单 '); - actions.push('指派 '); + if (row.workerId != null) { + actions.push('指派 '); + } else { + actions.push('指派 '); + } if (row.payStatus == 0) { actions.push('付款 '); } From 82f8a40f87c413be817fadab775f87583f623fd5 Mon Sep 17 00:00:00 2001 From: donqi Date: Sun, 18 Jun 2023 21:46:10 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A4=A7=E5=B8=88?= =?UTF-8?q?=E5=82=85=E7=9A=84=E4=B8=BB=E5=8D=95=E6=8C=87=E6=B4=BE=E6=97=B6?= =?UTF-8?q?=E5=8F=AA=E5=85=81=E8=AE=B8=E6=95=B4=E5=8D=95=E6=8C=87=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/order/assignWholeOrder.html | 289 ++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 ghy-admin/src/main/resources/templates/order/assignWholeOrder.html diff --git a/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html b/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html new file mode 100644 index 00000000..1038bcf7 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html @@ -0,0 +1,289 @@ + + + + + + + + + + + +
+
+
+
+
+
+
+ 派单金额： + + 元 +
+ + + + + + +
+
+
+ +
+
+
+ +
+ + + + +
+
+
+ +
+ + + + +
+
+
+ + +
+
+  搜索 +  重置 +
+
+
+ +
+
+
+
+ + + + + + From 59a662d56a31c8eaa61b20d5ed657000245beeef Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 19 Jun 2023 00:03:09 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E5=8F=91=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/goods/standard/addTemplate.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 6de63093..41467a06 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -204,7 +204,7 @@
- +
@@ -549,14 +549,20 @@ // 类目 let categoryIds = categoryCascader.getCheckedByID(); if (!categoryIds || categoryIds.length === 0) { - $.modal.msgError("请录入完整必填信息") + $.modal.msgError("服务类目不能为空") + return false; + } + + // 图片是否上传 + if (!$('input[name=imageUrl]').val()) { + $.modal.msgError("图片未上传") return false; } // 地区 let checkedAreaPathList = areaCascader.getCheckedPaths(); if (!checkedAreaPathList || checkedAreaPathList.length === 0) { - $.modal.msgError("请录入完整必填信息") + $.modal.msgError("服务地址不能为空") return false; } From 6d4cf3ed7872933e1e4097b3a9508777871ae607 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 21 Jun 2023 18:16:16 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=95=B4=E5=8D=95?= =?UTF-8?q?=E6=B4=BE=E5=8D=95=E6=B4=BE=E5=88=B0=E6=96=B0=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/order/assignWholeOrder.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html b/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html index 1038bcf7..7bb1e6b4 100644 --- a/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html +++ b/ghy-admin/src/main/resources/templates/order/assignWholeOrder.html @@ -264,7 +264,7 @@ var params = { id: orderMasterId, workerId: workerId, - orderStatus: 1 + orderStatus: 0 }; $.ajax({