Explorar o código

提现额度-原来只有共富区有提现额度,现需要全平台消费都发放提现额度,把提现额度从共富区奖励表拆出,单独建表(修复取值错误问题);

sunxbiao hai 5 meses
pai
achega
f5be7de927

+ 15 - 13
app/common/repositories/user/UserThirdRepository.php

@@ -753,7 +753,7 @@ class UserThirdRepository extends BaseRepository
753 753
     /**
754 754
      * 添加预估积分记录
755 755
      */
756
-    public function yuguJifen($order_id,$price,$user_id,$order_sn,$type_shop)
756
+    public function yuguJifen($order_id,$price,$user_id,$order_sn,$type_shop, $payPrice = 0.00)
757 757
     {
758 758
         if (empty($user_id)) {
759 759
             Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, 不存在用户ID"]);
@@ -772,18 +772,20 @@ class UserThirdRepository extends BaseRepository
772 772
         Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, $price"]);
773 773
 
774 774
         try {
775
-            // 所有第三方所下订单,消费者获得 提现额度
776
-            $withdrawalLimit = bcmul($price, CommonEnum::WITHDRAWAL_LIMIT_RATIO, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
777
-            /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
778
-            $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
779
-            $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
780
-                (int)$user_id,
781
-                UserWithdrawalLimitRecordEnum::PM['INCOME']['code'],
782
-                (float)$withdrawalLimit,
783
-                (int)$type_shop,
784
-                $order_sn,
785
-                '消费获得提现额度'
786
-            );
775
+            if ($payPrice > 0.00) {
776
+                // 所有第三方所下订单,消费者获得 提现额度
777
+                $withdrawalLimit = bcmul($payPrice, CommonEnum::WITHDRAWAL_LIMIT_RATIO, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
778
+                /** @var UserWithdrawalLimitRecordRepository $userWithdrawalLimitRecordRepository */
779
+                $userWithdrawalLimitRecordRepository = app()->make(UserWithdrawalLimitRecordRepository::class);
780
+                $userWithdrawalLimitRecordRepository->addUserWithdrawalLimitRecord(
781
+                    (int)$user_id,
782
+                    UserWithdrawalLimitRecordEnum::PM['INCOME']['code'],
783
+                    (float)$withdrawalLimit,
784
+                    (int)$type_shop,
785
+                    $order_sn,
786
+                    '消费获得提现额度'
787
+                );
788
+            }
787 789
 
788 790
             //更新用户积分
789 791
 

+ 2 - 1
app/controller/api/store/product/DaTaoKe.php

@@ -587,7 +587,8 @@ class DaTaoKe
587 587
                     $localOrder['commission'],
588 588
                     $localOrder['uid'],
589 589
                     $localOrder['order_sn'],
590
-                    5
590
+                    5,
591
+                    $order['pay_price']
591 592
                 );
592 593
                 if($order['tk_status'] == 13){
593 594
                     //修改积分和贡献,yanglaojin值记录

+ 2 - 1
app/controller/api/store/product/Jd.php

@@ -834,7 +834,8 @@ class Jd extends BaseController
834 834
                     $localOrder['commission'],
835 835
                     $localOrder['uid'],
836 836
                     $localOrder['order_sn'],
837
-                    $type_shop
837
+                    $type_shop,
838
+                    $order['pay_money']
838 839
                 );
839 840
             } else {
840 841
                 if($localOrder['status']!=$order['status']) {

+ 2 - 1
app/controller/api/store/product/Jt.php

@@ -849,7 +849,8 @@ class Jt extends BaseController
849 849
                     $localOrder['commission'],
850 850
                     $localOrder['uid'],
851 851
                     $localOrder['order_sn'],
852
-                    $type_shop
852
+                    $type_shop,
853
+                    $localOrder['pay_money']
853 854
                 );
854 855
                 //直推奖处理
855 856
 //            $orderThird->yuguZhitui(

+ 2 - 1
app/controller/api/store/product/Su.php

@@ -812,7 +812,8 @@ class Su extends BaseController
812 812
                     $order['commission'],
813 813
                     $order['uid'],
814 814
                     $order['order_sn'],
815
-                    3
815
+                    3,
816
+                    $order['pay_amount']
816 817
                 );
817 818
             } else {
818 819
                 if($localOrder['status']!=$order['status']) {

+ 2 - 2
app/controller/api/store/product/TaoKe.php

@@ -933,8 +933,8 @@ class TaoKe extends BaseController
933 933
                     $localOrder['commission'] ,
934 934
                     $localOrder['uid'],
935 935
                     $localOrder['order_sn'],
936
-                    $type_shop
937
-
936
+                    $type_shop,
937
+                    $localOrder['pay_money']
938 938
                 );
939 939
 //            //直推奖处理
940 940
 //            $orderThird->yuguZhitui(

+ 2 - 1
app/controller/api/store/product/Vip.php

@@ -922,7 +922,8 @@ class Vip extends BaseController
922 922
                     $localOrder['commission'],
923 923
                     $localOrder['uid'],
924 924
                     $localOrder['order_sn'],
925
-                    2
925
+                    2,
926
+                    $localOrder['pay_money']
926 927
                 );
927 928
             } else {
928 929
                 log::info("lorder==={$localOrder['status']}====ooder+{$order['status']}");

+ 2 - 1
app/controller/api/store/service/Huafei.php

@@ -245,7 +245,8 @@ class Huafei extends BaseController
245 245
                 $commissionMoney,
246 246
                 $uid,
247 247
                 $order_sn,
248
-                $type_shop
248
+                $type_shop,
249
+                $push['data']['amount']
249 250
             );
250 251
             return $push;
251 252
 		}else{