Kirin hai 1 ano
pai
achega
60a9c41fcb

+ 14 - 0
app/listener/system/timer/SystemTimer.php

@@ -25,6 +25,7 @@ use app\services\order\StoreOrderTakeServices;
 use app\services\product\product\StoreProductServices;
 use app\services\system\attachment\SystemAttachmentServices;
 use app\services\system\timer\SystemTimerServices;
+use app\services\user\AwardIntegralServices;
 use app\services\user\UserIntegralServices;
 use app\services\user\UserServices;
 use app\services\work\WorkChannelCodeServices;
@@ -358,6 +359,19 @@ class SystemTimer extends Cron implements ListenerInterface
                     ]);
                 }
                 break;
+            case 'integral_send' : // 定时发放分红失败
+                /** @var AwardIntegralServices $service */
+                $service = app()->make(AwardIntegralServices::class);
+                try {
+                    return $service->daySend();
+                } catch (\Throwable $e) {
+                    response_log_write([
+                        'message' => '定时发放参考分失败:' . $e->getMessage(),
+                        'file' => $e->getFile(),
+                        'line' => $e->getLine()
+                    ]);
+                }
+                break;
 
         }
     }

+ 25 - 12
app/services/system/config/SystemConfigServices.php

@@ -1482,7 +1482,9 @@ WSS;
             'pay_weixin_client_cert', 'pay_weixin_client_key', 'brokerage_level', 'brokerage_compute_type',
             'action_integral_rate', 'static_integral_rate', 'lake_ratio', 'static_integral_ratio', 'recommend_integral', 'recommend_speed_integral',
             'extract_ratio', 'extract_ratio_active', 'extract_brokerage_ratio', 'extract_brokerage_ratio_active', 'extract_speed_ratio', 'extract_speed_num', 'extract_spread_ratio',
