clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

派单时间问题/子师傅+师傅新订单列表

This commit is contained in:
kuang.yife 2024-01-24 15:08:26 +08:00
parent 5136738411
commit c6b3fdaf03
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -207,7 +207,7 @@ public class OrderController extends BaseController {
goods.setGoodsName(request.getGoodsBrand()); goods.setGoodsName(request.getGoodsBrand());
goods.setGoodsImgUrl(request.getImageUrl()); goods.setGoodsImgUrl(request.getImageUrl());
goods.setGoodsVideoUrl(request.getVideoUrl()); goods.setGoodsVideoUrl(request.getVideoUrl());
goods.setDeptGoodsCategoryId(request.getOrderGoodsStandards().get(0).getDeptCategoryId()); goods.setDeptGoodsCategoryId(request.getCategoryId3());
goods.setStatus(1); goods.setStatus(1);
goods.setRemark(request.getRemark()); goods.setRemark(request.getRemark());
goodsService.insertGoods(goods); goodsService.insertGoods(goods);
@ -548,25 +548,19 @@ public class OrderController extends BaseController {
} }
// 通知师傅新订单 // 通知师傅新订单
try { try {
Map<String, Object> 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()); Worker assignWorker = workerService.selectById(orderMaster.getWorkerId());
// 消息组装。 // 消息组装。
Map<String, Object> paramsNew = new HashMap<>(); Map<String, Object> paramsNew = new HashMap<>();
// 订单编号 // 订单编号
paramsNew.put("character_string6", orderMaster.getCode()); 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())); 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); WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), assignWorker.getWxOpenId(), WxMsgEnum.TEXT, paramsNew);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
return AjaxResult.success(orderMaster); return AjaxResult.success(orderMaster);

8
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -265,6 +265,10 @@ public class OrderMasterController extends BaseController {
// 填充商品三级类目 // 填充商品三级类目
if(goods.getDeptGoodsCategoryId() != null){ if(goods.getDeptGoodsCategoryId() != null){
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId()); DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId());
if(deptGoodsCategory == null){
deptGoodsCategory = new DeptGoodsCategory();
deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId());
}
if(deptGoodsCategory != null){ if(deptGoodsCategory != null){
GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId()); GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
if(one != null && one.getParentCategoryId() != null){ if(one != null && one.getParentCategoryId() != null){
@ -272,9 +276,9 @@ public class OrderMasterController extends BaseController {
if(two != null && two.getParentCategoryId() != null){ if(two != null && two.getParentCategoryId() != null){
GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId()); GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId());
if(three != null){ if(three != null){
master.setConsoleGoodsName("【" + three.getGoodsCategoryName() master.setConsoleGoodsName(three.getGoodsCategoryName()
+ "-" + two.getGoodsCategoryName() + "-" + two.getGoodsCategoryName()
+ "-" + one.getGoodsCategoryName() + "】"); + "-" + one.getGoodsCategoryName());
} }
} }
} }

15
ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html
View File

@ -180,15 +180,12 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<select class="form-control" name="servTime" required> <select class="form-control" name="servTime" required>
<option value="8:00-12:00">8:00-12:00</option> <option value="08:00-10:00">08:00-10:00</option>
<option value="8:00-12:00">12:00-16:00</option> <option value="10:00-12:00">10:00-12:00</option>
<option value="8:00-12:00">16:00-20:00</option> <option value="12:00-14:00">12:00-14:00</option>
<option value="8:00-12:00">8:00-10:00</option> <option value="14:00-16:00">14:00-16:00</option>
<option value="8:00-12:00">10:00-12:00</option> <option value="16:00-18:00">16:00-18:00</option>
<option value="8:00-12:00">12:00-14:00</option> <option value="18:00-20:00">18:00-20:00</option>
<option value="8:00-12:00">14:00-16:00</option>
<option value="8:00-12:00">16:00-18:00</option>
<option value="8:00-12:00">18:00-20:00</option>
</select> </select>
</div> </div>
</div> </div>