From a8fa8575892757a73e25738c47f041fe99ed23ac Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 2 Jul 2024 17:49:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD(API)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/user_sign/UserSignLists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/lists/user_sign/UserSignLists.php b/app/api/lists/user_sign/UserSignLists.php
index 7f13520db..b1ffe274c 100644
--- a/app/api/lists/user_sign/UserSignLists.php
+++ b/app/api/lists/user_sign/UserSignLists.php
@@ -49,7 +49,7 @@ class UserSignLists extends BaseApiDataLists implements ListsSearchInterface
         $type=$this->request->get('type',1);
         $mark=$this->request->get('mark','');
         if($type==1){
-            $this->searchWhere[]=['type','in',[4,9,8,2]];
+            $this->searchWhere[]=['type','in',[4,9,8,2,3]];
             $this->searchWhere[]=['status','=',1];
         }
         if($mark==1){

From 84ad33d3fcf9cd78ee8be1087948d7cfa3c34fdc Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 2 Jul 2024 17:50:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AD=BE=E5=88=B0=E7=8A=B6=E6=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/UserSignLogic.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index 841f0b844..ca8e81b39 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -38,8 +38,6 @@ class UserSignLogic extends BaseLogic
     {
         $find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find();
         if ($find) {
-            $find->status = -1;
-            $find->save();
             $number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number');
             self::write($find, $number, 0, 1, 3, 0);
             User::where('id', $order['uid'])->dec('integral', $number)->update();
@@ -76,8 +74,6 @@ class UserSignLogic extends BaseLogic
     {
         $find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find();
         if ($find) {
-            $find->status = -1;
-            $find->save();
             $number = UserSignLog::where('sid', $find->id)->where('financial_pm', 0)->sum('number');
             self::write($find, $number, 0, 1, 3, 0);
             User::where('id', $order['uid'])->dec('integral', $number)->update();

From a1bfcec42a62c74adc1a292d33b17e9fbdad8cd7 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 2 Jul 2024 17:56:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AD=BE=E5=88=B0=E9=80=BB=E8=BE=91=E4=BB=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/UserSignLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index ca8e81b39..fc7e63791 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -75,7 +75,7 @@ class UserSignLogic extends BaseLogic
         $find = UserSign::where('uid', $order['uid'])->where('order_id', $order['order_id'])->find();
         if ($find) {
             $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();
         }
     }