钉钉修改

application/api/controller/Common.php

@@ -234,18 +234,20 @@ class Common extends Base
                         if ($goods_info) {
                             // 商品库里有该商品
                             $goods_info = $goods_info->toArray();
-                            $goods_stock_info = array_column($goods_info['goods_stock'], null, 'name');
+                            $goods_stock_object = array_column($goods_info['goods_stock'], null, 'name');
                             foreach ($value as $kk=>$val) {
-                                if (array_key_exists($val['goods_sku_value'], $goods_stock_info)) {
+                                if (array_key_exists($val['goods_sku_value'], $goods_stock_object)) {
                                     // 商品库里有该商品规格
                                     $stock = isset($val['stock']) ? $val['stock'] : 0;
-                                    $total_stock = $goods_stock_info[$val['goods_sku_value']]['stock'];
+                                    $goods_stock_info = $goods_stock_object[$val['goods_sku_value']];
+                                    $total_stock = $goods_stock_info['stock'];
                                     if($total_stock > 0){
                                         // 商品规格有库存
                                         $use_data[$key][] = $val;
                                         $use_data[$key][$kk]['goods_id'] = $goods_info['id'];
                                         $use_data[$key][$kk]['goods_category_first'] = $goods_category_first;
                                         $use_data[$key][$kk]['goods_category_id'] = $goods_category_id;
+                                        $use_data[$key][$kk]['id'] = $goods_stock_info['id'];
                                     }
                                     if ($stock > $total_stock) {
                                         // 商品规格库存不足
@@ -297,6 +299,7 @@ class Common extends Base
                 $price = isset($val['price']) ? $val['price'] : 0;
                 $total_price = bcadd($total_price, $stock * $price, 2);
                 $goods_stock_data[] = [
+                    'id' => isset($val['id']) ? $val['id'] : 0,
                     'name' => $val['goods_sku_value'],
                     'stock' => $stock,
                     'price' => $price,

application/extend/Dingtalk/Sample.php

@@ -42,7 +42,7 @@ class Sample
         $getAccessTokenRequest = new GetAccessTokenRequest([
 //            "appKey" => "dingekepwoyycxfbtyvg",
 //            "appSecret" => "EjM9WohvKHo3eNqZGGbQHhbjM80QzapdC_f_reYiOCyEFOtaG1qoG2KzEfpSoLWe",
-        // 测试用
+            // 测试用
             "appKey" => "'dingilnkljzq3a4chjrw",
             "appSecret" => "Dt-nHAw4G-dniS7P9VmbnQRIKHQfGIQNIVHVNVHOZMtLPcsIv4KJYk_AjBCRsaH4"
         ]);