订单表字段的优化

app/client/controllers/InviteController.php

@@ -1,11 +1,14 @@
 <?php
+
 namespace client\controllers;
 
+use biz\invite\services\InviteService;
+use common\components\util;
 use Yii;
 
 class InviteController extends BaseController
 {
-
+	
 	//邀请有礼列表
 	public function actionList()
 	{
@@ -13,5 +16,13 @@ class InviteController extends BaseController
 		//已邀请 和 已下单 从 xhInviteStat取
 		//邀请记录和分页，参考 business/controller/UserController/list方法
 	}
-
+	
+	//取新人奖励 shish 2019.12.14
+	public function actionGetNewGift()
+	{
+		$introUserId = Yii::$app->request->get('introUserId', 0);
+		InviteService::getNewGift($this->user, $introUserId);
+		util::ok('领取成功');
+	}
+	
 }

app/client/controllers/ShopController.php

@@ -28,15 +28,9 @@ class ShopController extends BaseController
 		$newUserGift = [];
 		if (!empty($introUserId)) {
 			$userInfo = UserService::getUserInfo($this->userId);
-			$newUserGift = InviteService::getNewUserGift($userInfo);
+			$newUserGift = InviteService::hasNewUserGift($userInfo);
 		}
 		util::success(['ad' => $ad, 'shop' => $shop, 'newUserGift' => $newUserGift]);
 	}
-	
-	//领取优惠券 shish 2019.12.14
-	public function actionGetCoupon()
-	{
 
-	}
-	
 }

biz/invite/classes/InviteAssetClass.php

@@ -21,6 +21,9 @@ class InviteAssetClass extends BaseClass
 		if (empty($asset['switch'])) {
 			return [];
 		}
+		$duration = $asset['duration'];
+		$validTime = time() + $duration * 86400;
+		$asset['validTime'] = date("Y-m-d", $validTime);
 		return $asset;
 	}
 

biz/invite/classes/InviteClass.php

@@ -23,7 +23,7 @@ class InviteClass extends BaseClass
 	}
 	
 	//邀请有礼 新人 优惠券
-	public static function getNewUserGift($userInfo)
+	public static function hasNewUserGift($userInfo)
 	{
 		$newUser = UserClass::newUser($userInfo);
 		if ($newUser == false) {

biz/invite/services/InviteService.php

@@ -3,8 +3,10 @@
 namespace biz\invite\services;
 
 use biz\base\services\BaseService;
+use biz\invite\classes\InviteAssetClass;
 use biz\invite\classes\InviteClass;
 use biz\user\services\UserService;
+use common\components\util;
 
 class InviteService extends BaseService
 {
@@ -16,12 +18,30 @@ class InviteService extends BaseService
 	{
 		return InviteClass::hasInvited($user);
 	}
-
-	//邀请有礼 新人 优惠券
-	public static function getNewUserGift($userInfo)
+	
+	//邀请有礼 新人 优惠券 shish 2019.12.14
+	public static function hasNewUserGift($userInfo)
+	{
+		return InviteClass::hasNewUserGift($userInfo);
+	}
+	
+	//邀请有礼，领取奖励 shish 2019.12.14
+	public static function getNewGift($userInfo, $introUserId)
 	{
-		die;
-		return InviteClass::getNewUserGift($userInfo);
+		$merchantId = $userInfo['merchantId'];
+		$gift = InviteAssetClass::newGift($merchantId);
+		if (empty($gift)) {
+			util::fail('没有找到奖励');
+		}
+		$hasInvite = InviteClass::hasInvited($userInfo);
+		if ($hasInvite) {
+			util::fail('已经领取过了');
+		}
+		$userId = $userInfo['id'];
+		$time = time();
+		$couponId = 0;
+		$data = ['userId' => $userId, 'introUserId' => $introUserId, 'prize' => $prize, 'addTime' => $time, 'couponId' => $couponId];
+		InviteClass::add($data);
 	}
 
 }

biz/promote/classes/CouponClass.php

@@ -9,9 +9,15 @@ use biz\base\classes\BaseClass;
 
 class CouponClass extends BaseClass
 {
-	
+
 	public static $baseFile = '\biz\promote\models\Coupon';
-	
+
+	//邀请有礼增加优惠券 shish 2019.12.14
+	public static function inviteAdd()
+	{
+
+	}
+
 	//新增优惠卷
 	public static function add($data, $returnObject = false)
 	{

sql.txt

@@ -1,3 +1,9 @@
+2019.12.14 shish 订单表的优化 ！！！！
+ALTER TABLE `xhOrder` DROP PRIMARY KEY;
+ALTER TABLE `xhOrder` DROP  INDEX `id`;
+ALTER TABLE `xhOrder` CHANGE `id` `orderSn` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单编号';
+ALTER TABLE `xhOrder` ADD `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '自增id' FIRST;
+
 2019.12.13 shish 流程数增加
 ALTER TABLE xhOrder ADD totalFlow TINYINT NOT NULL DEFAULT 5 COMMENT '总流程数' AFTER `evaluate`;
 ALTER TABLE xhOrder ADD currentFlow TINYINT NOT NULL DEFAULT 0 COMMENT '当前流程数' AFTER `totalFlow`;