京东展示为题

app/controller/api/Notify.php

@@ -691,6 +691,7 @@ class Notify
                                         /** @var OrderMerchantRepository $orderMerchantRepository */
                                         $orderMerchantRepository = app()->make(OrderMerchantRepository::class);
                                         $jdAndGonxianConfig = $orderMerchantRepository->getMerchantContribution($store_product_attr_value['extension_one']);
+                                        $merchant_data = Db::name('merchant')->where('mer_id', $store_order_data['mer_id'])->find();
 
                                         //商户获得贡献值  ---- 3月29日  商户不再获得贡献值 改为获得分润值
                     //                    if ($concession_pri >= 0.01) {

app/controller/api/user/User.php

@@ -479,7 +479,7 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 1)->where('status',1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_jingdou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
@@ -2327,10 +2327,10 @@ class User extends BaseController
             if ($v['status'] == 1) {
 //                $v['create_time'] = $v['take_time'];
             }
-            // if ($v['status'] == -1) {
-            //     $v['mark'] = '(失效)' . $v['mark'];
-            //     $v['status'] = 0;
-            // }
+            if ($v['status'] == -1) {
+                $v['mark'] = '(失效)' . $v['mark'];
+//                $v['status'] = 0;
+            }
 
             $data_arr[] = $v;
         }