From 70c7480ceaa4b8e008d771df743ef70cd0cf3c9e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 5 Dec 2019 11:30:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/goods/save_info.html |  6 ++++++
 application/service/BuyService.php                  | 10 +++++++---
 public/static/admin/default/js/goods.js             |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index c6226b942..f3c7e3dc5 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -570,6 +570,12 @@
 							{{if !empty($v['desc'])}}
 								<span class="am-text-xs am-text-warning am-margin-left-xs">{{$v.desc}}</span>
 							{{/if}}
+							{{if !empty($v['tips'])}}
+								<div class="am-alert am-alert-warning am-margin-0" data-am-alert>
+									<button type="button" class="am-close">&times;</button>
+									<p>{{$v.tips|raw}}</p>
+								</div>
+							{{/if}}
 							{{if !empty($v['element'])}}
 								{{foreach $v.element as $element}}
 									<div class="am-form-group">
diff --git a/application/service/BuyService.php b/application/service/BuyService.php
index 0c99c95c3..0b04b15fb 100755
--- a/application/service/BuyService.php
+++ b/application/service/BuyService.php
@@ -215,12 +215,14 @@ class BuyService
                     $v['spec_weight'] = $goods_base['data']['spec_base']['weight'];
                     $v['spec_coding'] = $goods_base['data']['spec_base']['coding'];
                     $v['spec_barcode'] = $goods_base['data']['spec_base']['barcode'];
+                    $v['extends'] = $goods_base['data']['spec_base']['extends'];
                 } else {
                     $v['is_invalid'] = 1;
                     $v['inventory'] = 0;
                     $v['spec_weight'] = 0;
                     $v['spec_coding'] = '';
                     $v['spec_barcode'] = '';
+                    $v['extends'] = '';
                 }
 
                 // 基础信息
@@ -926,12 +928,14 @@ class BuyService
         $order_id = Db::name('Order')->insertGetId($order);
         if($order_id > 0)
         {
-            foreach($buy['data']['goods'] as $v)
+            foreach($buy['data']['goods'] as $k=>$v)
             {
-                // 添加订单详情数据
+                // 添加订单详情数据,data返回自增id
                 $detail_ret = self::OrderDetailInsert($order_id, $params['user']['id'], $v);
-                if($detail_ret['code'] != 0)
+                if($detail_ret['code'] == 0)
                 {
+                    $buy['data']['goods'][$k]['id'] = $detail_ret['data'];
+                } else {
                     Db::rollback();
                     return $ret;
                 }
diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js
index 61fbf6238..fe2d654b5 100755
--- a/public/static/admin/default/js/goods.js
+++ b/public/static/admin/default/js/goods.js
@@ -91,7 +91,7 @@ $(function()
         var spec_max = $('#goods-nav-operations').data('spec-add-max-number') || 3;
         if($('.specifications-table th.table-title').length >= spec_max)
         {
-            Prompt('最多添加'+spec_max+'列规格');
+            Prompt('最多添加'+spec_max+'列规格，可在后台管理[系统设置-后台配置]中配置');
             return false;
         }