2
0

2 Revīzijas ca43a8da1d ... b5e020bf97

Autors SHA1 Ziņojums Datums
  jun b5e020bf97 修改后台订单列表 2 nedēļas atpakaļ
  jun 094bb29607 修改地区支付 2 nedēļas atpakaļ

+ 1 - 1
app/Http/Controllers/Admin/Orders.php

@@ -93,7 +93,7 @@ class Orders extends Auth{
         $list                   = $list->where($map)
 									->orderByDesc('id')
 									->select([
-										'orders_product.*','custom.username as custom_name','orders.regiment_id as regiment_id',
+										'orders_product.*','custom.username as custom_name','orders.regiment_id as regiment_id','orders.is_pay as is_pay',
 										'orders_addr.contact_name','orders_addr.contact_shop','orders_addr.shop_type','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
 									])
 									->paginate(request('limit',config('page_num',10)))->appends(request()->all());

+ 1 - 1
app/Http/Controllers/Api/Product.php

@@ -205,7 +205,7 @@ class Product extends Api{
         if ($payCity && $payCity['city_ids']) {
             $cityIds = explode(',',$payCity['city_ids']);
             foreach ($allowCity as $item) {
-                if ($item == 1 || in_array($item,$cityIds))     $isPay                  = 1;
+                if (($item == 1 || in_array($item,$cityIds)) && in_array($custom['city_id'],$cityIds))     $isPay                  = 1;
             }
         }
         // 转数组

+ 1 - 1
app/Http/Controllers/Api/ShopCart.php

@@ -353,7 +353,7 @@ class ShopCart extends Api{
             if ($payCity && $payCity['city_ids']) {
                 $cityIds = explode(',',$payCity['city_ids']);
                 foreach ($allowCity as $item) {
-                    if ($item == 1 || in_array($item,$cityIds))     $isPay                  = 1;
+                    if (($item == 1 || in_array($item,$cityIds)) && in_array($custom['city_id'],$cityIds))     $isPay                  = 1;
                 }
             }
             $value['is_pay']        = $isPay;