chuweiqiang 1 год назад
Родитель
Сommit
93f33308ab
2 измененных файлов с 3 добавлено и 4 удалено
  1. 2 3
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Expedite.php

+ 2 - 3
.idea/workspace.xml

@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Mall.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Mall.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -479,7 +478,7 @@
       <workItem from="1700440204810" duration="14773000" />
       <workItem from="1700526499424" duration="11662000" />
       <workItem from="1700613253175" duration="10732000" />
-      <workItem from="1700699350870" duration="2085000" />
+      <workItem from="1700699350870" duration="2221000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/api/controller/Expedite.php

@@ -1220,7 +1220,7 @@ class Expedite extends Base
 //            ->count();
         $finish_num = 0;
         $refund_num = GoodsOrder::where(['user_id'=>$this->user_id,'is_deleted'=>0,'pay_state'=>1,'cancel_state'=>0])
-            ->where('refund_state','in','1,2,3')
+            ->where('refund_state','in','1')
             ->count();
         $mark_num = $trolley_num + $no_pay_num +  $no_express_num + $express_num + $finish_num + $finish_num + $refund_num;
         //招聘