ソースを参照

Wesmiler OTC 提交更新 0729

APPLE 3 年 前
コミット
7388cf7d6b

+ 3 - 0
app/Services/Common/AdvertOrderService.php

@@ -143,6 +143,9 @@ class AdvertOrderService extends BaseService
                 $item['exception_img'] = $item['exception_img'] ? get_image_url($item['exception_img']) : '';
                 $item['exception_img1'] = $item['exception_img1'] ? get_image_url($item['exception_img1']) : '';
                 $item['exception_img2'] = $item['exception_img2'] ? get_image_url($item['exception_img2']) : '';
+                $item['refund_img'] = $item['refund_img'] ? get_image_url($item['refund_img']) : '';
+                $item['refund_img1'] = $item['refund_img1'] ? get_image_url($item['refund_img1']) : '';
+                $item['refund_img2'] = $item['refund_img2'] ? get_image_url($item['refund_img2']) : '';
                 $item['pay_img'] = $item['pay_img'] ? get_image_url($item['pay_img']) : '';
                 $item['paymentData']['qrcode'] = isset($item['paymentData']['qrcode']) && $item['paymentData']['qrcode'] ? get_image_url($item['paymentData']['qrcode']) : '';
 

+ 1 - 1
app/Services/Common/MemberService.php

@@ -161,7 +161,7 @@ class MemberService extends BaseService
         } else if($avatar){
             $data['avatar'] = str_replace(IMG_URL, "", $data['avatar']);
         }
-        
+
         // 出生日期
         if ($data['birthday']) {
             $data['birthday'] = strtotime($data['birthday']);

+ 78 - 1
app/Services/Common/TradeOrderService.php

@@ -156,6 +156,9 @@ class TradeOrderService extends BaseService
                 $item['exception_img'] = $item['exception_img'] ? get_image_url($item['exception_img']) : '';
                 $item['exception_img1'] = $item['exception_img1'] ? get_image_url($item['exception_img1']) : '';
                 $item['exception_img2'] = $item['exception_img2'] ? get_image_url($item['exception_img2']) : '';
+                $item['refund_img'] = $item['refund_img'] ? get_image_url($item['refund_img']) : '';
+                $item['refund_img1'] = $item['refund_img1'] ? get_image_url($item['refund_img1']) : '';
+                $item['refund_img2'] = $item['refund_img2'] ? get_image_url($item['refund_img2']) : '';
                 $item['pay_img'] = $item['pay_img'] ? get_image_url($item['pay_img']) : '';
                 $item['paymentData']['qrcode'] = isset($item['paymentData']['qrcode']) && $item['paymentData']['qrcode'] ? get_image_url($item['paymentData']['qrcode']) : '';
 
@@ -1217,6 +1220,34 @@ class TradeOrderService extends BaseService
                 $updateData['exception_img2'] = str_replace(IMG_URL, "", $updateData['exception_img2']);
             }
         }
+        if (isset($params['refund_img'])) {
+            $updateData['refund_img'] = trim($params['refund_img']);
+            if (strpos($updateData['refund_img'], "temp")) {
+                $updateData['refund_img'] = save_image($updateData['refund_img'], 'images');
+            } else {
+                $updateData['refund_img'] = str_replace(IMG_URL, "", $updateData['refund_img']);
+            }
+        }
+        if (isset($params['refund_img1'])) {
+            $updateData['refund_img1'] = trim($params['refund_img1']);
+            if (strpos($updateData['refund_img1'], "temp")) {
+                $updateData['refund_img1'] = save_image($updateData['refund_img1'], 'images');
+            } else {
+                $updateData['refund_img1'] = str_replace(IMG_URL, "", $updateData['refund_img1']);
+            }
+        }
+        if (isset($params['refund_img2'])) {
+            $updateData['refund_img2'] = trim($params['refund_img2']);
+            if (strpos($updateData['refund_img2'], "temp")) {
+                $updateData['refund_img2'] = save_image($updateData['refund_img2'], 'images');
+            } else {
+                $updateData['refund_img2'] = str_replace(IMG_URL, "", $updateData['refund_img2']);
+            }
+        }
+
+        if (isset($params['refund_payment'])) {
+            $updateData['refund_payment'] = trim($params['refund_payment']);
+        }
 
         if (isset($params['exception_remark'])) {
             $updateData['exception_remark'] = trim($params['exception_remark']);
@@ -1224,7 +1255,7 @@ class TradeOrderService extends BaseService
         if (isset($params['exception_status'])) {
             $updateData['exception_status'] = intval($params['exception_status']);
         }
-
+        
         if (!$this->model->where($where)->update($updateData)) {
             $this->model->rollBack();
             $this->error = '3023';
@@ -1577,6 +1608,52 @@ class TradeOrderService extends BaseService
             }
         }
 
+        if (isset($params['exception_img1'])) {
+            $updateData['exception_img1'] = trim($params['exception_img1']);
+            if (strpos($updateData['exception_img1'], "temp")) {
+                $updateData['exception_img1'] = save_image($updateData['exception_img1'], 'images');
+            } else {
+                $updateData['exception_img1'] = str_replace(IMG_URL, "", $updateData['exception_img1']);
+            }
+        }
+
+        if (isset($params['exception_img2'])) {
+            $updateData['exception_img2'] = trim($params['exception_img2']);
+            if (strpos($updateData['exception_img2'], "temp")) {
+                $updateData['exception_img2'] = save_image($updateData['exception_img2'], 'images');
+            } else {
+                $updateData['exception_img2'] = str_replace(IMG_URL, "", $updateData['exception_img2']);
+            }
+        }
+
+        if (isset($params['refund_img'])) {
+            $updateData['refund_img'] = trim($params['refund_img']);
+            if (strpos($updateData['refund_img'], "temp")) {
+                $updateData['refund_img'] = save_image($updateData['refund_img'], 'images');
+            } else {
+                $updateData['refund_img'] = str_replace(IMG_URL, "", $updateData['refund_img']);
+            }
+        }
+        if (isset($params['refund_img1'])) {
+            $updateData['refund_img1'] = trim($params['refund_img1']);
+            if (strpos($updateData['refund_img1'], "temp")) {
+                $updateData['refund_img1'] = save_image($updateData['refund_img1'], 'images');
+            } else {
+                $updateData['refund_img1'] = str_replace(IMG_URL, "", $updateData['refund_img1']);
+            }
+        }
+        if (isset($params['refund_img2'])) {
+            $updateData['refund_img2'] = trim($params['refund_img2']);
+            if (strpos($updateData['refund_img2'], "temp")) {
+                $updateData['refund_img2'] = save_image($updateData['refund_img2'], 'images');
+            } else {
+                $updateData['refund_img2'] = str_replace(IMG_URL, "", $updateData['refund_img2']);
+            }
+        }
+
+        if (isset($params['refund_payment'])) {
+            $updateData['refund_payment'] = trim($params['refund_payment']);
+        }
         if (isset($params['exception_remark'])) {
             $updateData['exception_remark'] = trim($params['exception_remark']);
         }