会员升级

app/controller/api/v1/PublicController.php

@@ -60,25 +60,19 @@ class PublicController extends BaseController
 
     public function test()
     {
-//        $rate1 = sys_config('action_integral_rate', 3);
-//        $rate2 = sys_config('static_integral_rate', 3);
-//        $service = app()->make(UserAwardIntegralServices::class);
-//        $list = $service->getList(['status' => 0]);
-//        foreach ($list as $v) {
-//            if ($v['type'] == 1) {
-//                $sum_extract = bcmul($rate1, $v['sum_price'], 2);
-//            } else {
-//                $sum_extract = bcmul($rate2, $v['order_price'], 2);
-//            }
-//            if ($sum_extract != $v['extract_sum']) {
-//                $service->update($v['id'], ['extract_sum' => $sum_extract]);
-//            }
-//        }
-//        app()->make(IntegralJob::class)->autoExtract($service->getPrice());
-//        return app('json')->successful('ok');
-//        var_dump(app()->make(SupplierFlowingWaterServices::class)->setSupplierFinance(294, 1));
-
-        var_dump(WithdrawService::init()::contractInfo(327236));
+        $list = UserIntegral::where('add_time', 'between', [1705766400, 1705852800])->where('extract_sun_real', null)->where('type', 0)
+            ->whereNotLike('mark', '%加速%')->select();
+        var_dump($list);
+        $list2 = UserIntegral::where('add_time', 'between', [1705766400, 1705852800])->where('extract_sun_real', null)->where('type', 0)
+            ->whereLike('mark', '%加速%')->select();
+        var_dump($list2);
+        $list3 = UserIntegral::where('add_time', 'between', [1705766400, 1705852800])->where('extract_sun_real', null)->where('type', 1)
+            ->whereLike('mark', '%推荐%')->select();
+        var_dump($list3);
+        $list4 = UserIntegral::where('add_time', 'between', [1705766400, 1705852800])->where('extract_sun_real', null)->where('type', 1)
+            ->whereLike('mark', '%级差%')->select();
+        var_dump($list4);
+
     }
 
     /**

app/services/order/StoreOrderCreateServices.php

@@ -233,7 +233,7 @@ class StoreOrderCreateServices extends BaseServices
         if ($orderInfo['total_price'] < sys_config('min_price', 0) && sys_config('min_price', 0) > 0) {
             throw new ValidateException('下单金额不低于' . sys_config('max_price'));
         }
-        $orderPre = $this->dao->search(['uid' => $uid])->order('add_time', 'desc')->find();
+        $orderPre = $this->dao->search(['uid' => $uid, 'is_del' => 0, 'is_system_del' => 0])->order('add_time', 'desc')->find();
         if ($orderPre && $orderPre['add_time'] > (time() - (sys_config('order_time', 0) * 60))) {
             throw new ValidateException('请等待' . ((sys_config('order_time', 0) * 60) - (time() - $orderPre['add_time'])) . '秒后再下单');
         }