commit

app/admin/controller/finance/Finance.php

@@ -36,6 +36,8 @@ class Finance extends AuthController
         $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');//支付宝订单
+        $data['zt_integral'] = UserBill::where('type', 'zt_dynamic_integral')->sum('number');//直推
+        $data['td_integral'] = UserBill::where('type', 'team')->where('category', 'dynamic_integral')->sum('number');//支付宝订单
         $this->assign('data', $data);
         $this->assign('selectList', $list);
         return $this->fetch();

app/admin/controller/order/StoreOrder.php

@@ -611,7 +611,7 @@ class StoreOrder extends AuthController
                 User::bcDec($bill_integral['uid'], 'integral', $bill_integral['number'], 'uid');
                 UserBill::expend('退款扣除积分', $bill_integral['uid'], 'integral', 'gain', $bill_integral['number'], $id, bcsub($user_integral, $bill_integral['number'], 2), '订单退款扣除积分' . floatval($bill_integral['number']) . '积分');
             }
-
+            \app\admin\model\order\OrderRelease::where('order_id', $product['order_id'])->delete();
             BaseModel::commitTrans();
             return Json::successful('修改成功!');
         } else {

app/admin/model/order/StoreOrder.php

@@ -509,6 +509,9 @@ HTML;
                 case 3:
                     $model = $model->where($aler . 'pay_type', 'offline');
                     break;
+                case 4:
+                    $model = $model->where($aler . 'pay_type', 'in', 'alipay_wap,alipay');
+                    break;
             }
         }
         if (isset($where['type'])) {
@@ -584,6 +587,13 @@ HTML;
                 'background_color' => 'layui-bg-blue',
                 'col' => 2
             ],
+            [
+                'name' => '支付宝支付金额',
+                'field' => '元',
+                'count' => $price['pay_alipay'],
+                'background_color' => 'layui-bg-blue',
+                'col' => 2
+            ],
             [
                 'name' => '运费金额',
                 'field' => '元',
@@ -636,6 +646,7 @@ HTML;
         $price['refund_price'] = 0;//退款金额
         $price['pay_price_wx'] = 0;//微信支付金额
         $price['pay_price_yue'] = 0;//余额支付金额
+        $price['pay_alipay'] = 0;//支付宝支付金额
         $price['pay_price_offline'] = 0;//线下支付金额
         $price['pay_price_other'] = 0;//其他支付金额
         $price['use_integral'] = 0;//用户使用积分
@@ -681,6 +692,8 @@ HTML;
                 $price['pay_price_yue'] = $v['sum_pay_price'];
             } elseif ($v['pay_type'] == 'offline') {
                 $price['pay_price_offline'] = $v['sum_pay_price'];
+            }elseif ($v['pay_type'] == 'alipay_wap') {
+                $price['pay_alipay'] = $v['sum_pay_price'];
             } else {
                 $price['pay_price_other'] = $v['sum_pay_price'];
             }
@@ -1285,6 +1298,8 @@ HTML;
         $yue = self::getOrderWhere($where, new self)->count();
         $where['pay_type'] = 3;
         $offline = self::getOrderWhere($where, new self)->count();
-        return compact('weixin', 'yue', 'offline');
+        $where['pay_type'] = 4;
+        $zfb = self::getOrderWhere($where, new self)->count();
+        return compact('weixin', 'yue', 'offline', 'zfb');
     }
 }

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

@@ -90,6 +90,28 @@
                         </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.zt_integral}</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.td_integral}</h1>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="layui-col-md12">

app/admin/view/order/store_order/index.php

@@ -705,6 +705,7 @@
                     {name: '微信支付', value: 1, count: payTypeCount.weixin},
                     {name: '余额支付', value: 2, count: payTypeCount.yue},
                     {name: '线下支付', value: 3, count: payTypeCount.offline},
+                    {name: '支付宝', value: 4, count: payTypeCount.zfb},
                 ],
                 orderType: [
                     {name: '全部', value: ''},

app/models/store/StoreOrder.php

@@ -828,6 +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');
+        User::where('uid', $order['uid'])->update(['effective' => 1]);
         UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, $paytype.'支付' . floatval($order['pay_price']) . '元购买商品');
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);

crmeb/traits/JwtAuthModelTrait.php

@@ -29,7 +29,7 @@ trait JwtAuthModelTrait
             'aud' => $host,
             'iat' => $time,
             'nbf' => $time,
-            'exp' => strtotime('+ 3hour'),
+            'exp' => strtotime('+90 day'),
         ];
         $params['jti'] = compact('id', 'type');
         $token = JWT::encode($params, Config::get('app.app_key', 'default'));