0000494

app/adminapi/controller/v1/Order.php

@@ -265,6 +265,7 @@ class Order extends ApiController
         return $this->Success('更新成功');
     }
 
+    //變更訂單操作
     public function updateOrderAction()
     {
         $params = input('post.');
@@ -348,7 +349,9 @@ class Order extends ApiController
 
             /* 返回 */
         } elseif ($params['op'] == 'pay') {
-            /* 標記訂單為已確認、已付款，更新付款時間和已支付金額，如果是貨到付款，同時修改訂單為“收貨確認” */
+
+            /* 標記訂單為已確認、已付款，更新付款時間和已支付金額 */
+
             $arr['order_id']            = $order['order_id'];
             $arr['order_status']        = $order['order_status'];
             $arr['shipping_status']     = $order['shipping_status'];
@@ -407,16 +410,18 @@ class Order extends ApiController
             $arr['shipping_time']    = time();
 
             //檢查是否貨到付款，是的話更新card的資料
-            if($order['pay_id']==0){
+            // if ($order['pay_id'] == 0) {
                 $updateSlashUSer = \app\common\SlashCard::updateUser($order);
+
                 if ($updateSlashUSer['code'] != 200 && $updateSlashUSer['code'] != 201) {
                     return $this->Error('更新SlashCard失敗');
                 } elseif ($updateSlashUSer['code'] == 200) {
-                    $action['action_note'] = '更新Card為付費會員';                
+                    $action['action_note'] = '配貨完成,更新Card為付費會員,到期日:'.date('Y-m-d',$updateSlashUSer['data']);
                 } elseif ($updateSlashUSer['code'] == 201) {
-                    $action['action_note'] = 'Card重覆操作';                
+                    $action['action_note'] = '配貨完成,會員期限已更新過';
-                }
                 }
+            // }
+
             $rtn = $this->updateStatus($arr, $action);
             if (!$rtn) {
                 return $this->Error('更新失敗');
@@ -441,6 +446,16 @@ class Order extends ApiController
             $arr['pay_status']    = $order['pay_status'];
             $arr['shipping_status']  = SS_UNSHIPPED;
             $arr['shipping_time']    = 0;
+
+            $updateSlashUSer = \app\common\SlashCard::cancelUser($order);
+            if ($updateSlashUSer['code'] != 200 && $updateSlashUSer['code'] != 201) {
+                return $this->Error('更新SlashCard失敗');
+            } elseif ($updateSlashUSer['code'] == 200) {
+                $action['action_note'] = '取消配貨,更新Card會員資料,到期日:'.date('Y-m-d',$updateSlashUSer['data']);
+            } elseif ($updateSlashUSer['code'] == 201) {
+                $action['action_note'] = '取消配貨,會員期限未更新過';
+            }
+
             $rtn = $this->updateStatus($arr, $action);
             if (!$rtn) {
                 return $this->Error('更新失敗');
@@ -452,6 +467,8 @@ class Order extends ApiController
             $arr['shipping_status']  = SS_SHIPPED_ARRIVE;
             // $arr['shipping_time']    = time();
             $rtn = $this->updateStatus($arr, $action);
+
+
             if (!$rtn) {
                 return $this->Error('更新失敗');
             }
@@ -468,13 +485,12 @@ class Order extends ApiController
         } elseif ($params['op'] == 'finish') {
             $arr['order_id'] = $order['order_id'];
             $arr['order_status']    = OS_FINISHED;
-            $arr['pay_status']    = $order['pay_status'];
+            $arr['pay_status']    = PS_PAYED;
-            $arr['shipping_status']  = $order['shipping_status'];
+            $arr['shipping_status']  = SS_RECEIVED;
             $rtn = $this->updateStatus($arr, $action);
             if (!$rtn) {
                 return $this->Error('更新失敗');
             }
-
         }
 
 
@@ -562,7 +578,6 @@ class Order extends ApiController
                     $list[] = 'arrive';
                 }
                 $list[] = 'prepare';
-
             } elseif (PS_UNPAYED == $ps) {
                 $list[] = 'pay';
 
@@ -583,7 +598,6 @@ class Order extends ApiController
                     $list[] = 'arrive';
                 }
                 $list[] = 'prepare';
-
             } else {
                 /* 狀態：已確認、付款中 */
                 $list[] = 'unpay';

app/common/SlashCard.php

@@ -13,12 +13,14 @@ class SlashCard
             ->where('order_id', $order['order_id'])
             ->where('goods_id', 1)
             ->find();
+
         if ($is_main) {
-            $rtn = \app\service\Card::addUser([
+            $params = [
                 'order_sn' => $order['order_sn'],
                 'user_id' => Db::name('users')->where('user_id', $order['user_id'])->value('sso_user_id'),
-            ]);
+            ];
 
+            $rtn = \app\service\Card::addUser($params);
             if ($rtn['code'] != 200) {
                 return ['code' => $rtn['code'], 'msg' => '更新slashcard失敗'];
             }
@@ -27,4 +29,31 @@ class SlashCard
             return ['code' => 201, 'msg' => '訂單無slashcard商品'];        
         }
     }
+
+    public static function cancelUser($order)
+    {
+        //判斷是否為SlashCard商品
+        $is_main = Db::name('order_goods')
+            ->where('order_id', $order['order_id'])
+            ->where('goods_id', 1)
+            ->find();
+        
+        if ($is_main){
+
+            $params = [
+                'order_sn' => $order['order_sn'],
+                'user_id' => Db::name('users')->where('user_id', $order['user_id'])->value('sso_user_id'),
+            ];
+
+            $rtn = \app\service\Card::cancelUser($params);
+
+            if ($rtn['code'] != 200 && $rtn['code'] != 201) {
+                return ['code' => $rtn['code'], 'msg' => '更新slashcard失敗'];
+            }
+            return $rtn;
+        }else{
+            return ['code' => 201, 'msg' => '訂單無slashcard商品'];        
+        }
+    }
+    
 }

app/common/shipping/EcpayShipping.php

@@ -547,6 +547,7 @@ class EcpayShipping implements Ishipping
             return FALSE;
         }
 
+        // $result['redirect_url'] = 'http://localhost:5173/m/order/shipping?is_return=1';
         $result['redirect_url'] = getUrl() . '/m/order/shipping?is_return=1';
 
         return $result;