stanley-king 8 роки тому
батько
коміт
d1ae14ebb8
3 змінених файлів з 11 додано та 4 видалено
  1. 6 2
      data/logic/order.logic.php
  2. 4 2
      helper/brand_helper.php
  3. 1 0
      helper/pay_helper.php

+ 6 - 2
data/logic/order.logic.php

@@ -242,7 +242,8 @@ class orderLogic
      * @param string $user 操作人
      * @return array
      */
-    public function changeOrderSend($order_info, $role, $user = '', $post = array()) {
+    public function changeOrderSend($order_info, $role, $user = '', $post = array())
+    {
         $order_id = $order_info['order_id'];
         $model_order = Model('order');
 		try {
@@ -257,7 +258,10 @@ class orderLogic
 
             $condition = array();
             $condition['order_id'] = $order_id;
-            $condition['store_id'] = $_SESSION['store_id'];
+            $store_id = intval($_SESSION['store_id']);
+            if($store_id <= 0) {
+                $condition['store_id'] = intval($post['store_id']);
+            }
             $update = $model_order->editOrderCommon($data,$condition);
             if (!$update) {
                 throw new Exception('操作失败');

+ 4 - 2
helper/brand_helper.php

@@ -56,9 +56,11 @@ class brand_helper
 
             $this->mCountries = [];
             $brands = [];
-            foreach ($items as $brand) {
-                Log::record($brand['brand_logo'],Log::DEBUG);
+            foreach ($items as $brand)
+            {
+                if(empty($brand['brand_logo'])) continue;
 
+                Log::record($brand['brand_logo'],Log::DEBUG);
                 $image = UPLOAD_SITE_URL . $brand['brand_logo'];
                 $ret = getimagesize($image, $info);
                 if ($ret != false) {

+ 1 - 0
helper/pay_helper.php

@@ -145,6 +145,7 @@ class pay_helper
         $data['daddress_id'] = intval($order_info['daddress_id']);
         $data['shipping_express_id'] =intval($express_id);
         $data['shipping_code']  = $logistics_no;
+        $data['store_id']  = 6;
 
         $logic_order = Logic('order');
         $result = $logic_order->changeOrderSend($order_info, 'system', $order_info['buyer_name'], $data);