发货下单流程完成

biz/order/classes/OrderSendClass.php

@@ -10,11 +10,23 @@ use biz\base\classes\BaseClass;
 
 class OrderSendClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\order\models\OrderSend';
-
+	
 	//流程id与名称
-	public static $actionId = ['order' => 1, 'print' => 2, 'deliver' => 3, 'reach' => 4, 'finish' => 5];
+	public static $actionId = ['placeOrder' => 1, 'printOrder' => 2, 'deliver' => 3, 'reach' => 4, 'finish' => 5];
 	public static $actionName = [1 => '下单', 2 => '打单', 3 => '发货', 4 => '送达', 5 => '完成'];
+	
+	//下单操作完成 shish 2019.12.13
+	public static function placeOrder($data)
+	{
+		$orderId = $data['orderId'];
+		$payTime = $data['payTime'];
+		$actionId = self::$actionId;
+		$id = $actionId['placeOrder'];
+		$time = time();
+		$data = ['actionId' => $id, 'orderId' => $orderId, 'finishTime' => $payTime, 'addTime' => $time];
+		return self::add($data);
+	}
 
 }

biz/order/services/OrderSendService.php

@@ -18,5 +18,6 @@ class OrderSendService extends BaseService
 {
 	
 	public static $baseFile = '\biz\order\classes\OrderSendClass';
+
 	
 }

biz/user/services/UserService.php

@@ -165,21 +165,19 @@ class UserService extends BaseService
 	/**
 	 * 更新用户的访问时间
 	 */
-	public static function updateVisitTime()
+	public static function updateVisitTime($merchantId, $userId)
 	{
 		$date = date("Ymd");
-		$merchantId = Yii::$app->params['merchantId'];
-		$userId = Yii::$app->params['userId'];
 		if (empty($userId)) {
 			return false;
 		}
-		//每10分钟更新一次访问时间
+		//每5分钟更新一次访问时间
 		$key = 'UserVisitTime_' . $date . '_' . $merchantId . '_' . $userId;
 		$respond = Yii::$app->redis->executeCommand('GET', [$key]);
-		//每过10分钟更新访问时间
+		//每过5分钟更新访问时间
 		if (empty($respond)) {
 			Yii::$app->redis->executeCommand('SET', [$key, $date]);
-			Yii::$app->redis->executeCommand('EXPIRE', [$key, 600]);
+			Yii::$app->redis->executeCommand('EXPIRE', [$key, 300]);
 			$time = time();
 			self::updateById($userId, ['visitTime' => $time]);
 		}
@@ -293,6 +291,6 @@ class UserService extends BaseService
 	//验证用户权限
 	public static function valid($info, $merchantId)
 	{
-		return UserClass::valid($info,$merchantId);
+		return UserClass::valid($info, $merchantId);
 	}
 }

common/services/xhPayToolService.php

@@ -2,6 +2,7 @@
 
 namespace common\services;
 
+use biz\order\classes\OrderSendClass;
 use biz\order\services\OrderService;
 use biz\user\services\UserAssetService;
 use biz\user\services\UserService;
@@ -133,9 +134,7 @@ class xhPayToolService
 					$updateData['userId'] = $userId;
 					
 					//更新访问时间
-					Yii::$app->params['merchantId'] = $merchantId;
-					Yii::$app->params['userId'] = $userId;
-					UserService::updateVisitTime();
+					UserService::updateVisitTime($merchantId, $userId);
 				}
 			} else {
 				$user = xhUserService::getById($userId);
@@ -209,6 +208,8 @@ class xhPayToolService
 			switch ($capitalType) {
 				case $typeList['xhOrder']['id']://购买商品
 					xhOrderService::updateById($orderId, $updateData);
+					//发货里的下单流程完成
+					OrderSendClass::placeOrder(['orderId' => $orderId, 'payTime' => $now]);
 					break;
 				case $typeList['xhActiveOrder']['id']://活动报名
 					xhActiveOrderService::updateById($orderId, $updateData);
@@ -222,14 +223,6 @@ class xhPayToolService
 					util::fail('订单流水类型不明确');
 			}
 			
-			//抵销优惠券并分成
-			//CouponService::destroyToGetReward(['id' => $couponId]);
-			
-			if (isset($order['inviteCode']) && !empty($order['inviteCode'])) {
-				$invitedMerchantId = isset($order['invitedMerchantId']) ? $order['invitedMerchantId'] : 0;
-				xhInviteService::updateByCode($order['inviteCode'], ['takeStatus' => 1, 'inviteUseTo' => 0, 'targetId' => $orderId, 'invitedMerchantId' => $invitedMerchantId]);
-			}
-			
 			//累计消费
 			$userTotalExpend = stringUtil::calcAdd($userAsset['totalExpend'], $totalFee);
 			//成长值增加