Merge branch 'master' into huangfamily

app/common/repositories/store/order/StoreOrderRepository.php

@@ -6606,6 +6606,7 @@ class StoreOrderRepository extends BaseRepository
 
     public function douhuomall_delivery()
     {
+        set_time_limit(0);
         try {
             $order = Db::name('store_order')->where('status', 0)->where('pay_type', '>', 0)->where('douhuomall', 1)->where('douhuomall_status', 9)->select();
             if ($order) {
@@ -6634,7 +6635,7 @@ class StoreOrderRepository extends BaseRepository
 //                        $address_id = $address_id[0];
                     }
 //                    $address_id = $value['address_id'];
-                    $cart_id = $value['cart_id'];
+                    $cart_id = [$value['cart_id']];
                     $cartIds = Db::name('store_cart')->where('cart_id', 'in', $cart_id)->select()->toArray();
 //                    $address = $value['user_address'];
                     log::info("传参数据22========");
@@ -6653,7 +6654,7 @@ class StoreOrderRepository extends BaseRepository
                         log::info("传参数据11111========");
                         log::info($address);
                         $res = GongApiRequest::submit($address_id, $sku_id, $address, $third_order, $other, $receiver, $receiver_phone);
-
+                        echo "传参数据11111========";
                         $u['douhuomall_status'] = 0;
                         $u['douhuomall_msg'] = $res['error_msg'] ?? '';
                         if ($res['error_code'] == 0) {
@@ -6673,6 +6674,7 @@ class StoreOrderRepository extends BaseRepository
             $this->douhuomall_order();
         } catch (Exception $e) {
             Db::name('log')->insert(['data' => '供应链发货：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
+            echo '供应链发货：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
         }
     }
 

app/controller/api/store/order/StoreOrder.php

@@ -204,10 +204,10 @@ class StoreOrder extends BaseController
 
         //log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
         // $price = $decScore = $decJingScore =  0;
-        //foreach ($cartIds as $k=>$item){
+        foreach ($cartIds as $k=>$item){
 
-        // $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
-        // if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
+        $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
+        if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
         // $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');
         // $price += bcmul($money, $item['cart_num'], 2);
 
@@ -228,7 +228,7 @@ class StoreOrder extends BaseController
         //     }
         //     $decJingScore += $productDecJingdou;
         // }
-        //}
+        }
 
 
         // if (!$decScore && !$decJingScore) {