Merge branch 'dev' into dev-sxb

app/common/model/Region.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model;
+
+
+class Region extends BaseModel
+{
+
+    public static function tablePk(): string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'regions';
+    }
+}

app/common/model/store/shipping/ShippingTemplateFree.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateFree extends BaseModel
 {
@@ -41,7 +42,8 @@ class ShippingTemplateFree extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateRegion.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateRegion extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateRegion extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }
         return $result;

app/common/model/store/shipping/ShippingTemplateUndelivery.php

@@ -8,6 +8,7 @@
 namespace app\common\model\store\shipping;
 
 use app\common\model\BaseModel;
+use app\common\model\Region;
 
 class ShippingTemplateUndelivery extends BaseModel
 {
@@ -40,7 +41,8 @@ class ShippingTemplateUndelivery extends BaseModel
         $result = [];
         if(is_array($city_id)){
             foreach ($city_id as $v){
-                $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                // $result[] = [City::where('city_id',$v)->value('parent_id') ?? 0,intval($v) ];
+                $result[] = [Region::where('id',$v)->value('pid') ?? 0,intval($v) ];
             }
         }else{
             $result['city_id'] = [];

app/common/repositories/finance/FinanceRepository.php

@@ -1953,7 +1953,6 @@ class FinanceRepository extends BaseRepository
         $query = Db::name('user_pv_log')
         ->alias('uss')
         ->leftJoin('user u', 'u.uid=uss.uid')
-        ->leftJoin('store_order o', 'o.order_id=uss.order_id')
         ->when(isset($params['uid']) && $params['uid'] != '', function ($query) use ($params) {
             $query->where('uss.uid', $params['uid']);
         })
@@ -1978,8 +1977,8 @@ class FinanceRepository extends BaseRepository
         $is_excel = request()->param('is_excel', 0);
         if($is_excel == 1){
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
-            ->order('uss.id', 'desc')
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
+                ->order('uss.id', 'desc')
             ->select();
             $arr = [];
             foreach ($date['list'] as $k=>$item){
@@ -2001,18 +2000,19 @@ class FinanceRepository extends BaseRepository
                     $item['phone'],
                     $item['pv'],
                     $item['status'],
-                    $item['order_sn'],
+                    $item['order_id'],
                     $item['mark']
                 );
             }
             return $this->getStatisticsExcel([
-                'ID','时间','用户昵称','手机号','PV数','状态','关联订单','说名',
+                'ID','时间','用户昵称','手机号','PV数','状态','关联订单ID','说明',
             ], $arr, 'PV统计');
+
         }
 
 
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,o.order_sn,uss.status,uss.mark,u.score')
+            ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()

app/common/repositories/user/UserRepository.php

@@ -852,7 +852,8 @@ class UserRepository extends BaseRepository
         }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
             Elm::input('spread_account_old', '原推荐人')->value($spread_message['account'].'('.$spread_message['nickname'].')')->disabled(true),
-            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户推荐人');
     }
 
@@ -873,7 +874,8 @@ class UserRepository extends BaseRepository
         }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
             Elm::input('level_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户节点人（上级）');
     }
 
