Accueil Explorer Aide
S'inscrire Connexion
PH
/
xhg
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

commit

hrjy il y a 2 ans
Parent
2506fd3abf
commit
d3e1355740
8 fichiers modifiés avec 43 ajouts et 19 suppressions
Vue séparée Afficher les stats Diff
  1. 7 7
      app/admin/view/index/index.php
  2. 2 2
      app/admin/view/login/index.php
  3. 18 0
      app/api/controller/many/ManyController.php
  4. 8 6
      app/models/many/ManyOrder.php
  5. 1 1
      app/models/store/StoreOrder.php
  6. 5 3
      app/models/user/UserBill.php
  7. 1 0
      app/models/user/UserExtract.php
  8. 1 0
      route/api/route.php

+ 7 - 7
app/admin/view/index/index.php
Voir le fichier 

@@ -28,9 +28,9 @@
 
             <ul class="nav" id="side-menu">
 
                 <li class="nav-header">
 
                     <div class="dropdown profile-element admin_open">
 
-                        <span>
 
-                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>
 
-                        </span>
 
+<!--                        <span>-->
 
+<!--                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>-->
 
+<!--                        </span>-->
 
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
 
                             <span class="clear" style="margin-top: 20px;">
 
                                <span class="block m-t-xs"><strong class="font-bold">{$_admin['real_name']}</strong></span>
 
@@ -149,10 +149,10 @@
 
             <iframe class="J_iframe" name="iframe_crmeb_main" width="100%" height="100%" src="{:Url('Index/main')}" frameborder="0" data-id="{:Url('Index/main')}" seamless></iframe>
 
         </div>
 
         <!--底部版权-->
 
-        <div class="footer"  @touchmove.prevent>
 
-            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>
 
-            </div>
 
-        </div>
 
+<!--        <div class="footer"  @touchmove.prevent>-->
 
+<!--            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>-->
 
+<!--            </div>-->
 
+<!--        </div>-->
 
     </div>
 
     <!--右侧部分结束-->
 
     <!--右侧边栏开始-->

+ 2 - 2
app/admin/view/login/index.php
Voir le fichier 

@@ -17,11 +17,11 @@
 
     </script>
 
 </head>
 
 <body class="gray-bg login-bg">
 
-<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>
 
+<!--<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>-->
 
 <div class="middle-box text-center loginscreen  animated fadeInDown">
 
     <div class="login-group">
 
         <h3 class="login-logo">
 
-            <img src="{__ADMIN_PATH}images/logo.png">
 
+<!--            <img src="{__ADMIN_PATH}images/logo.png">-->
 
         </h3>
 
         <form role="form" action="{:url('verify')}" method="post" id="form" onsubmit="return false">
 
             <div class="form-group">

+ 18 - 0
app/api/controller/many/ManyController.php
Voir le fichier 

@@ -41,6 +41,24 @@ class ManyController
 
         return app('json')->success($list);
 
     }
 
 
+
 
+    /**
 
+     * 众筹详情
 
+     * @return mixed
 
+     * @throws \think\db\exception\DataNotFoundException
 
+     * @throws \think\db\exception\DbException
 
+     * @throws \think\db\exception\ModelNotFoundException
 
+     */
 
+    public function details()
 
+    {
 
+        $where = UtilService::getMore([
 
+            ['id'],
 
+        ]);
 
+        $many = Many::find($where['id']);
 
+        if (!$many) return app('json')->fail('没有该场次');
 
+        return app('json')->fail($many->toArray());
 
+    }
 
