mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
liu 2024-07-02 18:06:29 +08:00
commit f93f65b379
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/lists/user_sign/UserSignLists.php
View File

@ -49,7 +49,7 @@ class UserSignLists extends BaseApiDataLists implements ListsSearchInterface
$type=$this->request->get('type',1); $type=$this->request->get('type',1);
$mark=$this->request->get('mark',''); $mark=$this->request->get('mark','');
if($type==1){ if($type==1){
$this->searchWhere[]=['type','in',[4,9,8,2]]; $this->searchWhere[]=['type','in',[4,9,8,2,3]];
$this->searchWhere[]=['status','=',1]; $this->searchWhere[]=['status','=',1];
} }
if($mark==1){ if($mark==1){

6
app/common/logic/UserSignLogic.php
View File

@ -38,8 +38,6 @@ class UserSignLogic extends BaseLogic
{ {
$find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find(); $find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find();
if ($find) { if ($find) {
$find->status = -1;
$find->save();
$number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number'); $number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number');
self::write($find, $number, 0, 1, 3, 0); self::write($find, $number, 0, 1, 3, 0);
User::where('id', $order['uid'])->dec('integral', $number)->update(); User::where('id', $order['uid'])->dec('integral', $number)->update();
@ -76,10 +74,8 @@ class UserSignLogic extends BaseLogic
{ {
$find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find(); $find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find();
if ($find) { if ($find) {
$find->status = -1;
$find->save();
$number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number'); $number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number');
self::write($find, $number, 0, 1, 3, 0); self::write($find, $number, 1, 1, 3, 0);
User::where('id', $order['uid'])->dec('integral', $number)->update(); User::where('id', $order['uid'])->dec('integral', $number)->update();
} }
} }