|
@@ -2,7 +2,9 @@
|
|
|
|
|
|
|
|
namespace biz\order\classes;
|
|
namespace biz\order\classes;
|
|
|
|
|
|
|
|
|
|
+use biz\message\classes\InformUserClass;
|
|
|
use biz\stat\classes\StatOrderCountClass;
|
|
use biz\stat\classes\StatOrderCountClass;
|
|
|
|
|
+use biz\user\classes\UserClass;
|
|
|
use common\components\stringUtil;
|
|
use common\components\stringUtil;
|
|
|
use common\services\xhOrderDayNumService;
|
|
use common\services\xhOrderDayNumService;
|
|
|
use common\services\xhOrderMonthNumService;
|
|
use common\services\xhOrderMonthNumService;
|
|
@@ -30,7 +32,7 @@ class OrderClass extends BaseClass
|
|
|
const ORDER_STATUS_UN_PAY = 0;
|
|
const ORDER_STATUS_UN_PAY = 0;
|
|
|
//订单总流程数
|
|
//订单总流程数
|
|
|
const ORDER_TOTAL_FLOW = 5;
|
|
const ORDER_TOTAL_FLOW = 5;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//未确认配送方式
|
|
//未确认配送方式
|
|
|
const SEND_TYPE_UNKNOWN = 0;
|
|
const SEND_TYPE_UNKNOWN = 0;
|
|
|
//自取
|
|
//自取
|
|
@@ -52,7 +54,7 @@ class OrderClass extends BaseClass
|
|
|
$data['payStatus'] = 0;
|
|
$data['payStatus'] = 0;
|
|
|
$data['createTime'] = $date;
|
|
$data['createTime'] = $date;
|
|
|
$data['addTime'] = time();
|
|
$data['addTime'] = time();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$month = date("Ym");
|
|
$month = date("Ym");
|
|
|
$riseNum = StatOrderCountClass::addOrder($month, $merchantId);
|
|
$riseNum = StatOrderCountClass::addOrder($month, $merchantId);
|
|
|
//将花店每月的总订单数作为编号
|
|
//将花店每月的总订单数作为编号
|
|
@@ -125,9 +127,13 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//订单完成 shish 2020.3.12
|
|
//订单完成 shish 2020.3.12
|
|
|
- public static function complete($id)
|
|
|
|
|
|
|
+ public static function complete($order)
|
|
|
{
|
|
{
|
|
|
- self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE]);
|
|
|
|
|
|
|
+ $id = $order['id'];
|
|
|
|
|
+ self::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => 4]);
|
|
|
|
|
+ $userId = $order['userId'];
|
|
|
|
|
+ $user = UserClass::getById($userId);
|
|
|
|
|
+ InformUserClass::sendComplete($user,$order);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//转化出送到时间 shish 2020.3.15
|
|
//转化出送到时间 shish 2020.3.15
|
|
@@ -143,5 +149,5 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
return $reachTime;
|
|
return $reachTime;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|