commit

app/admin/controller/finance/Finance.php

@@ -8,6 +8,7 @@
 namespace app\admin\controller\finance;
 
 use app\admin\controller\AuthController;
+use app\admin\model\order\StoreOrder;
 use app\admin\model\user\{User,UserBill};
 use app\admin\model\finance\FinanceModel;
 use crmeb\services\{UtilService as Util,JsonService as Json};
@@ -31,6 +32,11 @@ class Finance extends AuthController
             ->distinct(true)
             ->select()
             ->toArray();
+        $data['order_number'] = StoreOrder::where('paid', 1)->sum('pay_price');//订单总数
+        $data['today_number'] = StoreOrder::where('paid', 1)->whereBetweenTime('add_time', strtotime('today'), strtotime('tomorrow'))->sum('pay_price');//今天订单
+        $data['yu_number'] = StoreOrder::where('paid', 1)->where('pay_type', 'yue')->sum('pay_price');//余额订单
+        $data['ali_number'] = StoreOrder::where('paid', 1)->where('pay_type', 'alipay_wap')->sum('pay_price');//支付宝订单
+        $this->assign('data', $data);
         $this->assign('selectList', $list);
         return $this->fetch();
     }

app/admin/view/finance/finance/bill.php

@@ -46,6 +46,50 @@
                         </div>
                     </form>
                 </div>
+                <div class="col-sm-3 ui-sortable">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <span class="label label-success pull-right">￥</span>
+                            <h5>订单金额总数</h5>
+                        </div>
+                        <div class="ibox-content">
+                            <h1 class="no-margins">{$data.order_number}</h1>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-3 ui-sortable">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <span class="label label-success pull-right">￥</span>
+                            <h5>今天订单金额</h5>
+                        </div>
+                        <div class="ibox-content">
+                            <h1 class="no-margins">{$data.today_number}</h1>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-3 ui-sortable">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <span class="label label-success pull-right">￥</span>
+                            <h5>余额支付</h5>
+                        </div>
+                        <div class="ibox-content">
+                            <h1 class="no-margins">{$data.yu_number}</h1>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-3 ui-sortable">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <span class="label label-success pull-right">￥</span>
+                            <h5>支付宝支付</h5>
+                        </div>
+                        <div class="ibox-content">
+                            <h1 class="no-margins">{$data.ali_number}</h1>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="layui-col-md12">

app/api/controller/AdaPayController.php

