Sfoglia il codice sorgente

提现手续费&订单

xialei 1 anno fa
parent
commit
b4f0b7536d

+ 4 - 1
app/common/repositories/store/order/StoreOrderRepository.php

@@ -4836,6 +4836,8 @@ class StoreOrderRepository extends BaseRepository
4836 4836
             if ($refund_order_id) {
4837 4837
                 $value['refund_order_id'] = $refund_order_id;
4838 4838
             }
4839
+
4840
+            $value['fzone_paytype'] = json_decode($value['fzone_paytype'], true);
4839 4841
         }
4840 4842
         return compact('list', 'count');
4841 4843
     }
@@ -6976,7 +6978,7 @@ class StoreOrderRepository extends BaseRepository
6976 6978
 //        $teshu_mer_id=implode(',',$teshu_mer_id);
6977 6979
         $auto_close_order_timer = ((int)systemConfig('auto_close_order_timer')) ?: 15;
6978 6980
         $appList = $this->dao->search(['uid' => $userId])
6979
-            ->field('group_order_id,mer_id,cost,pay_price,pay_time,pay_type,distribution_mode,group_order_id,last_status,order_id,order_sn,paid,status,total_num,total_price,trade_no,coupon_price,create_time,pay_postage,real_name,total_postage,uid,user_address,user_phone,7 as source,seckill,delivery_type,exchange_phone,youhui_price,distribution_mode,verify_code,is_day_pay')
6981
+            ->field('group_order_id,fzone_paytype,user_address,user_phone,real_name,mer_id,cost,pay_price,pay_time,pay_type,distribution_mode,group_order_id,last_status,order_id,order_sn,paid,status,total_num,total_price,trade_no,coupon_price,create_time,pay_postage,real_name,total_postage,uid,user_address,user_phone,7 as source,seckill,delivery_type,exchange_phone,youhui_price,distribution_mode,verify_code,is_day_pay')
6980 6982
 //            ->whereNotIn('mer_id',$teshu_mer_id)
6981 6983
             ->where('test_order', 0)
6982 6984
             ->where('is_del', 0)
@@ -7006,6 +7008,7 @@ class StoreOrderRepository extends BaseRepository
7006 7008
                     $val['close_time'] = date('Y-m-d H:i:s', strtotime($val['create_time']) + 3 * 60);
7007 7009
                 }
7008 7010
                 $val['youhui_price'] = set_price_rtrim($val['youhui_price']);
7011
+                $val['fzone_paytype'] = json_decode($val['fzone_paytype'], true);
7009 7012
                 return $val;
7010 7013
             });
7011 7014
         if ($this->source == 'yhc') {

+ 3 - 3
app/common/repositories/user/UserExtractRepository.php

@@ -368,7 +368,7 @@ class UserExtractRepository extends BaseRepository
368 368
 
369 369
                 $user->save();
370 370
 
371
-                $service_money=bcmul($data['extract_price'],'0.06',2);
371
+                $service_money=bcmul($data['extract_price'],'0.1',2);
372 372
                 $data['service_money']=$service_money;
373 373
                 $data['status'] = 0;
374 374
                 $data['uid'] = $user['uid'];
@@ -386,7 +386,7 @@ class UserExtractRepository extends BaseRepository
386 386
                     $user->member_brokerage_price = $brokerage_price;
387 387
                 }
388 388
                 $user->save();
389
-                $service_money=bcmul($data['extract_price'],'0.06',2);
389
+                $service_money=bcmul($data['extract_price'],'0.1',2);
390 390
                 $data['service_money']=$service_money;
391 391
                 $data['status'] = 0;
392 392
                 $data['uid'] = $user['uid'];
@@ -402,7 +402,7 @@ class UserExtractRepository extends BaseRepository
402 402
                         $service_money_yihu= $data['service_money'];
403 403
                     }else{
404 404
                         $extract_price_yihu= $tea_price;
405
-                        $service_money_yihu= bcmul($tea_price,'0.06',2);
405
+                        $service_money_yihu= bcmul($tea_price,'0.1',2);
406 406
                     }
407 407
 
408 408
                 }

+ 3 - 1
app/controller/api/store/order/StoreOrder.php

@@ -877,7 +877,7 @@ class StoreOrder extends BaseController
877 877
 //            -> where("so.seckill",0);
878 878
 //            ->whereNotIn('so.mer_id',$teshu_mer_id);
879 879
         $list=$query
880
-            ->field('sgo.*,so.mer_id,so.order_id,so.order_sn,so.seckill,so.exchange_phone,so.youhui_price,so.distribution_mode,so.is_day_pay')
880
+            ->field('sgo.*,so.mer_id,so.order_id,so.order_sn,so.seckill,so.exchange_phone,so.youhui_price,so.distribution_mode,so.is_day_pay,so.fzone_paytype,so.user_address,so.user_phone,so.real_name')
881 881
             ->page($page,$limit)
882 882
             ->order('sgo.create_time desc')
883 883
             ->select()
@@ -920,6 +920,8 @@ class StoreOrder extends BaseController
920 920
             if($refund_order_id){
921 921
                 $_v['refund_order_id']=$refund_order_id;
922 922
             }
923
+
924
+            $_v['fzone_paytype'] = json_decode($_v['fzone_paytype'], true);
923 925
         }
924 926
 //        $count=Db::name('store_group_order')
925 927
 //            ->alias('sgo')