diff --git a/soss-admin/src/main/resources/application.yml b/soss-admin/src/main/resources/application.yml index 988f998..6393ad8 100644 --- a/soss-admin/src/main/resources/application.yml +++ b/soss-admin/src/main/resources/application.yml @@ -112,4 +112,4 @@ machine: json: path: D:\workspecs\soss\soss\soss-admin\src\main\resources/province.json timeout: 10 -template: [{\"status\":\"2\",\"templateId\":\"1uErx-15S-3vuopXSvvsxCeM_Jd-1iZC-nXzd2yW3QU\",\"param\":{\"character_string1\":\"$.orderNum\",\"thing2\":\"$.shop.name\",\"thing12\":\"$.shop.address\",\"time7\":\"now\",\"thing6\":\"您的订单已经下单成功了~\"}},{\"status\":\"3\",\"templateId\":\"Q4HDwBEvpTXpwtZktqWm4SZOTEuQK1x48xjqjD2GqyM\",\"param\":{\"thing1\":\"$.shop.name\",\"date6\":\"now\",\"thing5\":\"您的订单已经开始制作了,马上就可以享用美食了!\"}},{\"status\":\"4\",\"templateId\":\"Fu_CPIXa0cnJ4EDdVKqFQ3qqKJccMqt2oorI5mfNq74\",\"param\":{\"character_string4\":\"$.orderNum\",\"thing2\":\"$.shop.name\",\"thing7\":\"$.shop.address\",\"time6\":\"now\",\"thing11\":\"您的订单已经制作完成了,现在可以去取餐啦!\"}}] \ No newline at end of file +template: [{\"status\":\"2\",\"templateId\":\"1uErx-15S-3vuopXSvvsxCeM_Jd-1iZC-nXzd2yW3QU\",\"param\":{\"character_string1\":\"$.orderNum\",\"thing2\":\"$.shop.name\",\"thing12\":\"$.shop.address\",\"time7\":\"now\",\"thing6\":\"您的订单已经下单成功了~\"}},{\"status\":\"3\",\"templateId\":\"Q4HDwBEvpTXpwtZktqWm4SZOTEuQK1x48xjqjD2GqyM\",\"param\":{\"thing1\":\"$.shop.name\",\"date6\":\"now\",\"thing5\":\"您的订单已经开始制作了!\"}},{\"status\":\"4\",\"templateId\":\"Fu_CPIXa0cnJ4EDdVKqFQ3qqKJccMqt2oorI5mfNq74\",\"param\":{\"character_string4\":\"$.orderNum\",\"thing2\":\"$.shop.name\",\"thing7\":\"$.shop.address\",\"time6\":\"now\",\"thing11\":\"您的订单已经制作完成了,现在可以去取餐啦!\"}}] \ No newline at end of file diff --git a/soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java b/soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java index fcec56d..d5e9663 100644 --- a/soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java +++ b/soss-system/src/main/java/com/soss/system/service/impl/MachineApiServiceImpl.java @@ -136,15 +136,14 @@ public class MachineApiServiceImpl { if(order1==null){ throw new ServiceException("该订单不存在"); } - Order order = new Order(); - order.setId(orderID); - order.setState(status); - order.setUpdatedAt(new Date()); + + order1.setState(status); + order1.setUpdatedAt(new Date()); if(OrderStatusConstant.completed.equals(status)){ - order.setFinishTime(new Date()); + order1.setFinishTime(new Date()); } - int i = orderService.updateOrder(order); + int i = orderService.updateOrder(order1); return i+""; diff --git a/soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java b/soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java index 7b1eeb5..6837a1e 100644 --- a/soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java +++ b/soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java @@ -510,6 +510,7 @@ public class OrderServiceImpl implements IOrderService map.put("waitTime",waitTime); map.put("pickCode",order.getPickCode()); map.put("orderNum",order.getOrderNum()); + map.put("state",order.getState()); return map; } diff --git a/soss-system/src/main/java/com/soss/system/weixin/util/SendMessageUtils.java b/soss-system/src/main/java/com/soss/system/weixin/util/SendMessageUtils.java index acb2f26..9b441f6 100644 --- a/soss-system/src/main/java/com/soss/system/weixin/util/SendMessageUtils.java +++ b/soss-system/src/main/java/com/soss/system/weixin/util/SendMessageUtils.java @@ -50,7 +50,7 @@ public class SendMessageUtils { "\"param\": {" + "\"thing1\": \"$.shop.name\"," + "\"date6\": \"now\"," + - "\"thing5\": \"您的订单已经开始制作了,马上就可以享用美食了!\"" + + "\"thing5\": \"订单已经开始制作,即将可以享用美食!\"" + "}" + "}, {" + "\"status\": \"4\"," +