Merge remote-tracking branch 'origin/master'

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -85,7 +85,7 @@ public class OrderTask {
 
 
                     // 未获取到需要的状态不做更新
                     // 未获取到需要的状态不做更新
                     if ("待配送".equals(json.get("stateName")) || "物流配送中".equals(json.get("stateName"))
                     if ("待配送".equals(json.get("stateName")) || "物流配送中".equals(json.get("stateName"))
-                            || "配送成功".equals(json.get("stateName")) || "归档".equals(json.get("stateName"))) {
+                            || "配送成功【待收费】".equals(json.get("stateName")) || "归档".equals(json.get("stateName"))) {
                         orderHistory.setStatus("审核通过,等待配送");
                         orderHistory.setStatus("审核通过,等待配送");
                         orderHistoryMapper.insert(orderHistory);
                         orderHistoryMapper.insert(orderHistory);