赠送积分模块

@@ -223,13 +223,13 @@ class CenterController extends HomeBaseController
         if ($request->isAjax()) {
             $oid = $request->param('oid');
             //如果是组合支付，需要吧之前支付的积分一并返还
-            $info = Db::name('zj_order')->field('pay_type,whole_num')->where(['id'=>$oid])->find();
+            $info = Db::name('zj_order')->field('pay_type,whole_num')->where(['id' => $oid])->find();
             Db::startTrans();
             if (Db::name('zj_order')->where(['id' => $oid])->value('step') == 1) {
                 if (Db::name('zj_order')->delete($oid)) {
                     if (Db::name('zj_order_goods')->where(['oid' => $oid])->delete()) {
-                        if($info['pay_type'] == 2) {
-                            Db::name('user')->where(['id'=>session('user.id')])->setInc('balance', $info['whole_num']);
+                        if ($info['pay_type'] == 2) {
+                            Db::name('user')->where(['id' => session('user.id')])->setInc('balance', $info['whole_num']);
                         }
                         Db::commit();
                         $this->success('订单已取消', '', true);
@@ -258,9 +258,9 @@ class CenterController extends HomeBaseController
                 'cause' => $request->param('cause'),
                 'step' => 6
             ];
-            if(Db::name('zj_order')->update($data)) {
+            if (Db::name('zj_order')->update($data)) {
                 $this->success('请等待审核', url('user/Center/orderList'), true);
-            }else {
+            } else {
                 $this->success('提交失败', '', false);
             }
         } else {
@@ -294,9 +294,9 @@ class CenterController extends HomeBaseController
                 'com_order' => $request->param('com_order'),
                 'step' => 8
             ];
-            if(Db::name('zj_order')->update($data)) {
+            if (Db::name('zj_order')->update($data)) {
                 $this->success('请等待审核', url('user/Center/orderList'), true);
-            }else {
+            } else {
                 $this->success('提交失败', '', false);
             }
         } else {
@@ -328,7 +328,7 @@ class CenterController extends HomeBaseController
             ->join('zj_kd k', 'o.kid=k.id')
             ->where(['o.id' => $oid])
             ->find();
-        require EXTEND_PATH.'/KdApiSubscribeDemo.php';
+        require EXTEND_PATH . '/KdApiSubscribeDemo.php';
         $requestData = [
             "OrderCode" => $info['order_num'],
             "ShipperCode" => $info['code'],
@@ -342,28 +342,30 @@ class CenterController extends HomeBaseController
     }
 
     //确认收货
-    public function confirm() {
+    public function confirm()
+    {
         $request = request();
-        if($request->isAjax()) {
+        if ($request->isAjax()) {
             $data = [
                 'id' => $request->param('oid'),
                 'step' => 5,
                 'end_time' => time()
             ];
-            if(Db::name('zj_order')->update($data)) {
+            if (Db::name('zj_order')->update($data)) {
                 $this->success('', '', true);
             }
         }
     }
 
-    public function integralLog() {
+    public function integralLog()
+    {
         $type = request()->param('type');
-        if($type == 1) {
+        if ($type == 1) {
             $title = '积分获取记录';
-        }else {
+        } else {
             $title = '积分使用记录';
         }
-        $log = Db::name('zj_integral_log')->where(['uid'=>session('user.id')])->select();
+        $log = Db::name('zj_integral_log')->where(['uid' => session('user.id'), 'type' => $type])->select();
         return $this->fetch('integral_log', [
             'log' => $log,
             'title' => $title