Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -173,7 +173,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if ("1".equals(evaluateFlag)){
             //查询司机发运次数
             Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
-                    .eq("common_id", commonId).eq("order_status_key","25").eq("delete_flag","0"));
+                    .eq("common_id", commonId).eq("order_status_key","23").eq("delete_flag","0"));
             orderInfo.setCountFa(String.valueOf(count));
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
@@ -202,7 +202,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
         }else {
             Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
-                    .eq("cargo_common_id", commonId).eq("cargo_owner_status_key","31").eq("delete_flag","0"));
+                    .eq("cargo_common_id", commonId).eq("cargo_owner_status_key","23").eq("delete_flag","0"));
             orderInfo.setCountFa(String.valueOf(count));
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()