-            'district_award', 'city_award', 'province_award', 'area_award_time', 'reorder_recommend_integral', 'starts_return_time', 'exchange_fee', 'user_exchange_min_energy', 'stock_price'
+            'district_award', 'city_award', 'province_award', 'area_award_time', 'reorder_recommend_integral', 'starts_return_time', 'exchange_fee', 'user_exchange_min_energy', 'stock_price',
+            'default_send_day', 'int_send_day', 'reorder_int_send_day', 'reorder_times', 'shop_integral_ratio', 're_now_money', 're_energy', 'system_achievement_check',
+            'fail_inc_send_day', 'shop_integral_trade_commission', 'shop_integral_trade_switch',
         ]);
 
         $build->rule([
@@ -1515,25 +1517,35 @@ WSS;
 //                    Build::inputNum('uni_brokerage_price', $data['uni_brokerage_price']['info'], $data['uni_brokerage_price']['value'])->min(0)->info($data['uni_brokerage_price']['desc']),
 //                    Build::inputNum('day_brokerage_price_upper', $data['day_brokerage_price_upper']['info'], $data['day_brokerage_price_upper']['value'])->min(-1)->info($data['day_brokerage_price_upper']['desc']),
 //                ])->trueValue('开启', 1)->falseValue('关闭', 0)->info($data['brokerage_user_status']['desc']),
-                Build::inputNum('static_integral_ratio', $data['static_integral_ratio']['info'], $data['static_integral_ratio']['value'])->min(0)->info($data['static_integral_ratio']['desc']),
-                Build::inputNum('lake_ratio', $data['lake_ratio']['info'], $data['lake_ratio']['value'])->min(0)->info($data['lake_ratio']['desc']),
+//                Build::inputNum('static_integral_ratio', $data['static_integral_ratio']['info'], $data['static_integral_ratio']['value'])->min(0)->info($data['static_integral_ratio']['desc']),
+//                Build::inputNum('lake_ratio', $data['lake_ratio']['info'], $data['lake_ratio']['value'])->min(0)->info($data['lake_ratio']['desc']),
                 Build::inputNum('recommend_integral', $data['recommend_integral']['info'], $data['recommend_integral']['value'])->min(0)->info($data['recommend_integral']['desc']),
                 Build::inputNum('reorder_recommend_integral', $data['reorder_recommend_integral']['info'], $data['reorder_recommend_integral']['value'])->min(0)->info($data['reorder_recommend_integral']['desc']),
                 Build::inputNum('recommend_speed_integral', $data['recommend_speed_integral']['info'], $data['recommend_speed_integral']['value'])->min(0)->info($data['recommend_speed_integral']['desc']),
                 Build::inputNum('static_integral_rate', $data['static_integral_rate']['info'], $data['static_integral_rate']['value'])->min(0)->info($data['static_integral_rate']['desc']),
-                Build::inputNum('action_integral_rate', $data['action_integral_rate']['info'], $data['action_integral_rate']['value'])->min(0)->info($data['action_integral_rate']['desc']),
-                Build::inputNum('extract_ratio', $data['extract_ratio']['info'], $data['extract_ratio']['value'])->min(0)->info($data['extract_ratio']['desc']),
-                Build::inputNum('extract_ratio_active', $data['extract_ratio_active']['info'], $data['extract_ratio_active']['value'])->min(0)->info($data['extract_ratio_active']['desc']),
-                Build::inputNum('extract_brokerage_ratio', $data['extract_brokerage_ratio']['info'], $data['extract_brokerage_ratio']['value'])->min(0)->info($data['extract_brokerage_ratio']['desc']),
-                Build::inputNum('extract_brokerage_ratio_active', $data['extract_brokerage_ratio_active']['info'], $data['extract_brokerage_ratio_active']['value'])->min(0)->info($data['extract_brokerage_ratio_active']['desc']),
-                Build::inputNum('extract_speed_ratio', $data['extract_speed_ratio']['info'], $data['extract_speed_ratio']['value'])->min(0)->info($data['extract_speed_ratio']['desc']),
-                Build::inputNum('extract_speed_num', $data['extract_speed_num']['info'], $data['extract_speed_num']['value'])->min(0)->info($data['extract_speed_num']['desc']),
-                Build::inputNum('extract_spread_ratio', $data['extract_spread_ratio']['info'], $data['extract_spread_ratio']['value'])->min(0)->info($data['extract_spread_ratio']['desc']),
+//                Build::inputNum('action_integral_rate', $data['action_integral_rate']['info'], $data['action_integral_rate']['value'])->min(0)->info($data['action_integral_rate']['desc']),
+//                Build::inputNum('extract_ratio', $data['extract_ratio']['info'], $data['extract_ratio']['value'])->min(0)->info($data['extract_ratio']['desc']),
+//                Build::inputNum('extract_ratio_active', $data['extract_ratio_active']['info'], $data['extract_ratio_active']['value'])->min(0)->info($data['extract_ratio_active']['desc']),
+//                Build::inputNum('extract_brokerage_ratio', $data['extract_brokerage_ratio']['info'], $data['extract_brokerage_ratio']['value'])->min(0)->info($data['extract_brokerage_ratio']['desc']),
+//                Build::inputNum('extract_brokerage_ratio_active', $data['extract_brokerage_ratio_active']['info'], $data['extract_brokerage_ratio_active']['value'])->min(0)->info($data['extract_brokerage_ratio_active']['desc']),
+//                Build::inputNum('extract_speed_ratio', $data['extract_speed_ratio']['info'], $data['extract_speed_ratio']['value'])->min(0)->info($data['extract_speed_ratio']['desc']),
+//                Build::inputNum('extract_speed_num', $data['extract_speed_num']['info'], $data['extract_speed_num']['value'])->min(0)->info($data['extract_speed_num']['desc']),
+//                Build::inputNum('extract_spread_ratio', $data['extract_spread_ratio']['info'], $data['extract_spread_ratio']['value'])->min(0)->info($data['extract_spread_ratio']['desc']),
                 Build::inputNum('province_award', $data['province_award']['info'], $data['province_award']['value'])->min(0)->info($data['province_award']['desc']),
                 Build::inputNum('city_award', $data['city_award']['info'], $data['city_award']['value'])->min(0)->info($data['city_award']['desc']),
                 Build::inputNum('district_award', $data['district_award']['info'], $data['district_award']['value'])->min(0)->info($data['district_award']['desc']),
                 Build::inputNum('area_award_time', $data['area_award_time']['info'], $data['area_award_time']['value'])->min(0)->info($data['area_award_time']['desc']),
-                Build::inputNum('starts_return_time', $data['starts_return_time']['info'], $data['starts_return_time']['value'])->min(0)->info($data['starts_return_time']['desc']),
+//                Build::inputNum('starts_return_time', $data['starts_return_time']['info'], $data['starts_return_time']['value'])->min(0)->info($data['starts_return_time']['desc']),
+                Build::inputNum('default_send_day', $data['default_send_day']['info'], $data['default_send_day']['value'])->min(0)->info($data['default_send_day']['desc']),
+                Build::inputNum('int_send_day', $data['int_send_day']['info'], $data['int_send_day']['value'])->min(0)->info($data['int_send_day']['desc']),
+                Build::inputNum('reorder_int_send_day', $data['reorder_int_send_day']['info'], $data['reorder_int_send_day']['value'])->min(0)->info($data['reorder_int_send_day']['desc']),
+                Build::inputNum('reorder_times', $data['reorder_times']['info'], $data['reorder_times']['value'])->min(0)->info($data['reorder_times']['desc']),
+                Build::inputNum('shop_integral_ratio', $data['shop_integral_ratio']['info'], $data['shop_integral_ratio']['value'])->min(0)->info($data['shop_integral_ratio']['desc']),
+                Build::inputNum('re_now_money', $data['re_now_money']['info'], $data['re_now_money']['value'])->min(0)->info($data['re_now_money']['desc']),
+                Build::inputNum('re_energy', $data['re_energy']['info'], $data['re_energy']['value'])->min(0)->info($data['re_energy']['desc']),
+                Build::inputNum('system_achievement_check', $data['system_achievement_check']['info'], $data['system_achievement_check']['value'])->min(0)->info($data['system_achievement_check']['desc']),
+                Build::inputNum('fail_inc_send_day', $data['fail_inc_send_day']['info'], $data['fail_inc_send_day']['value'])->min(0)->info($data['fail_inc_send_day']['desc']),
+                Build::inputNum('shop_integral_trade_commission', $data['shop_integral_trade_commission']['info'], $data['shop_integral_trade_commission']['value'])->min(0)->info($data['shop_integral_trade_commission']['desc']),
             ])->option('提现设置', [
                 Build::alert('微信提现到零钱为自动到账(需要开通微信:企业付款到零钱(商家转账到零钱),并确保配置微信支付证书正确,特别注意:需要配置场景、开启API发起转账),其他方式均需要手动转账', Alert::WARNING)->showIcon(true),
                 Build::radio('brokerage_type', $data['brokerage_type']['info'], $data['brokerage_type']['value'])->options($this->getOptions($data['brokerage_type']['parameter']))->control(1, [
@@ -1557,6 +1569,7 @@ WSS;
                 Build::switch('brokerage_to_money_switch', $data['brokerage_to_money_switch']['info'], (int)$data['brokerage_to_money_switch']['value'])->info($data['brokerage_to_money_switch']['desc'])->trueValue('开启', 1)->falseValue('关闭', 0),
                 Build::switch('brokerage_to_energy_switch', $data['brokerage_to_energy_switch']['info'], (int)$data['brokerage_to_energy_switch']['value'])->info($data['brokerage_to_energy_switch']['desc'])->trueValue('开启', 1)->falseValue('关闭', 0),
                 Build::switch('brokerage_trade_switch', $data['brokerage_trade_switch']['info'], (int)$data['brokerage_trade_switch']['value'])->info($data['brokerage_trade_switch']['desc'])->trueValue('开启', 1)->falseValue('关闭', 0),
+                Build::switch('shop_integral_trade_switch', $data['shop_integral_trade_switch']['info'], (int)$data['shop_integral_trade_switch']['value'])->info($data['shop_integral_trade_switch']['desc'])->trueValue('开启', 1)->falseValue('关闭', 0),
             ]),
         ]);