首頁 探索 說明
註冊 登入
PH
/
hqyg
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

commit

hrjy 3 年之前
父節點
0adbef5591
當前提交
b0f58465f5
共有 15 個文件被更改，包括 221 次插入 和 85 次删除
分割檢視 顯示文件統計
  1. 2 2
      .constant
  2. 2 1
      app/admin/controller/store/StoreProduct.php
  3. 7 39
      app/admin/model/system/SystemUserTask.php
  4. 1 1
      app/admin/view/index/index.php
  5. 1 1
      app/admin/view/login/index.php
  6. 12 0
      app/admin/view/store/store_product/create.php
  7. 28 0
      app/common.php
  8. 37 0
      app/models/store/StoreOrder.php
  9. 47 0
      app/models/store/StoreOrderRelease.php
  10. 52 0
      app/models/system/SystemUserTask.php
  11. 2 2
      config/database.php
  12. 2 2
      crmeb/repositories/OrderRepository.php
  13. 0 8
      public/.htaccess
  14. 23 23
      public/index.html
  15. 5 6
      public/nginx.htaccess

+ 2 - 2
.constant
查看文件 

@@ -1,3 +1,3 @@
 
 <?php
 
-define('INSTALL_DATE',1578360044);
 
-define('SERIALNUMBER','N2L6Px');
 
+define('INSTALL_DATE',1656902046);
 
+define('SERIALNUMBER','M7tddf');

+ 2 - 1
app/admin/controller/store/StoreProduct.php
查看文件 

@@ -273,7 +273,8 @@ class StoreProduct extends AuthController
 
             ['items', []],
 
             ['attrs', []],
 
             ['activity', []],
 
-            ['store_type', 1]
 
+            ['store_type', 1],
 
