From 00e8d3e1a6469fca01996216d08b9bc74693c639 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 18:12:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B6=E9=93=B6=E6=9C=BA=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/store/lists/user/UserLists.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index 0a888bef6..8b3437237 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -5,6 +5,7 @@ namespace app\store\lists\user;
use app\common\model\store_finance_flow\StoreFinanceFlow;
+use app\common\model\user_sign\UserSign;
use app\store\lists\BaseAdminDataLists;
use app\common\model\user\User;
use app\common\model\user\UserShip;
@@ -50,6 +51,8 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface
$data['return_money'] = StoreFinanceFlow::
where(['user_id'=>$data['id'],'status'=>0,'financial_pm'=>0])
->sum('number');
+ $data['amount_frozen'] = UserSign::where('uid',$data['id'])->where('status',0)->sum('number');
+ $data['get_frozen'] = UserSign::where('uid',$data['id'])->where('status',1)->sum('number');
})->toArray();
return $lists;
From eb0aa5b6fcdbfcc765fefc2cc74a504f34fd1f1b Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 18:27:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/user/UserController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php
index f6f09d5f1..64988235f 100644
--- a/app/api/controller/user/UserController.php
+++ b/app/api/controller/user/UserController.php
@@ -187,7 +187,7 @@ class UserController extends BaseApiController
$remark = $this->userId.'_payPassword';
$code = Cache::get($remark);
if ($code && isset($params['code']) && $code !== $params['code']) {
- throw new Exception('验证码错误');
+ return $this->fail('验证码错误');
}
if ($params['rePassword'] !== $params['password'])
return $this->fail('两次密码不一致');
From c5a21a867b50727d5357455e5f426415a500b8c4 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 18:32:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/lists/order/OrderList.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index 86a4e5378..e97c09067 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -46,7 +46,8 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
{
$userId = $this->request->userId;
if (!$userId) return [];
- $data = StoreOrder::with(['store'])->where($this->searchWhere)->where('uid', $userId)
+ $data = StoreOrder::with(['store'])->where($this->searchWhere)->where(['uid'=>$userId])
+ ->whereIn('shipping_type',[1,2])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
@@ -86,6 +87,6 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
public function count(): int
{
$userId = $this->request->userId;
- return StoreOrder::where($this->searchWhere)->where('uid', $userId)->count();
+ return StoreOrder::where($this->searchWhere)->whereIn('shipping_type',[1,2])->where('uid', $userId)->count();
}
}
From 9a0cd3bd4c4c53d14cbaa7297cb1ab2de3f42686 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 18:37:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/logic/user/UserLogic.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index c0b6b12c0..dd77934bc 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -117,8 +117,8 @@ class UserLogic extends BaseLogic
$data['integral']=bcadd($data['integral'],$number,2);
$number = UserSign::where('uid',$uid)->where('status',0)->sum('number');
$GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
- $data['number'] =$number;
- $data['GetNumber'] =$GetNumber;
+ $data['number'] =bcadd($number,0,2);
+ $data['GetNumber'] =bcadd($GetNumber,0,2);
}else{
$data = [];
}