Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/After.php

@@ -392,8 +392,16 @@ class After extends Base
 
         $addcode = '';
         if ($info['addr_code'] != "") {
-            list($a, $b, $c) = explode(",", $info['addr_code']);
-            $addcode = json_encode(["provice_code" => $a, "city_code" => $b, "area_code" => $c]);
+
+            $temp=json_decode($info['addr_code'],true);
+            if($temp) $addcode = $info['addr_code'];
+            else {
+                $temp = explode(',',$info['addr_code']);
+                $addcode = json_encode(["provice_code" => $temp[0], "city_code" => $temp[1], "area_code" => $temp[2]]);
+            }
+
+//            list($a, $b, $c) = explode(",", $info['addr_code']);
+//            $addcode = json_encode(["provice_code" => $a, "city_code" => $b, "area_code" => $c]);
         }
         $info["addr_cn"] = GetAddr($addcode);
         //  $info["addr_code"]=json_decode($addcode,true);

app/admin/controller/Reorder.php

@@ -751,7 +751,7 @@ class Reorder extends Base
 
         //校验是否开通了供应商账号
         $supp_account = checkHasAccountBySupplierNos([$info['supplierNo']]);
-        $info['has_account']=(int)isset($supp_account[$info['supplierNo']]);
+        $info['has_account'] = (int)isset($supp_account[$info['supplierNo']]);
 
         return json_show(0, "获取成功", $info);
     }
@@ -892,7 +892,7 @@ class Reorder extends Base
 //            $info['is_th'] =$is_th ;
 //        }
 
-        if ( in_array($info['status'],[9,10]) && $param['status'] == 4) $info['is_th'] = 1;//除了8-11-12-4之外，其余9-4和10-4都属于供应商同意退货
+        if (in_array($info['status'], [9, 10]) && $param['status'] == 4) $info['is_th'] = 1;//除了8-11-12-4之外，其余9-4和10-4都属于供应商同意退货
 
         Db::startTrans();
         try {
@@ -1900,18 +1900,24 @@ class Reorder extends Base
             ->field('a.id,a.outCode,a.send_num,a.return_num,a.is_sale_return_child,b.contactor,b.mobile,b.addr_code,b.addr,"" addr_code_cn')
             ->leftJoin('order_addr b', 'b.id=a.addrid and b.is_del=0')
             ->where($where)
-            ->order(['a.is_sale_return_child'=>'asc','a.addtime' => 'desc', 'a.id' => 'desc'])
+            ->order(['a.is_sale_return_child' => 'asc', 'a.addtime' => 'desc', 'a.id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->select()
             ->toArray();
 
+        $is_sale_return_child_count = Db::name('sale_returnaddr')
+            ->alias('a')
+            ->where($where)
+            ->where('is_sale_return_child', 1)
+            ->count('a.id');
+
         foreach ($list as &$value) {
             if ($value['addr_code'] != '') {
                 $value['addr_code_cn'] = GetAddr($value['addr_code']);
             }
         }
 
-        return json_show(0, '获取列表成功', ['count' => $count, 'list' => $list]);
+        return json_show(0, '获取列表成功', ['count' => $count, 'list' => $list, 'is_sale_return_child_count' => $is_sale_return_child_count]);
 
     }