@@ -891,7 +893,7 @@ class UserRepository extends BaseRepository
         return Elm::createForm(Route::buildUrl('systemUserChangeGroupPro', compact('id'))->build(), [
             Elm::select('old_identity_id', '当前用户身份')->options([$oldIdentity])->value($oldIdentity['value'])->disabled(true),
             Elm::select('new_identity_id', '新的用户身份')->options($identityList),
-            Elm::textarea('mark', '备注', '')->required()->placeholder('请填写备注信息')
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户身份');
     }
 
@@ -3124,11 +3126,14 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$olld_id){
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
+        if (!$spread) {
+            return ['success' => false, 'msg' => '推荐人信息不存在'];
+        }
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
         if($spread){
             try{
@@ -3140,7 +3145,7 @@ class UserRepository extends BaseRepository
  //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
  //               }
                 Db::name("user_spread_change_records")->insert([
-                    'operation_id' => 1,
+                    'operation_id' => $adminId,
                     'uid' => $uid,
                     'old_spread_id' => $olld_id,
                     'new_spread_id' => $spread['uid'],
@@ -3160,15 +3165,17 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $account, $level_account, $mark){
+    public function update_level_uid($uid, $olld_id, $level_account, $mark,$adminId){
         $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
-        $levelId = Db::name("user")->where('account',$account)->value("uid");
+        if (!$level) {
+            return ['success' => false, 'msg' => '节点人信息不存在'];
+        }
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([
-                    'operation_id' => 1,
+                    'operation_id' => $adminId,
                     'uid' => $uid,
-                    'old_level_id' => $levelId,
+                    'old_level_id' => $olld_id,
                     'new_level_id' => $level['uid'],
                     'mark' => $mark ]);
                 return Db::name("user")->where(["uid"=>$uid])->update(['level_id'=>$level['uid']]);

app/controller/admin/user/User.php

@@ -814,9 +814,16 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
+        $adminId = $this->request->adminId();
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户推荐人';
+        $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
-        $mark = '后台管理员修改用户推荐人';
-        if($repository->update_spread($id,$spread_account,$mark,$olld_id)){
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -848,13 +855,19 @@ class User extends BaseController
      * */
     public function changeProLevel($id,UserRepository $repository) {
         $level_account = $this->request->param('level_account');
-        $level_account_old = $this->request->param('level_account_old');
-        $account = explode('(', $level_account_old)[0];
-        $mark = '后台管理员修改用户节点人';
+        $olld_id = Db::name('user')->where('uid', $id)->value('level_id')??0;
+        $adminId = $this->request->adminId();
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户节点人';
+        $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$account,$level_account,$mark)){
+        if($repository->update_level_uid($id,$olld_id,$level_account,$mark,$adminId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }
@@ -872,10 +885,16 @@ class User extends BaseController
     }
     public function changeProGroup($id,UserRepository $repository)
     {
-        $adminId = $this->request->adminId();
         $old_identity_id = $this->request->param('old_identity_id');
         $new_identity_id = $this->request->param('new_identity_id');
+        $adminId = $this->request->adminId();
+        $adminInfo = $this->request->adminInfo();
+        $operation = $adminInfo['account'].'修改用户身份';
         $mark = $this->request->param('mark');
+        if (!empty($mark)) {
+            $mark = "($mark)";
+        }
+        $mark = $operation.$mark;
         if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
@@ -2034,8 +2053,8 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_identity_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_identity_id, r.new_identity_id, r.mark, r.create_time');
+            ->join('user u', 'r.uid = u.uid', 'LEFT')
+            ->field('r.operation_id,r.old_identity_id,r.uid,r.new_identity_id,r.mark,r.create_time,u.nickname,u.account');
             if($uid){
                 $records->where('r.uid', $uid);
             }
@@ -2050,8 +2069,9 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_spread_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_spread_id, r.new_spread_id, r.mark, r.create_time');
+            ->join('user u', 'u.uid = r.old_spread_id', 'LEFT')
+            ->join('user ua', 'ua.uid = r.new_spread_id', 'LEFT')
+            ->field('r.operation_id,r.uid,u.account as old_account,ua.account as new_account,r.mark, r.create_time');
 
         if ($uid) {
             $records->where('r.uid', $uid);
@@ -2070,8 +2090,9 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_level_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_level_id, r.new_level_id, r.mark, r.create_time');
+            ->join('user u', 'u.uid = r.old_level_id', 'LEFT')
+            ->join('user ua', 'ua.uid = r.new_level_id', 'LEFT')
+            ->field('r.operation_id, r.uid, u.account as old_account, ua.account as new_account, r.mark, r.create_time');
         if($uid){
             $records->where('r.uid', $uid);
         }