@@ -26,12 +26,16 @@ class AdaPayController
         $sing = $post['sign'];
         $res = $this->verifySign($sing, $post['data']);
         if($res){
-            $order = strstr($data->order_no, '-', -1);
-            $res = StoreOrder::paySuccess($order, $data->pay_channel);
-            if ($res){
-                echo '200';
-                exit();
+            if ($data->status == 'succeeded'){
+                $order = strstr($data->order_no, '-', -1);
+                $res = StoreOrder::paySuccess($order, $data->pay_channel);
+                if ($res){
+                    echo '200';
+                    exit();
+                }
             }
+            echo 'error';
+            exit();
         }else {
             echo 'error';
             exit();
@@ -45,12 +49,16 @@ class AdaPayController
         $sing = $post['sign'];
         $res = $this->verifySign($sing, $post['data']);
         if($res){
-            $order = strstr($data->order_no, '-', -1);
-            $res = UserRecharge::rechargeSuccess($order);
-            if ($res){
-                echo '200';
-                exit();
+            if ($data->status == 'succeeded'){
+                $order = strstr($data->order_no, '-', -1);
+                $res = UserRecharge::rechargeSuccess($order);
+                if ($res){
+                    echo '200';
+                    exit();
+                }
             }
+            echo 'error';
+            exit();
         }else {
             echo 'error';
             exit();

app/api/controller/order/StoreOrderController.php

@@ -248,13 +248,13 @@ class StoreOrderController
                         'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
                         'pay_channel'=> 'alipay_wap',
                         //'time_expire'=> date("YmdHis", time()+86400),
-                        'pay_amt'=> $order['pay_price'],
+                        'pay_amt'=> sprintf("%01.2f",$order['pay_price']),
                         'goods_title'=> '环球优购',
                         'goods_desc'=> '环球优购',
                         'description'=> 'alipay',
                         'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
-                        'callback_url' => 'http://xqyg.frp.liuniu946.com/index',
-                        'notify_url' => 'http://xqyg.frp.liuniu946.com/api/adapay/notify'
+                        'callback_url' => 'http://yg.hqgjsmc.com/index',
+                        'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
                     );
                     $payment->create($payment_params);
                     if ($payment->isError()){
@@ -273,15 +273,15 @@ class StoreOrderController
                         'order_no'=> $order['order_id'].'-'.rand(100000, 999999),
                         'pay_channel'=> 'wx_lite',
                         //'time_expire'=> date("YmdHis", time()+86400),
-                        'pay_amt'=> $order['pay_price'],
+                        'pay_amt'=> sprintf("%01.2f",$order['pay_price']),
                         'currency' => 'cny',
                         'goods_title'=> '环球优购',
                         'goods_desc'=> '环球优购',
                         'description'=> 'weixin',
                         'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
                         'expend' => ['open_id' => 'oPVIJ62WxFA5NXYGgiTPdx_uGb3Q'],
-                        'callback_url' => 'http://xqyg.frp.liuniu946.com/index',
-                        'notify_url' => 'http://xqyg.frp.liuniu946.com/api/adapay/notify'
+                        'callback_url' => 'http://yg.hqgjsmc.com/index',
+                        'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
                     );
                     $payment->create($payment_params);
                     if ($payment->isError()){
@@ -289,7 +289,9 @@ class StoreOrderController
                         return app('json')->fail('支付失败');
                     } else {
                         //成功处理
-                        return app('json')->status('alipay', ['jsConfig' => $payment->result, 'orderId' => $order['order_id']]);
+                        $pay = json_decode($payment->result['expend']['pay_info']);
+                        //成功处理
+                        return app('json')->status('alipay', ['jsConfig' => $pay, 'orderId' => $order['order_id']]);
 
                     }
                     break;
@@ -430,8 +432,8 @@ class StoreOrderController
                     'goods_desc'=> '环球优购',
                     'description'=> 'alipay',
                     'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
-                    'callback_url' => 'http://xqyg.frp.liuniu946.com/index',
-                    'notify_url' => 'http://xqyg.frp.liuniu946.com/api/adapay/notify'
+                    'callback_url' => 'http://yg.hqgjsmc.com/index',
+                    'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
                 );
                 $payment->create($payment_params);
                 if ($payment->isError()){
@@ -458,16 +460,17 @@ class StoreOrderController
                     'description'=> 'weixin',
                     'device_info'=> ['device_p'=> $_SERVER ["REMOTE_ADDR"]],
                     'expend' => ['open_id' => 'oPVIJ62WxFA5NXYGgiTPdx_uGb3Q'],
-                    'callback_url' => 'http://xqyg.frp.liuniu946.com/index',
-                    'notify_url' => 'http://xqyg.frp.liuniu946.com/api/adapay/notify'
+                    'callback_url' => 'http://yg.hqgjsmc.com/index',
+                    'notify_url' => 'http://yg.hqgjsmc.com/api/adapay/notify'
                 );
                 $payment->create($payment_params);
                 if ($payment->isError()){
                     //失败处理
                     return app('json')->fail('支付失败');
                 } else {
+                    $pay = json_decode($payment->result['expend']['pay_info']);
                     //成功处理
-                    return app('json')->status('alipay', ['jsConfig' => $payment->result, 'orderId' => $order['order_id']]);
+                    return app('json')->status('alipay', ['jsConfig' => $pay, 'orderId' => $order['order_id']]);
 
                 }
                 break;

app/api/controller/user/UserController.php

@@ -651,7 +651,7 @@ class UserController
                     $item['release_time'] = time();
                     StoreOrderRelease::where('id', $item['id'])->update(['already' => $item['already'], 'status' => $item['status'], 'release_time' => strtotime('today')]);
                     if ($user['spread_uid'] > 0){
-                        User::release_push($user['spread_uid'], $number, $release['to_release']);
+                        User::release_push($user['spread_uid'], $number, $item['to_release']);
                     }
                     $res = $res1 && $res2;
                     User::checkTrans($res);

app/models/store/StoreOrder.php

@@ -407,6 +407,7 @@ class StoreOrder extends BaseModel
             }
 
             if ($userConsumption && $SurplusConsumption > 0){
+                $payPrice -= $payPostage;
                 if ($SurplusConsumption < $payPrice){
                     $deductionPrice = $SurplusConsumption;
                     $payPrice = bcsub($payPrice, $SurplusConsumption, 2);
@@ -420,6 +421,7 @@ class StoreOrder extends BaseModel
                     $resc = false !== User::bcDec($userInfo['uid'], 'consumption', $deductionPrice, 'uid');
                     $payPrice = 0;
                 }
+                $payPrice += $payPostage;
                 $resc = $resc && false != UserBill::expend('消费券抵扣', $uid, 'consumption', 'deduction', $deductionPrice, $key, $SurplusConsumption, '购买商品使用' . floatval($deductionPrice) . '消费券抵扣抵扣' . floatval($deductionPrice) . '元');
                 $usedIntegral = 0;
                 if (!$resc) return self::setErrorInfo('使用消费券抵扣失败!', true);
@@ -826,7 +828,7 @@ class StoreOrder extends BaseModel
         $oid = self::where('order_id', $orderId)->value('id');
         StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
         $now_money = User::where('uid', $order['uid'])->value('now_money');
-        UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元购买商品');
+        UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, $paytype.'支付' . floatval($order['pay_price']) . '元购买商品');
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);
         $res = $res1 && $resPink && UserSpread::setSpreadSure($order['uid']) && User::backOrderBrokerage($order);

