WIN-2308041133\Administrator 4 mesi fa
parent
commit
3a95746208

+ 14 - 1
app/common/model/user/AwardLake.php

@@ -74,7 +74,20 @@ class AwardLake extends BaseModel
         }
         }
         return true;
         return true;
     }
     }
-
+    public function handSend()
+    {
+//        $time = strtotime(date('Y-m-d 01:00:00'));
+//        if (time() < $time) {
+//            return true;
+//        }
+        $time= time();
+        $lakes = self::where('send_time', '<', $time)->select();
+        return $lakes;
+        foreach ($lakes as $lake) {
+            $this->sendAward($lake['id']);
+        }
+        return true;
+    }
     public function sendAward($lake_id)
     public function sendAward($lake_id)
     {
     {
         try{
         try{

+ 27 - 3
app/controller/admin/system/config/ConfigOthers.php

@@ -65,7 +65,16 @@ class ConfigOthers extends BaseController
             'extension_pop',
             'extension_pop',
             'transfer_scene_id',
             'transfer_scene_id',
             'award_integral_price',
             'award_integral_price',
-            'extract_commission'
+            'extract_commission',
+            'award_energy_saving_oil',
+            'award_gift_pack',
+            'award_integral_ordinary',
+            'award_integral_energy_saving_oil',
+            'award_integral_gift_pack',
+            'energy_saving_oil_ratio',
+            'gift_pack_ratio',
+
+
         ]);
         ]);
 
 
         if ($data['extension_two_rate'] < 0 || $data['extension_one_rate'] < 0)
         if ($data['extension_two_rate'] < 0 || $data['extension_one_rate'] < 0)
@@ -76,10 +85,25 @@ class ConfigOthers extends BaseController
             return app('json')->fail('一级比例不能小于二级比例');
             return app('json')->fail('一级比例不能小于二级比例');
         if (bccomp(bcadd($data['extension_one_rate'], $data['extension_two_rate'], 3), 1, 3) == 1)
         if (bccomp(bcadd($data['extension_one_rate'], $data['extension_two_rate'], 3), 1, 3) == 1)
             return app('json')->fail('比例之和不能超过1,即100%');
             return app('json')->fail('比例之和不能超过1,即100%');
-        if (!ctype_digit((string)$data['extension_limit_day']) || $data['extension_limit_day'] <= 0)
-            return app('json')->fail('分销绑定时间必须大于0');
+//        if (!ctype_digit((string)$data['extension_limit_day']) || $data['extension_limit_day'] <= 0)
+//            return app('json')->fail('分销绑定时间必须大于0');
         if ($data['promoter_type'] == 3 && (!ctype_digit((string)$data['promoter_low_money']) || $data['promoter_low_money'] <= 0))
         if ($data['promoter_type'] == 3 && (!ctype_digit((string)$data['promoter_low_money']) || $data['promoter_low_money'] <= 0))
             return app('json')->fail('满额分销最低金额必须大于0');
             return app('json')->fail('满额分销最低金额必须大于0');
+        if ($data['award_energy_saving_oil'] < 0)
+            return app('json')->fail('节能油商品赠送分红额度消费金额不能小于0');
+        if ($data['award_gift_pack'] < 0)
+            return app('json')->fail('礼包商品赠送分红额度消费金额不能小于0');
+        if ($data['award_integral_ordinary'] < 0)
+            return app('json')->fail('普通商品赠送分红积分消费金额不能小于0');
+        if ($data['award_integral_energy_saving_oil'] < 0)
+            return app('json')->fail('节能油商品赠送分红积分消费金额不能小于0');
+        if ($data['award_integral_gift_pack'] < 0)
+            return app('json')->fail('礼包商品赠送分红积分消费金额不能小于0');
+        if ($data['energy_saving_oil_ratio'] < 0)
+            return app('json')->fail('节能油商品业绩分红比例不能小于0');
+        if ($data['gift_pack_ratio'] < 0)
+            return app('json')->fail('礼包商品业绩分红比例不能小于0');
+
 
 
         $old = systemConfig(['extension_limit', 'extension_limit_day']);
         $old = systemConfig(['extension_limit', 'extension_limit_day']);
 
 

+ 7 - 0
app/controller/admin/user/Award.php

@@ -14,6 +14,7 @@
 namespace app\controller\admin\user;
 namespace app\controller\admin\user;
 
 
 
 
+use app\common\model\user\AwardLake;
 use app\common\repositories\store\ExcelRepository;
 use app\common\repositories\store\ExcelRepository;
 use app\common\repositories\user\AwardIntegralPriceRepository;
 use app\common\repositories\user\AwardIntegralPriceRepository;
 use app\common\repositories\user\GiftLevelRepository;
 use app\common\repositories\user\GiftLevelRepository;
@@ -252,4 +253,10 @@ class Award extends BaseController
         $validate->check($data);
         $validate->check($data);
         return $data;
         return $data;
     }
     }
+//    手动分红
+    public function hand_send(AwardLake $awardLake){
+        $awardLake->handSend();
+        return app('json')->success('发送成功');
+
+    }
 }
 }

+ 3 - 0
route/admin/award.php

@@ -24,6 +24,9 @@ Route::group(function () {
 //            '_auth' => false,
 //            '_auth' => false,
 //            '_form' => 'OilLevelCreate',
 //            '_form' => 'OilLevelCreate',
 //        ]);
 //        ]);
+        Route::get('hand/send', '/hand_send')->name('systemHandSend')->option([
+            '_alias' => '手动分红',
+        ]);
         Route::get('lst', '/lst')->name('systemAwardPriceLst')->option([
         Route::get('lst', '/lst')->name('systemAwardPriceLst')->option([
             '_alias' => '积分价格列表',
             '_alias' => '积分价格列表',
         ]);
         ]);