+            ['release', '']
 
         ]);
 
         foreach ($data['activity'] as $k => $v) {
 
             if ($v == '秒杀') {

+ 7 - 39
app/admin/model/system/SystemUserTask.php
查看文件 

@@ -42,51 +42,19 @@ class SystemUserTask extends BaseModel
 
      */
 
     protected static $TaskType = [
 
         [
 
-            'type' => 'SatisfactionIntegral',
 
-            'name' => '满足积分{$num}',
 
-            'real_name' => '积分数',
 
+            'type' => 'DirectPush',
 
+            'name' => '直推下级账户{$num}',
 
+            'real_name' => '直推账户',
 
             'max_number' => 0,
 
             'min_number' => 0,
 
-            'unit' => '分'
 
-        ],
 
-        [
 
-            'type' => 'ConsumptionAmount',
 
-            'name' => '消费满{$num}',
 
-            'real_name' => '消费金额',
 
-            'max_number' => 0,
 
-            'min_number' => 0,
 
-            'unit' => '元'
 
+            'unit' => '人'
 
         ],
 
         [
 
-            'type' => 'ConsumptionFrequency',
 
-            'name' => '消费{$num}',
 
-            'real_name' => '消费次数',
 
+            'type' => 'UnderTheUmbrella',
 
+            'name' => '伞下账户{$num}',
 
+            'real_name' => '伞下账户',
 
             'max_number' => 0,
 
             'min_number' => 0,
 
-            'unit' => '次'
 
-        ],
 
-        [
 
-            'type' => 'CumulativeAttendance',
 
-            'name' => '累计签到{$num}',
 
-            'real_name' => '累计签到',
 
-            'max_number' => 365,
 
-            'min_number' => 1,
 
-            'unit' => '天'
 
-        ],
 
-        [
 
-            'type' => 'InviteGoodFriends',
 
-            'name' => '邀请好友{$num}成为下线',
 
-            'real_name' => '邀请好友成为下线',
 
-            'max_number' => 1000,
 
-            'min_number' => 1,
 
-            'unit' => '人'
 
-        ],
 
-        [
 
-            'type' => 'InviteGoodFriendsLevel',
 
-            'name' => '邀请好友{$num}成为会员',
 
-            'real_name' => '邀请好友成为会员',
 
-            'max_number' => 1000,
 
-            'min_number' => 1,
 
             'unit' => '人'
 
         ],
 
     ];

+ 1 - 1
app/admin/view/index/index.php
查看文件 

@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="renderer" content="webkit">
 
     <meta http-equiv="Cache-Control" content="no-siteapp" />
 
-    <title>Liuniu管理系统</title>
 
+    <title>环球优购管理系统</title>
 
     <!--[if lt IE 9]>
 
     <meta http-equiv="refresh" content="0;ie.html" />
 
     <![endif]-->

+ 1 - 1
app/admin/view/login/index.php
查看文件 

@@ -17,7 +17,7 @@
 
     </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">

+ 12 - 0
app/admin/view/store/store_product/create.php
查看文件 

@@ -684,6 +684,18 @@
 
                                             </div>
 
                                         </div>
 
                                     </div>
 
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
 
+                                        <div class="grid-demo grid-demo-bg1">
 
+                                            <div class="layui-form-item">
 
+                                                <label class="layui-form-label">释放数量</label>
 
+                                                <div class="layui-input-block">
 
+                                                    <input type="number" name="release" lay-verify="title"
 
+                                                           autocomplete="off" placeholder="请输入释放数量" class="layui-input"
 
+                                                           v-model="formData.release">
 
+                                                </div>
 
+                                            </div>
 
+                                        </div>
 
+                                    </div>
 
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
 
                                         <div class="grid-demo grid-demo-bg1">
 
                                             <div class="layui-form-item">

+ 28 - 0
app/common.php
查看文件 

@@ -593,4 +593,32 @@ if (!function_exists('do_request')) {
 
         curl_close($curl);
 
         return $result;
 
     }
 
+
 
+    if (!function_exists('pr')) {
 
+        function pr($var, $int = '')
 
+        {
 
+            $template = PHP_SAPI !== 'cli' ? '<pre>%s</pre>' : "\n%s\n";
 
+            printf($template, print_r($var, true));
 
+            if (!empty($int)) {
 
+                exit($int);
 
+            }
 
+
 
+        }
 
+    }
 
+
 
+
 
+    if (!function_exists('get_downline')){
 
+        //所有下级
 
+        function get_downline($members,$id){
 
+            $arr=array();
 
+            foreach ($members as $key => $v) {
 
+                if($v['spread_uid']==$id){  //pid为0的是顶级分类
 
+                    $arr[]=$v['uid'];
 
+                    $arr = array_merge($arr,get_downline($members,$v['uid']));
 
+                }
 
+            }
 
+            return $arr;
 
+
 
+        }
 
+    }
 
 }

+ 37 - 0
app/models/store/StoreOrder.php
查看文件 

@@ -316,6 +316,8 @@ class StoreOrder extends BaseModel
 
             $cartIds = [];
 
             $totalNum = 0;
 
             $gainIntegral = 0;
 
+            $number = 0;
 
+            $shop_number = sys_config('shop_number');
 
             foreach ($cartInfo as $cart) {
 
                 $cartIds[] = $cart['id'];
 
                 $totalNum += $cart['cart_num'];
 
@@ -323,8 +325,12 @@ class StoreOrder extends BaseModel
 
                 if (!$bargain_id) $bargain_id = $cart['bargain_id'];
 
                 if (!$combinationId) $combinationId = $cart['combination_id'];
 
                 $cartInfoGainIntegral = isset($cart['productInfo']['give_integral']) ? bcmul($cart['cart_num'], $cart['productInfo']['give_integral'], 2) : 0;
 
+                $number += $cart['cart_num'];
 
                 $gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
 
             }
 
+            if ($shop_number < $number) return self::setErrorInfo('最大购买数'.$shop_number, true);
 
+            if ($shop_number - $userInfo['shop_number'] < $number) return self::setErrorInfo('还能最大购买数'.($shop_number - $userInfo['shop_number']), true);
 
+
 
             $deduction = $seckill_id || $bargain_id || $combinationId;
 
             if ($deduction) {
 
                 $couponId = 0;
 
@@ -770,6 +776,7 @@ class StoreOrder extends BaseModel
 
         $order = self::where('order_id', $orderId)->find();
 
         $resPink = true;
 
         $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time(), 'is_del' => 0, 'is_system_del' => 0, 'mark' => '']);//订单改为支付
 
