Merge remote-tracking branch 'origin/stabble' into stabble

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -16,6 +16,7 @@ use App\Modules\User\Services\ForceSubscribeUserIService;
 use App\Modules\User\Services\UserDivisionCpcPropertyService;
 use App\Modules\User\Services\UserDivisionPropertyService;
 use App\Modules\User\Services\UserGiftService;
+use App\Modules\User\Services\UserMonthService;
 use App\Modules\User\Services\UserService;
 use App\Modules\Book\Services\BookService;
 use App\Modules\Channel\Services\PayTemplateService;
@@ -263,7 +264,8 @@ class OrdersController extends BaseController
         $appad = 0;
 
         $property = UserDivisionCpcPropertyService::getUserProperty($this->uid);
-
+        $user_info = $this->_user_info;
+        $this->monthPayExposureRecord($property,$user_info->openid);
         foreach ($res as $v) {
             if ($template_id == 7 && $book_config && $book_config->charge_type == 'BOOK' && $v->price == 2) {
                 continue;
@@ -890,4 +892,22 @@ class OrdersController extends BaseController
             'Referer'=>$refer
         ]);
     }*/
+
+    private function monthPayExposureRecord($property,$openid){
+        if (!$property) return '';
+        if (in_array($this->distribution_channel_id, explode(',', redisEnv('OPEN_ORDER_INNER_SITES')))
+            && in_array($property, ['none','low', 'medium'])
+        ) {
+            if(!UserMonthService::isSignMonth($openid)){
+                try{
+                    DB::table('user_month_visit_record')->insert([
+                        'uid'=>$this->uid,'day'=>date('Y-m-d'),
+                        'created_at'=>date('Y-m-d H:i:s'),
+                        'updated_at'=>date('Y-m-d H:i:s')
+                    ]);
+                }catch (\Exception $e){}
+            }
+        }
+        return '';
+    }
 }

app/Http/Controllers/Wap/Pay/MonthOrderController.php

@@ -8,6 +8,7 @@
 
 namespace App\Http\Controllers\Wap\Pay;
 
+use App\Modules\SendOrder\Services\SendOrderService;
 use App\Modules\Subscribe\Models\Order;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\Subscribe\Services\YearOrderService;
@@ -17,6 +18,7 @@ use GuzzleHttp\Client;
 use Illuminate\Routing\Controller;
 use Illuminate\Http\Request;
 use Log;
+use Redis;
 
 class MonthOrderController extends Controller
 {
@@ -128,6 +130,18 @@ class MonthOrderController extends Controller
     private function createOrder($uid,$distribution_channel_id,$product_id,$price,$trade_no,$transaction_id){
         $count = OrderService::getUserChargeTimes($uid);
         $count = $count + 1;
+        $send_order_id = 0;
+        try {
+            $send_order_id = (int)Redis::hget('book_read:' . $uid, 'send_order_id');
+        } catch (\Exception $e) {
+        }
+        $send_order_name = '';
+        if ($send_order_id) {
+            $send_order_info = SendOrderService::getById($send_order_id);
+            if ($send_order_info && isset($send_order_info->name) && !empty($send_order_info->name)) {
+                $send_order_name = $send_order_info->name;
+            }
+        }
         $init_order = [
             'distribution_channel_id' => $distribution_channel_id,
             'uid' => $uid,
@@ -138,8 +152,8 @@ class MonthOrderController extends Controller
             'pay_merchant_source' => 'MONTH',
             'pay_merchant_id' => 99,
             'create_ip' => '',
-            'send_order_id' => '',
-            'send_order_name' => '',
+            'send_order_id' => $send_order_id,
+            'send_order_name' => $send_order_name,
             'order_type' => 'RECHARGE',
             'from_bid' => '0',
             'from_type' => 'auto_month',

app/Http/Controllers/Wap/User/CoflController.php

@@ -103,13 +103,15 @@ class CoflController extends Controller
         $source = $request->get('wx','none');
         $type = 'CRM';
         if($uri == 'freethrhcurrency'){
-            $fee = 300;
+            //$fee = 300;
+            $fee = 500;
             $this->stats('reward_300',$crm);
         }elseif($uri == 'wfreecurrency'){
             $fee = 200;
             $type = 'WCRM';
         }elseif ($uri == 'frocefreethrhcurrency'){
-            $fee = 200;
+            //$fee = 200;
+            $fee = 500;
             $type = 'CRM_FORCE';
         }
         else{

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -2150,7 +2150,7 @@ class WelcomeController extends BaseController
         }
         //Log::info('guidePersonalAccount555555555555555');
         if($charge){
-            return ['title'=>'点击领取200书币>>','link'=>'/guidestrem?uid='.$this->uid];
+            return ['title'=>'您有500书币待领取>>','link'=>'/guidestrem?uid='.$this->uid];
         }
         return '';
     }

app/Modules/OfficialAccount/Services/OfficialAccountService.php

@@ -658,4 +658,17 @@ class OfficialAccountService
     {
         return OfficialAccount::getBusinessChannelData($channels, $distribution_channel_name, $official_account_name,$isAll);
     }
+
+    /**
+     * 获取置顶地址
+     */
+    static function getTopUrl($service_type_info = 2)
+    {
+        if($service_type_info == 1)
+        {
+            return 'https://help.'. env('WECHAT_CUSTOM_HOST') .'.com/top2.html';
+        }else{
+            return 'https://help.'. env('WECHAT_CUSTOM_HOST') .'.com/top.html';
+        }
+    }
 }

resources/views/wap/signV3.blade.php

@@ -80,13 +80,15 @@
 
         .sign_list {
             position: absolute;
-            top: 60px;
+            left: 50%;
+            transform: translate(-50%);
+            top: 0.6rem;
             width: 100%;
             color: #333;
             line-height: 25px;
             display: flex;
             justify-content: space-between;
-            font-size: 13px;
+            font-size: 12px;
             margin-top: 15px;
         }
 
@@ -112,10 +114,11 @@
         .sign_line {
             border-bottom: 4px #318cf5 solid;
             position: absolute;
-            width: 35px;
-            top: 47%;
-            right: -20px;
+            width: 100%;
+            top: 48%;
+            right: -25px;
             z-index: 10;
+            margin-left: 5px;
         }
 
         .sign_line-wei {