jason 4 сар өмнө
parent
commit
61cc2dd745

+ 1 - 1
application/admin/view/product/welfarerede/add.html

@@ -126,7 +126,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('三级奖励')}</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-promotion_thre" class="form-control" placeholder="请输入%比"  name="row[promotion_thre]" type="text" value="0">
+            <input id="c-promotion_three" class="form-control" placeholder="请输入%比"  name="row[promotion_three]" type="text" value="0">
         </div>
     </div>
     

+ 1 - 1
application/admin/view/product/welfarerede/edit.html

@@ -123,7 +123,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('三级奖励')}</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-promotion_thre" class="form-control" placeholder="请输入%比"  name="row[promotion_thre]" type="text" value="{$row.promotion_thre|htmlentities}">
+            <input id="c-promotion_three" class="form-control" placeholder="请输入%比"  name="row[promotion_three]" type="text" value="{$row.promotion_three|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 1 - 1
application/api/controller/Exchange.php

@@ -213,7 +213,7 @@ class Exchange extends Api
               }
               //推广奖励
               if($bonus > 0 && !empty($welfare_config->is_promotion) && $welfare_config->promotion_product > 0){
-                  ProductWelfareRede::sendPromotionReward($this->auth->id, explode(',', $welfare_config->product_id), $welfare_config->promotion_product, $bonus, $welfare_config->promotion_one,$welfare_config->promotion_two, $welfare_config->promotion_thre);
+                  ProductWelfareRede::sendPromotionReward($this->auth->id, explode(',', $welfare_config->product_id), $welfare_config->promotion_product, $bonus, $welfare_config->promotion_one,$welfare_config->promotion_two, $welfare_config->promotion_three);
               }
               //发放产品奖励
               $rs =WelfareLoginc::setUserWelfareProduct($this->auth->id, $welfare_config['product_id'], ProductOrder::RwaExchange);

+ 2 - 2
application/common/model/ProductWelfareRede.php

@@ -43,7 +43,7 @@ class ProductWelfareRede extends Model
 
 
     //发放推广奖励
-    public static function sendPromotionReward(int $user_id, array $product_ids,  int $product_num, $bonus,  int $promotion_one, int $promotion_two, int $promotion_thre){
+    public static function sendPromotionReward(int $user_id, array $product_ids,  int $product_num, $bonus,  int $promotion_one, int $promotion_two, int $promotion_three){
 
         $pathId  = UserPathModel::where('user_id', $user_id)->order('distance', 'asc')->limit(3)->column('parent_id');
         $ledgerWalletModel = new LedgerWalletModel();
@@ -55,7 +55,7 @@ class ProductWelfareRede extends Model
                     $ratio = $promotion_two;
                     break;
                 case 2:
-                    $ratio = $promotion_thre;
+                    $ratio = $promotion_three;
                     break;
                 default:
                     $ratio = $promotion_one;