From c6b3fdaf0302194206c14c3a5d99dce8a0289837 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 24 Jan 2024 15:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98/=E5=AD=90=E5=B8=88=E5=82=85+=E5=B8=88=E5=82=85?= =?UTF-8?q?=E6=96=B0=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderController.java | 12 +++--------- .../controller/order/OrderMasterController.java | 8 ++++++-- .../templates/goods/standard/addTemplate.html | 15 ++++++--------- 3 files changed, 15 insertions(+), 20 deletions(-) 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 fffbcf16..11b8f40b 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 @@ -207,7 +207,7 @@ public class OrderController extends BaseController { goods.setGoodsName(request.getGoodsBrand()); goods.setGoodsImgUrl(request.getImageUrl()); goods.setGoodsVideoUrl(request.getVideoUrl()); - goods.setDeptGoodsCategoryId(request.getOrderGoodsStandards().get(0).getDeptCategoryId()); + goods.setDeptGoodsCategoryId(request.getCategoryId3()); goods.setStatus(1); goods.setRemark(request.getRemark()); goodsService.insertGoods(goods); @@ -548,25 +548,19 @@ public class OrderController extends BaseController { } // 通知师傅新订单 try { - Map params = new HashMap<>(); - params.put("character_string22", orderMaster.getCode()); - params.put("thing19", customer.getName()); - params.put("time1", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())); - params.put("thing5", "有新订单,请及时处理!"); - wxMsgService.sendWxMsg(worker.getOpenId(), WxMsgEnum.NEW_ORDER, params); - Worker assignWorker = workerService.selectById(orderMaster.getWorkerId()); // 消息组装。 Map paramsNew = new HashMap<>(); // 订单编号 paramsNew.put("character_string6", orderMaster.getCode()); // 名称 - paramsNew.put("thing14", customer.getName()); + paramsNew.put("thing14", "新订单通知,请及时接单!"); // 预约时间 paramsNew.put("time4", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", orderMaster.getExpectTimeStart())); // 消息推送 WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), assignWorker.getWxOpenId(), WxMsgEnum.TEXT, paramsNew); } catch (Exception e) { + logger.error(e.getMessage()); e.printStackTrace(); } return AjaxResult.success(orderMaster); 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 297f4a4a..bc0905d0 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 @@ -265,6 +265,10 @@ public class OrderMasterController extends BaseController { // 填充商品三级类目 if(goods.getDeptGoodsCategoryId() != null){ DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId()); + if(deptGoodsCategory == null){ + deptGoodsCategory = new DeptGoodsCategory(); + deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId()); + } if(deptGoodsCategory != null){ GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId()); if(one != null && one.getParentCategoryId() != null){ @@ -272,9 +276,9 @@ public class OrderMasterController extends BaseController { if(two != null && two.getParentCategoryId() != null){ GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId()); if(three != null){ - master.setConsoleGoodsName("【" + three.getGoodsCategoryName() + master.setConsoleGoodsName(three.getGoodsCategoryName() + "-" + two.getGoodsCategoryName() - + "-" + one.getGoodsCategoryName() + "】"); + + "-" + one.getGoodsCategoryName()); } } } 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 ce23827b..b2c5dec5 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -180,15 +180,12 @@