edit-sylive-biz_pay

common/libraries/market/Sylive_entity.php

@@ -17,6 +17,7 @@ class Sylive_entity{
         $this->ci->load->model('market/market_sylive_activity_biz_model','mdSytActivityBiz');
         $this->ci->load->model('market/market_sylive_activity_kpidata_model','mdSytActivityKpiData');
         $this->ci->load->model('market/market_sylive_organization_model');
+        $this->ci->load->model('market/market_sylive_activity_orders_model','mdSytActivityOrders');
         $this->ci->load->model('live/Live_polyv_viewlog_model', 'mdPolyvViewlog');
     }
 
@@ -58,7 +59,25 @@ class Sylive_entity{
         }else{
             $where["areaId in (select organizationId from lc_market_sylive_organization where parentId={$organizationId} and status=0)"] = null;
         }
-        return $this->ci->mdSytActivityBiz->count($where) ? true : false;
+        $res = false;
+        $act = $this->ci->mdSytActivityBiz->count($where);
+        if($act){
+            $res = true;
+            if(in_array($group_id,[2,3])){ //判断是否支付
+                $where = [
+                    'activityId'=>$a_id,
+                    'status'=>1,
+                ];
+                if($group_id==3){
+                    $where["bizId in (select parentId from lc_market_sylive_organization where organizationId={$organizationId} and status=0)"] = null;
+                }else{
+                    $where['bizId'] = $organizationId;
+                }
+                $is_pay = $this->ci->mdSytActivityOrders->get($where);
+                !$is_pay && $res = false;
+            }
+        }
+        return  $res;
     }
     /**
      * 获取等级数据

home/controllers/h5/market/sylive/Biz.php

@@ -5,7 +5,7 @@ require_once 'Common.php';
 class Biz extends Admin {
 
     private $group_id;
-    private $liche_img = 'https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg';
+    private $liche_img = 'https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg?v=1';
 
     public function __construct(){
         parent::__construct();
@@ -304,7 +304,7 @@ class Biz extends Admin {
 
                 $temp = [
                     'title' => $val['title'],
-                    'time' => date('Y-m-d H:i',$s_time).'~'.date('Y-m-d H:i',$e_time),
+                    'time' => date('m-d H:i',$s_time).'~'.date('m-d H:i',$e_time),
                     'url' => $url,
                     'stat_url' => $stat_url,
                     'state' => $state,
@@ -390,7 +390,6 @@ class Biz extends Admin {
                 'sid' => create_order_no('350200','market'),
                 'activityId' => $a_id,
                 'userId' => $this->uid,
-                'areaId' => $a_id,
                 'bizId' => $this->session['org_id'],
                 'totalPrice' => $pay_price,
                 'expireTime' => time()+24*60*60,//订单过期时间

home/controllers/h5/market/sylive/Notify.php

@@ -16,18 +16,17 @@ class Notify extends CI_Controller {
         $this->load->model('market/market_sylive_activity_model');
         $this->load->model('market/market_sylive_activity_orders_model','mdSytActivityOrders');
         $this->load->library('market/sylive_entity');
-//        try{
-//            //如果返回成功则验证签名
-//            $config = new WxPayConfig();
-//            $input = file_get_contents("php://input");
-//            $result = WxPayNotifyResults::Init($config, $input);
-//            $this->notify = $result->GetValues();
-//            debug_log("[info] ". __FUNCTION__ . "# notify:" . json_encode($this->notify,JSON_UNESCAPED_UNICODE), $this->log_file,$this->log_dir);
-//        }catch (WxPayException $e){
-//            debug_log("[error] ". __FUNCTION__ . ":".$e->getMessage(), $this->log_file,$this->log_dir);
-//            exit();
-//        }
-        $this->notify = $this->input->get();
+        try{
+            //如果返回成功则验证签名
+            $config = new WxPayConfig();
+            $input = file_get_contents("php://input");
+            $result = WxPayNotifyResults::Init($config, $input);
+            $this->notify = $result->GetValues();
+            debug_log("[info] ". __FUNCTION__ . "# notify:" . json_encode($this->notify,JSON_UNESCAPED_UNICODE), $this->log_file,$this->log_dir);
+        }catch (WxPayException $e){
+            debug_log("[error] ". __FUNCTION__ . ":".$e->getMessage(), $this->log_file,$this->log_dir);
+            exit();
+        }
     }
 
     //微信支付异步通知

home/views/h5/market/sylive/act/item.php

@@ -25,7 +25,7 @@
             </div>
             <div class="relative bg-fff mb30 ml30 mr30 inner40 ulib-r20 box-shadow-darkGray">
                 <div class="pb20 text-center"><div class="inline-block relative pl10 pr10 introTitle font-36"><span class="relative z-index-1">{{info.introTitle}}</span></div></div>
-                <div class="line-height-17 font-28 color-666 text-break space-pre-line" v-html="info.content"></div>
+                <div class="line-height-17 font-28 color-666 text-break space-pre-line rich-text-img" v-html="info.content"></div>
             </div>
         </div>
 

home/views/h5/market/sylive/act/ucenter.php

@@ -25,7 +25,7 @@
         </div>
         <div class="relative bg-fff mb30 ml30 mr30 inner40 ulib-r20 box-shadow-darkGray">
             <div class="pb20 text-center"><div class="inline-block relative pl10 pr10 introTitle font-36"><span class="relative z-index-1">{{info.introTitle}}</span></div></div>
-            <div class="line-height-17 font-28 color-666 text-break space-pre-line" v-html="info.content"></div>
+            <div class="line-height-17 font-28 color-666 text-break space-pre-line rich-text-img" v-html="info.content"></div>
         </div>
     </div>
     <a class="bottom-opt pt15 bg-1a1a1a ulib-r750 text-center color-fff" href="/h5/market/sylive/act?skey=<?=$info['skey']?>">

home/views/h5/market/sylive/biz/pay.php

@@ -53,9 +53,9 @@
                                     mDialog.msg({
                                         duration: 250,
                                         pause: 2000,
-                                        content: "恭喜您支付成功",
+                                        content: "支付成功，正在跳转",
                                         onClose:function(){
-                                            window.location = "//h5/market/sylive/biz";
+                                            window.location = "/h5/market/sylive/biz";
                                         }
                                     });
                                 }else{

home/views/h5/market/sylive/login.php

@@ -46,7 +46,7 @@
         </div>
         <div class="absolute bottom-0 left-0 right-0 pl40 pr40 pb80 text-center color-fff">
 <!--            <div class="font-22">联系我们</div>-->
-            <div class="mt10 font-28">Powered by liche.cn</div>
+            <div class="mt10 font-28">Powered by haodian.cn</div>
         </div>
     </div>
 </div>

market/controllers/api/Login.php

@@ -59,7 +59,7 @@ class Login extends BaseController
             $this->return_json($message);
         }
         $user = ['userId' => $re['userId'], 'username' => $re['username'], 'nickname' => $re['nickname']
-            , 'avatar' => "https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg"
+            , 'avatar' => "https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg?v=1"
             , 'sex' => $re['sex'], 'phone' => $re['phone'], 'introduction' => $re['introduction'], 'email' => $re['email']
             , 'enabled' => true, 'accountNonLocked' => true, 'credentialsNonExpired' => true, 'accountNonExpired' => true];
         $roles = $authorities = [];

market/controllers/api/auth/User.php

@@ -21,7 +21,7 @@ class User extends BaseController
     {
         $re = $_SESSION;
         $user = ['userId' => $re['userId'], 'username' => $re['username'], 'nickname' => $re['nickname']
-            , 'avatar' => "https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg"
+            , 'avatar' => "https://qs.haodian.cn/web/images/project/H5-ShiYu/default-avatar.jpg?v=1"
             , 'sex' => $re['sex'], 'phone' => $re['phone'], 'introduction' => $re['introduction'], 'email' => $re['email']
             , 'enabled' => true, 'accountNonLocked' => true, 'credentialsNonExpired' => true, 'accountNonExpired' => true];
         $roles = $authorities = [];