app/models/store/StoreProduct.php

@@ -209,6 +209,7 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
+                $list[$k]['integral'] = StoreProductAttrValueModel::where('product_id', $v['id'])->find()['integral'];
             }
         }
         return self::setLevelPrice($list, $uid);
@@ -254,6 +255,7 @@ class StoreProduct extends BaseModel
         if (!empty($list)) {
             foreach ($list as $k => $v) {
                 $list[$k]['activity'] = self::activity($v['id']);
+                $list[$k]['integral'] = StoreProductAttrValueModel::where('product_id', $v['id'])->find()['integral'];
             }
         }
         return self::setLevelPrice($list, $uid);

app/models/user/User.php

@@ -507,7 +507,9 @@ class User extends BaseModel
         if (!count($userStair)) return [];
         if ($grade == 0) return self::getUserSpreadCountList(implode(',', $userStair), $orderBy, $keyword, $page, $limit);
         $userSecondary = self::where('spread_uid', 'in', implode(',', $userStair))->column('uid');
-        return self::getUserSpreadCountList(implode(',', $userSecondary), $orderBy, $keyword, $page, $limit);
+        $user = self::select();
+        $uid = get_downline($user, $uid);
+        return self::getUserSpreadCountList(implode(',', $uid), $orderBy, $keyword, $page, $limit);
     }
 
     /**
@@ -528,7 +530,7 @@ class User extends BaseModel
             ->where('o.is_del', 0)->where('o.is_system_del', 0)->alias('o')->fetchSql(true)->select();
         $model = $model->join("(" . $sql . ") p", 'u.uid = p.uid', 'LEFT');
         $model = $model->where('u.uid', 'IN', $uid);
-        $model = $model->field("u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_count as childCount,u.pay_count as orderCount,p.numberCount");
+        $model = $model->field("u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_count as childCount,u.pay_count as orderCount,p.numberCount,u.phone");
         if (strlen(trim($keyword))) $model = $model->where('u.nickname|u.phone', 'like', "%$keyword%");
         $model = $model->group('u.uid');
         $model = $model->order($orderBy);
@@ -768,31 +770,8 @@ class User extends BaseModel
         }elseif($to_release > 200 and $to_release <= 4000){
             $number = $number * 0.3;
         }
-        $release = StoreOrderRelease::where('uid', $uid)->where('status', 0)->select();
-        if ($release) {
-            foreach ($release as $item) {
-                if ($number > 0) {
-                    if ($item['already'] + $number > $item['to_release']) {
-                        $n1 = $item['to_release'] - $item['already'];// 释放量
-                        $number -= $n1;
-                        $integral = $n1;// 积分
-                        $item['already'] += $n1;
-                        $item['status'] = 1;
-                    } else {
-                        $n1 = $number;
-                        $integral = $n1;// 积分
-                        $number = 0;
-                        $item['already'] += $n1;
-                    }
-                    User::where('uid', $user['uid'])->inc('dynamic_integral', $integral)->update();
-                    UserBill::income('直推奖励释放动态积分', $user['uid'], 'dynamic_integral', 'zt_dynamic_integral', $integral, 0, $user['dynamic_integral'] + $integral, '直推奖励释放订单' . $item['order_id'] . '动态积分');
-                    StoreOrderRelease::where('id', $item['id'])->update(['already' => $item['already'], 'status' => $item['status']]);
-                }
-
-            }
-
-        }
-
+        User::where('uid', $user['uid'])->inc('dynamic_integral', $number)->update();
+        UserBill::income('直推奖励释放动态积分', $user['uid'], 'dynamic_integral', 'zt_dynamic_integral', $number, 0, $user['dynamic_integral'] + $number, '直推奖励动态积分');
     }
 
 
@@ -848,8 +827,7 @@ class User extends BaseModel
                     $three_level = sys_config('tr_level')/100;// v3比例
                     foreach ($spread as $value) {
                         $details = User::where('uid', $value)->find();
-                        $release = StoreOrderRelease::where('uid', $details['uid'])->where('status', 0)->select();
-                        if (count($release) > 0 and $details['level'] > 0){
+                        if ($details['level'] > 0){
                             if ($details['level'] == 1){
                                 if ($v2 == 0 and $v3 == 0){
                                     // 没有发放v2和v3的奖励
@@ -861,6 +839,14 @@ class User extends BaseModel
                                         $jl = ($price*$one)*$one_level;//平级的百分之五
                                         $details['dynamic_integral'] += $jl; // v1团队奖励平级
                                         $v1++;
+                                    }elseif ($v1 == 2){// 发放v1奖励1次
+                                        $jl = ($price*$one)*$one_level/10;//平级的百分之五
+                                        $details['dynamic_integral'] += $jl; // v1团队奖励平级
+                                        $v1++;
+                                    }elseif ($v1 == 3){// 发放v1奖励1次
+                                        $jl = ($price*$one)*$one_level/100;//平级的百分之五
+                                        $details['dynamic_integral'] += $jl; // v1团队奖励平级
+                                        $v1++;
                                     }
                                 }
                             }elseif ($details['level'] == 2){
@@ -874,6 +860,14 @@ class User extends BaseModel
                                         $jl = ($price * $tow)*$tow_level;
                                         $details['dynamic_integral'] += $jl; // v2团队奖励平级
                                         $v2++;
+                                    }elseif($v1 == 0 and $v2 == 2) { // 没有发放v1和v2的奖励的奖励
+                                        $jl = ($price * $tow)*$tow_level/100;
+                                        $details['dynamic_integral'] += $jl; // v2团队奖励平级
+                                        $v2++;
+                                    }elseif($v1 == 0 and $v2 == 3) { // 没有发放v1和v2的奖励的奖励
+                                        $jl = ($price * $tow)*$tow_level/100;
+                                        $details['dynamic_integral'] += $jl; // v2团队奖励平级
+                                        $v2++;
                                     }elseif ($v1 > 0 and $v2 == 0){// 发放v1奖励，没有发放v2的奖励
                                         $jl = $price * ($tow - $one);
                                         $details['dynamic_integral'] += $jl; // v2团队奖励
@@ -882,6 +876,14 @@ class User extends BaseModel
                                         $jl = ($price * ($tow - $one))*$tow_level; // 拿到平级的百分之五
                                         $details['dynamic_integral'] += $jl; // v2团队奖励平级
                                         $v2++;
+                                    }elseif ($v1 > 0 and $v2 == 2){// 发放v1奖励，发放v2的奖励一次
+                                        $jl = ($price * ($tow - $one))*$tow_level/10; // 拿到平级的百分之五
+                                        $details['dynamic_integral'] += $jl; // v2团队奖励平级
+                                        $v2++;
+                                    }elseif ($v1 > 0 and $v2 == 3){// 发放v1奖励，发放v2的奖励一次
+                                        $jl = ($price * ($tow - $one))*$tow_level/100; // 拿到平级的百分之五
+                                        $details['dynamic_integral'] += $jl; // v2团队奖励平级
+                                        $v2++;
                                     }
 
                                 }
@@ -895,6 +897,14 @@ class User extends BaseModel
                                     $jl = ($price * $three) * $three_level; // 拿到平级的百分之五
                                     $details['dynamic_integral'] += $jl; // v3团队奖励平级
                                     $v3++;
+                                }elseif ($v1 == 0 and $v2 == 0 and $v3 == 2) {// 没有发放v1和v2的奖励的奖励
+                                    $jl = ($price * $three) * $three_level/10; // 拿到平级的百分之五
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
+                                }elseif ($v1 == 0 and $v2 == 0 and $v3 == 3) {// 没有发放v1和v2的奖励的奖励
+                                    $jl = ($price * $three) * $three_level/100; // 拿到平级的百分之五
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
                                 }elseif ($v1 > 0 and $v2 == 0 and $v3 == 0){// 发放v1奖励，没有发放v2v3的奖励
                                     $jl = $price * ($three - $one);
                                     $details['dynamic_integral'] += $jl; // v3团队奖励
@@ -903,6 +913,14 @@ class User extends BaseModel
                                     $jl = ($price * ($three - $one)) * $three_level;
                                     $details['dynamic_integral'] += $jl; // v3团队奖励平级
                                     $v3++;
+                                }elseif ($v1 > 0 and $v2 == 0 and $v3 == 2){// 发放v1奖励，没有发放v2v3的奖励
+                                    $jl = ($price * ($three - $one)) * $three_level/10;
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
+                                }elseif ($v1 > 0 and $v2 == 0 and $v3 == 3){// 发放v1奖励，没有发放v2v3的奖励
+                                    $jl = ($price * ($three - $one)) * $three_level/100;
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
                                 }elseif ($v1 == 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励，发放v2的奖励,没有发放v3的奖励
                                     $jl = ($price * ($three - $tow));
                                     $details['dynamic_integral'] += $jl; // v3团队奖励
@@ -911,6 +929,14 @@ class User extends BaseModel
                                     $jl = ($price * ($three - $tow)) * $three_level; // 拿到平级的百分之五
                                     $details['dynamic_integral'] += $jl; // v3团队奖励
                                     $v3++;
+                                }elseif ($v1 == 0 and $v2 > 0 and $v3 == 2){// 发放v1奖励，发放v2的奖励,发放v3的奖励
+                                    $jl = ($price * ($three - $tow)) * $three_level/10; // 拿到平级的百分之五
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励
+                                    $v3++;
+                                }elseif ($v1 == 0 and $v2 > 0 and $v3 == 3){// 发放v1奖励，发放v2的奖励,发放v3的奖励
+                                    $jl = ($price * ($three - $tow)) * $three_level/100; // 拿到平级的百分之五
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励
+                                    $v3++;
                                 }elseif ($v1 > 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励，发放v2的奖励,发放v3的奖励
                                     $jl = ($price * ($three - $tow));
                                     $details['dynamic_integral'] += $jl; // v3团队奖励
@@ -919,6 +945,14 @@ class User extends BaseModel
                                     $jl = ($price * ($three - $tow)) *$three_level;
                                     $details['dynamic_integral'] += $jl; // v3团队奖励平级
                                     $v3++;
+                                }elseif ($v1 > 0 and $v2 > 0 and $v3 == 2){// 发放v1奖励，发放v2的奖励,发放v3的奖励
+                                    $jl = ($price * ($three - $tow)) *$three_level/10;
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
+                                }elseif ($v1 > 0 and $v2 > 0 and $v3 == 3){// 发放v1奖励，发放v2的奖励,发放v3的奖励
+                                    $jl = ($price * ($three - $tow)) *$three_level/100;
+                                    $details['dynamic_integral'] += $jl; // v3团队奖励平级
+                                    $v3++;
                                 }
                             }
                             if ($jl > 0){