Merge remote-tracking branch 'origin/master'

src/Common/Lib/Smscode.php

@@ -65,7 +65,7 @@ class Smscode
         );
         );
         $response = $alisms->send($mobile);
         $response = $alisms->send($mobile);
         if ($response->Code == 'OK') {
         if ($response->Code == 'OK') {
-            $vdata = sprintf("%d,%d,%d", $vcode, time(), $count);
+            $vdata = sprintf("%d,%d,%d,%d,%d", $vcode, time(), $count, $this->number, $mobile);
             $result = cache()->set($key, $vdata, 300); // 验证码有效期5分钟
             $result = cache()->set($key, $vdata, 300); // 验证码有效期5分钟
             if (!$result) {
             if (!$result) {
                 return '验证码存储失败';
                 return '验证码存储失败';

src/CustomerProfiles/Lib/ProfileInterface.php

@@ -16,7 +16,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * The interface of demo service
  * The interface of demo service
  *
  *
- * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId)
+ * @method  ResultInterface deferAddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName)
  */
  */
 interface ProfileInterface
 interface ProfileInterface
 {
 {
@@ -31,5 +31,5 @@ interface ProfileInterface
      * @return mixed
      * @return mixed
      */
      */
 
 
-    public function AddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId);
+    public function AddOrder($storeId, $orderId, $goodsId, $goodsName, $orderPrice, $orderType, $orderTime, $consigneeName, $consigneePhone, $buyerId,$activityName);
 }
 }
\ No newline at end of file

src/SellerDistribution/Enum/SellerDistributionEnum.php

@@ -11,5 +11,5 @@ namespace Hdll\Services\SellerDistribution\Enum;
 class SellerDistributionEnum
 class SellerDistributionEnum
 {
 {
 
 
-	const SETTING = [1 => 0.2, 2 => 0.1];
+	const SETTING = [1 => 0.4, 2 => 0.25];
 }
 }
\ No newline at end of file

src/Vip/Enum/VipEnum.php

@@ -9,8 +9,12 @@
 namespace Hdll\Services\Vip\Enum;
 namespace Hdll\Services\Vip\Enum;
 class VipEnum{
 class VipEnum{
 
 
-	const VIP_TOTAL_FEE = 10;//价格
-	
+	const VIP_TOTAL_FEE = 69800;//价格
+
+	const VIP_SALE_FEE = 59800;//优惠价格
+
+	const VIP_ORIGIN_FEE = 128800;//原价
+
 	const STATUS_UNPAID = 10;//未支付
 	const STATUS_UNPAID = 10;//未支付
 
 
 	const STATUS_PAID = 20;//已支付
 	const STATUS_PAID = 20;//已支付