v2

app/command/OrderCommand.php

@@ -60,16 +60,24 @@ class OrderCommand extends Command
             $mode = new HxOrderLife;
             if (!empty($result['clue_data'])) {
                 foreach ($result['clue_data'] as $k => $v) {
-                    if ($v['order_id'] > 0 && $v['order_status'] == '履约中') {
+                    if ($v['order_id'] > 0) {
                         $v['telephone'] = (new SignUtil)->init($config['secret'])->decryptAES($v['telephone']);
                         $v['agent_id'] = $config['agent_id'];
+                        $v['create_at'] = $v['create_time_detail']??getDateFull();
+                        // print_r($v);
                         $order = $mode->where("order_id",$v['order_id'])->findOrEmpty();
                         if ($order->isEmpty()) {
                             echo getDateFull()."==新增订单=={$v['order_id']}==\n";
+                            $v['pay_at'] = $v['modify_time'];
                             $order->strict(false)->insertGetId($v);
                         } else {
                             echo getDateFull()."==更新订单=={$v['order_id']}==\n";
-                            $order->strict(false)->save($v);
+                            $order->product_id = $v['product_id'];
+                            if ($v['order_status'] == '履约中') {
+                                $order->telephone = $v['telephone'];
+                                $order->tel_addr = $v['tel_addr'];
+                            }
+                            $order->save();
                         }
                     } else {
                         echo getDateFull()."==跳过订单=={$v['order_id']}==\n";

app/controller/admin/Dash.php

@@ -34,7 +34,7 @@ class Dash
                 'num' => 0,
                 'money' => 0,
             ], 'ta' => 0];
-            foreach ((new HxOrderLife)->whereDay("create_at")->field('status,count(1) total,sum(pay_amount) as money')->group('status')->cursor() as $item) {
+            foreach ((new HxOrderLife)->where($param)->whereDay("create_at")->field('status,count(1) total,sum(pay_amount) as money')->group('status')->cursor() as $item) {
                 [$total['t'.$item['status']] = [
                     'num'   => $item['total'],
                     'money' => $item['money']

app/controller/admin/User.php

@@ -40,6 +40,9 @@ class User
                 $user = (new SystemUser)->where("username",$param['username'])->findOrEmpty();
                 if (!$user->isEmpty()) return error("帐号已存在");
             }
+            if (!empty($request->user['agent_id'])) {
+                $param['agent_id'] = $request->user['agent_id'];
+            }
             if (isset($param['app_id'])) {
                 $param['app_id'] = json_encode($param['app_id']);
             }
@@ -76,4 +79,21 @@ class User
         }
     }
 
+    public function deleteUser(Request $request): Response
+    {
+        try {
+            $param = v_valid([
+                "id.require"        => trans(20010)
+            ],"post");
+            if (!is_array($param)) return error($param);
+            $user = (new SystemUser)->where("id",$param['id'])->findOrEmpty();
+            if ($user->isEmpty()) return errorTrans("empty.error");
+            $state = $user->delete();
+            if (!$state) return errorTrans("error.data");
+            return successTrans("success.data");
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
 }

app/controller/life/Webhooks.php

@@ -49,6 +49,16 @@ class Webhooks
                             $order->strict(false)->insertGetId($orderData);
                         }
                         break;
+                    case "verify_cancel": // 撤销核销
+                        $orderData = $content['certificate'];
+                        if (empty($orderData)) return error("order.error");
+                        $order = (new HxOrderLife)->where("order_id",$orderData['order_id'])->findOrEmpty();
+                        if ($order->isEmpty()) return error("order.error");
+                        if ($order['status'] <> 4) return error("order.error");
+                        $order->status = 1;
+                        $order->order_status = '履约中';
+                        $order->save();
+                        break;
                     default:
                         break;
                 }

app/service/hx/OrderService.php

@@ -25,6 +25,7 @@ class OrderService extends Service
         !empty($param['status']) && $filter[] = ["status", '=', ($param['status']-1)];
         !empty($param['agent']) && $filter[] = ["agent_id", '=', $param['agent']];
         !empty($param['mobile']) && $filter[] = ["mobile", 'like', "%{$param['mobile']}%"];
+        !empty($param['order_id']) && $filter[] = ["order_id", 'like', "%{$param['order_id']}%"];
         !empty($param['name']) && $filter[] = ["product_name", 'like', "%{$param['name']}%"];
         !empty($param['goods']) && $filter[] = ["product_id", 'like', "%{$param['goods']}%"];
         if (!empty($param['apply'])) {

app/service/hx/PoiService.php

@@ -25,7 +25,7 @@ class PoiService extends Service
         $filter = [];
         !empty($param['status']) && $filter[] = ["status", '=', ($param['status']-1)];
         !empty($param['agent']) && $filter[] = ["agent_id", '=', $param['agent']];
-        !empty($param['name']) && $filter[] = ["name", 'like', "%{$param['name']}%"];
+        !empty($param['name']) && $filter[] = ["poi_name", 'like', "%{$param['name']}%"];
         !empty($param['poi']) && $filter[] = ["poi_id", 'like', "%{$param['poi']}%"];
         return $filter;
     }

app/service/system/UserService.php

@@ -24,7 +24,8 @@ class UserService extends Service
         $filter = [];
         !empty($param['status']) && $filter[] = ["status", '=', ($param['status']-1)];
         !empty($param['agent']) && $filter[] = ["agent_id", '=', $param['agent']];
-        !empty($param['name']) && $filter[] = ["name", 'like', "%{$param['name']}%"];
+        !empty($param['username']) && $filter[] = ["username", 'like', "%{$param['username']}%"];
+        !empty($param['truename']) && $filter[] = ["truename", 'like', "%{$param['truename']}%"];
         !empty($param['poi']) && $filter[] = ["poi_id", 'like', "%{$param['poi']}%"];
         return $filter;
     }

config/route.php

@@ -45,6 +45,7 @@ Route::group("/api",function (){
         Route::get("/list",[User::class,"getUserList"]);
         Route::post("/save",[User::class,"setUserData"]);
         Route::post("/passwd",[User::class,"setUserPasswd"]);
+        Route::post("/del",[User::class,"deleteUser"]);
     });