dongxiaoqin пре 1 година
родитељ
комит
8f5f65bcc1
1 измењених фајлова са 5 додато и 2 уклоњено
  1. 5 2
      app/common/logic/PaymentLogic.php

+ 5 - 2
app/common/logic/PaymentLogic.php

@@ -121,7 +121,7 @@ class PaymentLogic extends BaseLogic
                     break;
                     break;
             }
             }
             
             
-            $payTime = empty($order['pay_time']) ? '' : date('Y-m-d H:i:s', $order['pay_time']);
+            $payTime = empty($order['pay_time']) ? '' : date('Y-m-d H:i:s', strtotime($order['pay_time']));
             $orderInfo = [
             $orderInfo = [
                 'order_id' => $order['id'],
                 'order_id' => $order['id'],
                 'order_sn' => $order['sn'],
                 'order_sn' => $order['sn'],
@@ -279,7 +279,10 @@ class PaymentLogic extends BaseLogic
     //        PayNotifyLogic::handle($from, $order['sn']);
     //        PayNotifyLogic::handle($from, $order['sn']);
     //        return ['sn' => $order['sn'],'need_pay'=>0];
     //        return ['sn' => $order['sn'],'need_pay'=>0];
     //    }
     //    }
-
+    if($from=='group'){
+        PayNotifyLogic::handle($from, $order['sn']);
+        return ['sn' => $order['sn'],'need_pay'=>0];
+    }
 
 
         $payService = null;
         $payService = null;
         switch ($payWay) {
         switch ($payWay) {