+        $res2 = self::order_release($order);
 
         if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order);//创建拼团
 
         $oid = self::where('order_id', $orderId)->value('id');
 
         StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
 
@@ -781,6 +788,36 @@ class StoreOrder extends BaseModel
 
         return false !== $res;
 
     }
 
 
+    public static function order_release($order)
 
+    {
 
+        $orderInfo = StoreOrderCartInfo::where('oid', $order['id'])->select();
 
+        $release = [];
 
+        if ($orderInfo){
 
+            foreach ($orderInfo as $item)
 
+            {
 
+                if ($item['cart_info']['productInfo']['give_integral'] > 0)
 
+                {
 
+                    for ($i = 1; $i <= $item['cart_info']['cart_num']; $i++){
 
+                        $release[] = [
 
+                            'order_id' => $order['order_id'],
 
+                            'product_id' => $item['cart_info']['productInfo']['id'],
 
+                            'uid' => $order['uid'],
 
+                            'to_release' => $item['cart_info']['productInfo']['give_integral'],
 
+                            'release' => StoreProduct::where('id',  $item['cart_info']['productInfo']['id'])->value('release'),
 
+                            'create_time' => time()
 
+                        ];
 
+                    }
 
+                }
 
+            }
 
+            if ($release){
 
+                $model = new StoreOrderRelease();
 
+                $model->saveAll($release);
 
+            }
 
+            return true;
 
+        }
 
+        return true;
 
+    }
 
+
 
     /*
 
      * 线下支付消息通知
 
      * 待完善

+ 47 - 0
app/models/store/StoreOrderRelease.php
查看文件 

@@ -0,0 +1,47 @@
 
+<?php
 
+/**
 
+ *
 
+ * @author: xaboy<365615158@qq.com>
 
+ * @day: 2017/12/20
 
+ */
 
+
 
+namespace app\models\store;
 
+
 
+use app\admin\model\system\ShippingTemplatesFree;
 
+use app\admin\model\system\ShippingTemplatesRegion;
 
+use crmeb\basic\BaseModel;
 
+use think\db\exception\DataNotFoundException;
 
+use think\db\exception\DbException;
 
+use think\db\exception\ModelNotFoundException;
 
+use think\facade\Cache;
 
+use crmeb\traits\ModelTrait;
 
+use think\facade\Log;
 
+use app\models\system\SystemStore;
 
+use app\models\routine\RoutineTemplate;
 
+use app\models\user\{User, UserAddress, UserBill, UserSpread, WechatUser};
 
+use crmeb\services\{
 
+    SystemConfigService, WechatTemplateService, workerman\ChannelService
 
+};
 
+use app\admin\model\system\ShippingTemplates;
 
+
 
+/**
 
+ * TODO 订单Model
 
+ * Class StoreOrder
 
+ * @package app\models\store
 
+ */
 
+class StoreOrderRelease extends BaseModel
 
+{
 
+    /**
 
+     * 数据表主键
 
+     * @var string
 
+     */
 
+    protected $pk = 'id';
 
+
 
+    /**
 
+     * 模型名称
 
+     * @var string
 
+     */
 
+    protected $name = 'store_order_release';
 
+
 
+    use ModelTrait;
 
+}

+ 52 - 0
app/models/system/SystemUserTask.php
查看文件 

@@ -99,6 +99,22 @@ class SystemUserTask extends BaseModel
 
             'min_number' => 1,
 
             'unit' => '人'
 
         ],
 
+        [
 
+            'type' => 'DirectPush',
 
+            'name' => '直推下级有效账户{$num}',
 
+            'real_name' => '有效账户',
 
+            'max_number' => 0,
 
+            'min_number' => 0,
 
+            'unit' => '人'
 
+        ],
 
+        [
 
+            'type' => 'UnderTheUmbrella',
 
+            'name' => '伞下有效账户{$num}',
 
+            'real_name' => '有效账户',
 
+            'max_number' => 0,
 
+            'min_number' => 0,
 
+            'unit' => '人'
 
+        ],
 
     ];
 
 
     public function profile()
 
@@ -247,6 +263,42 @@ class SystemUserTask extends BaseModel
 
         return ['还需签到{$num}天', $sumCount, $isComplete];
 
     }
 
 
