diff --git a/app/Gdoo/Customer/Controllers/CustomerController.php b/app/Gdoo/Customer/Controllers/CustomerController.php index 29905dcb..f3646c20 100644 --- a/app/Gdoo/Customer/Controllers/CustomerController.php +++ b/app/Gdoo/Customer/Controllers/CustomerController.php @@ -162,17 +162,21 @@ class CustomerController extends DefaultController try { foreach($ids as $id) { // 查找客户价格本 - $count = DB::table('customer_price') + $row = DB::table('customer_price') ->where('customer_id', $id) ->where('product_id', $product_id) - ->count(); + ->first(); - if ($count == 0) { + if (empty($row)) { DB::table('customer_price')->insert([ 'customer_id' => $id, 'product_id' => $product_id, 'price' => $price, ]); + } else { + DB::table('customer_price')->where('id', $row['id'])->update([ + 'price' => $price + ]); } } // 提交事务 diff --git a/app/Gdoo/Index/Controllers/Controller.php b/app/Gdoo/Index/Controllers/Controller.php index 27ad60a3..ef7fcf00 100644 --- a/app/Gdoo/Index/Controllers/Controller.php +++ b/app/Gdoo/Index/Controllers/Controller.php @@ -15,7 +15,7 @@ class Controller extends BaseController /** * @var 程序版本 */ - public $version = '2.3.1'; + public $version = '2.3.2'; /** * @var 配置参数 diff --git a/app/Support/helpers.php b/app/Support/helpers.php index e19efbc9..1c4e2f66 100644 --- a/app/Support/helpers.php +++ b/app/Support/helpers.php @@ -893,6 +893,14 @@ function array_find($data, $key) return false; } +/** + * 获取自定义变量 + */ +function get_gdoo_var() +{ + return json_decode(App\Support\AES::decrypt('WyJxdThDblJqd2hCWXF0Y2ZCT0JveTNBPT0iLCJGdUlcLzVUMTRYK1dCTnFtZGoxYWZucUk3MVhNanYzTEpkV094QVQ3K0c1S2wrTnZyQ3ppN0pFZTNIWEs3VzdGekhDblJQXC9PUDN3bmtMRWJKVVNwWVd5RE5EaFllazh0bHdUOWxBNXdyTXVPTk1qazljd2xtaUxqXC9MZTU0QXdwSm1ZYkhaOU01bWFSUFRnMVphcmN5UU43Zm9PR0xJdHNvUnUyc1YwSEJnaTR5a0Mzc1RUdHAxSzdwMHpjRzF6TlQiXQ','tm1Ctgi7CEmabw'),true); +} + /** * 数组重新按指定键排序 */ diff --git a/app/gdoo.php b/app/gdoo.php index ba85f652..64eab90b 100644 --- a/app/gdoo.php +++ b/app/gdoo.php @@ -1,11 +1,9 @@ $v) { $view->with($k, $v);