+
 
     /**
 
      * 投注
 
      * @param Request $request

+ 8 - 6
app/models/many/ManyOrder.php
Voir le fichier 

@@ -251,13 +251,15 @@ class ManyOrder extends BaseModel
 
             if ($user) {
 
                 foreach ($user as $item) {
 
                     $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->sum('price');// 昨天众筹成功返还的流水
 
-                    $details = User::where('uid', $item['uid'])->find();
 
+                    if ($price > 0){
 
+                        $details = User::where('uid', $item['uid'])->find();
 
 
-                    $details['purple_integral'] = ($price * ($details['flowing_water'] / 100)) * 0.7; // 百分之70的紫积分
 
-                    $details['business_integral'] = ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
 
-                    $details->save();
 
-                    UserBill::income('分红流水奖励紫积分', $details['uid'], 'purple_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励紫积分');
 
-                    UserBill::income('分红流水奖励商家积分', $details['uid'], 'business_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['business_integral'], '分红流水奖励商家积分');
 
+                        $details['purple_integral'] = ($price * ($details['flowing_water'] / 100)) * 0.7; // 百分之70的紫积分
 
+                        $details['business_integral'] = ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
 
+                        $details->save();
 
+                        UserBill::income('分红流水奖励紫积分', $details['uid'], 'purple_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励紫积分');
 
+                        UserBill::income('分红流水奖励商家积分', $details['uid'], 'business_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['business_integral'], '分红流水奖励商家积分');
 
+                    }
 
                 }
 
             }
 
         }

+ 1 - 1
app/models/store/StoreOrder.php
Voir le fichier 

@@ -1264,7 +1264,7 @@ class StoreOrder extends BaseModel
 
             $userInfo = User::getUserInfo($order['uid']);
 
             BaseModel::beginTrans();
 
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['business_integral' => bcadd($userInfo['business_integral'], $order['business_integral'], 2)]);
 
-            $res2 = false != UserBill::income('购买商品赠送白积分', $order['uid'], 'business_integral', 'gain', $order['business_integral'], $order['id'], $userInfo['business_integral'], '购买商品赠送' . floatval($order['white_integral']) . '商家积分');
 
+            $res2 = false != UserBill::income('购买商品赠送白积分', $order['uid'], 'business_integral', 'gain', $order['business_integral'], $order['id'], $userInfo['business_integral'], '购买商品赠送' . floatval($order['business_integral']) . '商家积分');
 
             $res = $res1 && $res2;
 
             BaseModel::checkTrans($res);
 
             return $res;

+ 5 - 3
app/models/user/UserBill.php
Voir le fichier 

@@ -79,12 +79,14 @@ class UserBill extends BaseModel
 
                 ->order('add_time DESC')
 
                 ->select();
 
         }
 
-        $list = count($list) ? $list->toArray() : [];
 
-        foreach ($list as &$v) {
 
+        $data['list'] = count($list) ? $list->toArray() : [];
 
+        $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('pm', 0)->sum('number');
 
+        $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('pm', 1)->sum('number');
 
+        foreach ($data['list'] as &$v) {
 
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
 
             $v['number'] = floatval($v['number']);
 
         }
 
-        return $list;
 
+        return $data;
 
     }
 
 
     /**

+ 1 - 0
app/models/user/UserExtract.php
Voir le fichier 

@@ -69,6 +69,7 @@ class UserExtract extends BaseModel
 
             $js = '紫积分';
 
             $bl = 'purple_integral';
 
         }elseif ($data['type'] == 2){
 
+            if ($userInfo['is_merchant'] == 0) return self::setErrorInfo('你不是商户,无法提现');
 
             if ($data['money'] > $userInfo['business_integral']) return self::setErrorInfo('商家积分不足');
 
             $extractPrice = $userInfo['business_integral'];
 
             $js = '商家积分';

+ 1 - 0
route/api/route.php
Voir le fichier 

@@ -171,6 +171,7 @@ Route::group(function () {
 
     Route::get('many/list', 'many.ManyController/many')->name('manyList');//众筹列表
 
     Route::post('many/purchase', 'many.ManyController/purchase')->name('purchase');//投注
 
     Route::get('many/surplus', 'many.ManyController/surplus')->name('surplus');//剩余可投注数量
 
+    Route::get('many/details', 'many.ManyController/details')->name('details');//众筹详情
 
 
     //投注订单
 
     Route::get('many_order/list', 'many.ManyOrderController/order')->name('many_order');//投注订单