+
 
+    /**
 
+     * 直推有效账户
 
+     * @param int $task_id 任务id
 
+     * @param int $uid 用户id
 
+     * @param int $start_time 查询开始时间
 
+     * @param int $number 限定数量
 
+     * @return Boolean
 
+     * */
 
+    public static function DirectPush($task_id, $uid = 0, $start_time = 0, $number = 0)
 
+    {
 
+        $isComplete = false;
 
+        $sumCount = User::where('spread_uid', $uid)->count();
 
+        if ($sumCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
 
+        return ['直推还需有效账户{$num}天', $sumCount, $isComplete];
 
+    }
 
+
 
+    /**
 
+     * 伞下有效账户
 
+     * @param int $task_id 任务id
 
+     * @param int $uid 用户id
 
+     * @param int $start_time 查询开始时间
 
+     * @param int $number 限定数量
 
+     * @return Boolean
 
+     * */
 
+    public static function UnderTheUmbrella($task_id, $uid = 0, $start_time = 0, $number = 0)
 
+    {
 
+        $isComplete = false;
 
+
 
+        $user = User::select();
 
+        $userCount = get_downline($user, $uid);
 
+        $sumCount = count($userCount);
 
+        if ($sumCount >= $number) $isComplete = UserTaskFinish::setFinish($uid, $task_id) ? true : false;
 
+        return ['伞下还需有效账户{$num}天', $sumCount, $isComplete];
 
+    }
 
+
 
     /**
 
      * 设置任务完成情况
 
      * @param int $task_id 任务id

+ 2 - 2
config/database.php
查看文件 

@@ -23,11 +23,11 @@ return [
 
             // 服务器地址
 
             'hostname'        => Env::get('database.hostname', '127.0.0.1'),
 
             // 数据库名
 
-            'database'        => Env::get('database.database', ''),
 
+            'database'        => Env::get('database.database', 'hqyg'),
 
             // 用户名
 
             'username'        => Env::get('database.username', 'root'),
 
             // 密码
 
-            'password'        => Env::get('database.password', ''),
 
+            'password'        => Env::get('database.password', 'root'),
 
             // 端口
 
             'hostport'        => Env::get('database.hostport', '3306'),
 
             // 连接dsn

+ 2 - 2
crmeb/repositories/OrderRepository.php
查看文件 

@@ -103,13 +103,13 @@ class OrderRepository
 
      */
 
     public static function storeProductOrderUserTakeDelivery($order, $uid)
 
     {
 
-        $res1 = StoreOrder::gainUserIntegral($order);
 
+//        $res1 = StoreOrder::gainUserIntegral($order);
 
 //        $res2 = User::backOrderBrokerage($order);
 
         $res2 = User::sendBackOrderBrokerage($order);
 
         StoreOrder::orderTakeAfter($order);
 
         //满赠优惠券
 
         WechatUser::userTakeOrderGiveCoupon($uid, $order['total_price']);
 
-        if (!($res1 && $res2)) exception('收货失败!');
 
+        if (!($res2)) exception('收货失败!');
 
     }
 
 
     /**

+ 0 - 8
public/.htaccess
查看文件 

@@ -1,8 +0,0 @@
 
-<IfModule mod_rewrite.c>
 
-  Options +FollowSymlinks -Multiviews
 
-  RewriteEngine On
 
-
 
-  RewriteCond %{REQUEST_FILENAME} !-d
 
-  RewriteCond %{REQUEST_FILENAME} !-f
 
-  RewriteRule ^(.*)$ index.php?/$1 [QSA,PT,L]
 
-</IfModule>

文件差異過大導致無法顯示
+ 23 - 23
public/index.html


+ 5 - 6
public/nginx.htaccess
查看文件 

@@ -1,6 +1,5 @@
 
-location / { 
-   if (!-e $request_filename) {
 
-   rewrite  ^(.*)$  /index.php?s=/$1  last;
 
-   break;
 
-    }
 
- }
 
+location / {
 
+        if (!-e $request_filename){
 
+                rewrite  ^(.*)$  /index.php?s=$1  last;   break;
 
+        }
 
+}

部分文件因文件數量過多而無法顯示