diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index c3dad5b..f768271 100755 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -105,7 +105,7 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'sn', 'account', 'nickname', 'avatar', 'real_name', + 'id', 'account', 'nickname', 'avatar', 'real_name', 'sex', 'mobile', 'create_time', 'login_time', 'channel' ]; diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php index 39e3892..e5aea0a 100644 --- a/app/api/controller/LoginController.php +++ b/app/api/controller/LoginController.php @@ -7,7 +7,7 @@ use app\api\validate\{LoginAccountValidate, RegisterValidate, WebScanLoginValida class LoginController extends BaseApiController { - public $notNeedLogin = ['account','logout']; + public $notNeedLogin = ['account','logout','mnpLogin']; /** * @notes 账号登录 diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php index ebbb1a8..13f4736 100644 --- a/app/api/controller/order/RetailOrderController.php +++ b/app/api/controller/order/RetailOrderController.php @@ -23,6 +23,18 @@ class RetailOrderController extends BaseApiController return $this->dataLists(new RetailOrderList()); } + + public function order_count(){ + $userId=$this->request->userId; + $where=['uid'=>$userId,'paid'=>0]; + $no_pay=Cashierclass::where($where)->count(); + $where['paid']=1; + $where['status']=0; + $waiting=Cashierclass::where($where)->count(); + $where['status']=1; + $receiving=Cashierclass::where($where)->count(); + return $this->success('ok',['no_pay'=>$no_pay,'waiting'=>$waiting,'receiving'=>$receiving]); + } /** * @notes 检测零售订单 */ diff --git a/app/api/lists/order/RetailOrderList.php b/app/api/lists/order/RetailOrderList.php index c20499d..7192b99 100644 --- a/app/api/lists/order/RetailOrderList.php +++ b/app/api/lists/order/RetailOrderList.php @@ -26,7 +26,7 @@ class RetailOrderList extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['number', 'paid',], + '=' => ['number', 'paid','status'], 'between_time' => 'create_time', ]; } @@ -50,6 +50,7 @@ class RetailOrderList extends BaseAdminDataLists implements ListsSearchInterface ->select() ->each(function($item){ $item['goods_list']=Cashierinfo::where('pid',$item['id'])->with('goodsName')->field('goods,nums,price sell')->limit(3)->select(); + $item['goods_count']=count(explode(',',$item['cart_id'])); }) ->toArray(); } diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php index a4e0f06..59e7ae5 100644 --- a/app/api/logic/LoginLogic.php +++ b/app/api/logic/LoginLogic.php @@ -51,7 +51,6 @@ class LoginLogic extends BaseLogic $avatar = ConfigService::get('default_image', 'user_avatar'); User::create([ - 'sn' => $userSn, 'avatar' => $avatar, 'nickname' => '用户' . $userSn, 'account' => $params['account'], diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php index fc52f81..7958e03 100644 --- a/app/api/logic/user/AddressLogic.php +++ b/app/api/logic/user/AddressLogic.php @@ -24,8 +24,8 @@ class AddressLogic extends BaseLogic */ public static function add(array $params): bool { - Db::startTrans(); - try { + // Db::startTrans(); + // try { if($params['is_default']==1){ UserAddress::where('uid',$params['uid'])->update(['is_default'=>0]); } @@ -38,11 +38,11 @@ class AddressLogic extends BaseLogic ]); Db::commit(); return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } + // } catch (\Exception $e) { + // Db::rollback(); + // self::setError($e->getMessage()); + // return false; + // } } diff --git a/app/api/service/WechatUserService.php b/app/api/service/WechatUserService.php index 0594b6f..6da7c6c 100644 --- a/app/api/service/WechatUserService.php +++ b/app/api/service/WechatUserService.php @@ -6,6 +6,8 @@ namespace app\api\service; use app\common\enum\YesNoEnum; use app\common\model\user\{User, UserAuth}; use app\common\enum\user\UserTerminalEnum; +use app\common\model\merchat\Merchant; +use app\common\model\supplier\Supplier; use app\common\service\{ConfigService, storage\Driver as StorageDriver}; use think\Exception; @@ -63,7 +65,7 @@ class WechatUserService $unionid = $this->unionid; $user = User::alias('u') - ->field('u.id,u.sn,u.mobile,u.nickname,u.avatar,u.mobile,u.is_disable,u.is_new_user') + ->field('u.id,u.mobile,u.nickname,u.avatar,u.is_disable,u.is_new_user') ->join('user_auth au', 'au.user_id = u.id') ->where(function ($query) use ($openid, $unionid) { $query->whereOr(['au.openid' => $openid]); @@ -74,6 +76,8 @@ class WechatUserService ->findOrEmpty(); $this->user = $user; + // $this->user->merchat=Merchant::where('uid',$user['id'])->find(); + $this->user->supplier=Supplier::where('uid',$user['id'])->field('id,mer_name')->find(); return $this; } @@ -131,7 +135,6 @@ class WechatUserService } $userSn = User::createUserSn(); - $this->user->sn = $userSn; $this->user->account = 'u' . $userSn; $this->user->nickname = "用户" . $userSn; $this->user->avatar = $avatar; diff --git a/app/api/validate/UserAddressValidate.php b/app/api/validate/UserAddressValidate.php index 998b625..5bc74c2 100644 --- a/app/api/validate/UserAddressValidate.php +++ b/app/api/validate/UserAddressValidate.php @@ -42,8 +42,6 @@ class UserAddressValidate extends BaseValidate ]; - ]; - /** * @notes 添加场景 diff --git a/app/common/cache/UserTokenCache.php b/app/common/cache/UserTokenCache.php index 970cbb8..bc7ee59 100644 --- a/app/common/cache/UserTokenCache.php +++ b/app/common/cache/UserTokenCache.php @@ -82,7 +82,6 @@ class UserTokenCache extends BaseCache 'merchant' => $merchant, 'supplier' => $supplier, 'token' => $token, - 'sn' => $user->sn, 'mobile' => $user->mobile, 'avatar' => $user->avatar, 'terminal' => $userSession->terminal, diff --git a/app/common/model/user/User.php b/app/common/model/user/User.php index 8c5bad3..6c11f40 100644 --- a/app/common/model/user/User.php +++ b/app/common/model/user/User.php @@ -44,7 +44,7 @@ class User extends BaseModel public function searchKeywordAttr($query, $value, $data) { if ($value) { - $query->where('sn|nickname|mobile', 'like', '%' . $value . '%'); + $query->where('nickname|mobile', 'like', '%' . $value . '%'); } } @@ -149,14 +149,14 @@ class User extends BaseModel */ public static function createUserSn($prefix = '', $length = 8) { - $rand_str = ''; - for ($i = 0; $i < $length; $i++) { - $rand_str .= mt_rand(0, 9); - } - $sn = $prefix . $rand_str; - if (User::where(['sn' => $sn])->find()) { - return self::createUserSn($prefix, $length); - } + // $rand_str = ''; + // for ($i = 0; $i < $length; $i++) { + // $rand_str .= mt_rand(0, 9); + // } + $sn = $prefix . time(); + // if (User::where(['sn' => $sn])->find()) { + // return self::createUserSn($prefix, $length); + // } return $sn; } } \ No newline at end of file