新增接口

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -1355,7 +1355,7 @@ class OrderMerchantRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$order_id,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"消费获得赠送红包",
                 "desc"          =>'',
                 "surplus"       =>$hongbao,
@@ -1373,7 +1373,7 @@ class OrderMerchantRepository extends BaseRepository
                 "addtime"       =>time(),
                 "status"        =>-1,
                 "order_type"    =>$order_id,
-                "order_id"      =>$order_sn,
+                "order_id"      =>$order_id,
                 "mark"          =>"消费获得赠送贡献值",
                 "desc"          =>'',
                 "surplus"       =>$pv,
@@ -1416,6 +1416,7 @@ class OrderMerchantRepository extends BaseRepository
             $gongxian_data = [
                 "uid"           =>$mer_data["uid"],
                 "mer_id"        =>$order["mer_id"],
+                "pv"            =>$pv,
                 "number"  =>    $gongxian,
                 "addtime"       =>time(),
                 "status"        =>-1,

app/controller/merchant/Common.php

@@ -18,6 +18,7 @@ use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserRelationRepository;
 use app\common\repositories\user\UserVisitRepository;
+use think\facade\Db;
 use think\App;
 
 /**
@@ -41,8 +42,57 @@ class Common extends BaseController
     {
         parent::__construct($app);
         $this->merId = $this->request->merId() ?: null;
+
+
     }
 
+
+    /**今日昨日统计+总贡献值记录=总金豆记录
+     * @param null $merId
+     * @return mixed
+     * @author xaboy
+     * @day 2020/6/25
+     */
+    public function zuorijinri()
+    {
+        $merId = $this->merId;
+
+        $list['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $merId)->value('number');
+        $list['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $merId)->value('number');
+    
+        return app('json')->success(compact('merId', 'list'));
+    }
+
+
+
+     /**收银台最新记录接口
+     * @param null $merId
+     * @return mixed
+     * @author xaboy
+     * @day 2020/6/25
+     */
+    public function zuixinjilu()
+    {
+        $merId = $this->merId;
+        $merId = 476;
+        $pageNum = $this->request->param('pageNum') ?: 1;
+        $pageSize = $this->request->param('pageSize') ?: 10;
+     
+        $query = Db::name('order_merchant');
+        $count = $query->where('mer_id', $merId)->count();
+        $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->select();
+        $list = $list->toArray();
+        foreach ($list as $k => $v) {
+            $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('pv') ?? 0;
+            $list[$k]['gongxian'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+            $list[$k]['jingdou'] = Db::name('user_sign_jingdou')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('number') ?? 0;
+        }
+     
+        return app('json')->success(compact('merId', 'list', 'count'));
+    }
+
+
+
     /**
      * @param null $merId
      * @return mixed

route/merchant.php

@@ -499,6 +499,10 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('product', '/product')->name('merchantStatisticsProduct');
             Route::get('product_visit', '/productVisit')->name('merchantStatisticsProductVisit');
             Route::get('product_cart', '/productCart')->name('merchantStatisticsProductCart');
+
+            Route::get('zuorijinri', '/zuorijinri')->name('merchantCuorijinri');//今日昨日统计+总贡献值记录=总金豆记录
+            Route::get('zuixinjilu', '/zuixinjilu')->name('merchantZuixinjilu');//收银台最新记录接口
+            
         })->prefix('merchant.Common');
 
         //资金明细