Просмотр исходного кода

Merge branch 'master' of https://gitee.com/ZhongBangKeJi/CRMEB

liaofei 3 лет назад
Родитель
Сommit
7e563c5f43
3 измененных файлов с 24682 добавлено и 6 удалено
  1. 1 1
      README.md
  2. 2 0
      crmeb/app/services/order/StoreOrderSplitServices.php
  3. 24679 5
      crmeb/public/install/crmeb.sql

+ 1 - 1
README.md

@@ -113,7 +113,7 @@ Redis
 ![输入图片说明](readme/pic/gitee开源版详情_03.jpg)
 ![输入图片说明](readme/pic/gitee开源版详情_04.jpg)
 ![输入图片说明](readme/pic/gitee开源版详情_05.jpg)
-### <a href='http://s.crmeb.com/goods_detail/728' target='_blank'>点击查看高清版全套UI设计图</a>
+### <a href='http://s.crmeb.com/goods_detail/739' target='_blank'>点击查看高清版全套UI设计图</a>
 
 
 ##  系统演示

+ 2 - 0
crmeb/app/services/order/StoreOrderSplitServices.php

@@ -127,6 +127,7 @@ class StoreOrderSplitServices extends BaseServices
                     if ($orderInfo['pid'] == 0 || $orderInfo['pid'] > 0 && $key == 'new') {
                         $_info = is_string($cartInfo[$cart['cart_id']]['cart_info']) ? json_decode($cartInfo[$cart['cart_id']]['cart_info'], true) : $cartInfo[$cart['cart_id']]['cart_info'];
                         $new_cart_data['oid'] = $new_id;
+                        $new_cart_data['uid'] = $orderInfo['uid'];
                         $new_cart_data['cart_id'] = $storeOrderCreateServices->getNewOrderId('');
                         $new_cart_data['product_id'] = $_info['product_id'];
                         $new_cart_data['old_cart_id'] = $cart['cart_id'];
@@ -149,6 +150,7 @@ class StoreOrderSplitServices extends BaseServices
                         $cart_info->save();
                         $cart_data_all[] = [
                             'oid' => $new_id,
+                            'uid' => $orderInfo['uid'],
                             'cart_id' => $cart_info->cart_id,
                             'product_id' => $cart_info->product_id,
                             'old_cart_id' => $cart_info->old_cart_id,

Разница между файлами не показана из-за своего большого размера
+ 24679 - 5
crmeb/public/install/crmeb.sql