代码永远在路上

soss-admin/src/main/resources/application.yml

@@ -111,5 +111,5 @@ machine:
   url: http://47.94.241.71:10003
 json:
   path: D:\workspecs\soss\soss\soss-admin\src\main\resources/province.json
-timeout: 10
+timeout: 600
 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

soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java

@@ -496,7 +496,7 @@ public class OrderServiceImpl implements IOrderService
     }
 
     public Map<String,String> getMyFristOrder(String openId) {
-        List<String> status = Arrays.asList("2","3","4");
+        List<String> status = Arrays.asList("2","3","4","7");
         Order order = orderMapper.selectHomeByUserId(openId,status);
         if(order ==null){
             return null;

soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java

@@ -79,7 +79,8 @@ public class ShopServiceImpl implements IShopService
             shop1.setMachineCount(machineMapper.selectMachineList(machine).size());
             shop1.setSalesAmount(orderMapper.selectSalesAmount(shop1.getId()));
             shop1.setSalesVolume(orderMapper.selectSalesVolume(shop1.getId(),null));
-            shop1.setMachieStatus(machineMapper.selectMachineList(machine).get(0).getState());
+
+            //shop1.setMachieStatus(machineMapper.selectMachineList(machine).get(0).getState());
         }
 
         return shops;