wesmiler 报恩寺项目提交

app/Services/SignsService.php

@@ -227,6 +227,8 @@ class SignsService extends BaseService
         }
 
         // 义工上班结算
+        $signTime = 0;
+        $yigongSalary = 0;
         $isSettle = false;
         $signSettle = ConfigService::make()->getConfigByCode('sign_settle');
         $signSettle = $signSettle>0? $signSettle : false;
@@ -251,7 +253,7 @@ class SignsService extends BaseService
                     'change_type'=> 1,
                     'balance'=> $memberInfo->salary? $memberInfo->salary : 0,
                     'create_time'=> time(),
-                    'remark'=> '打卡工资结算',
+                    'remark'=> "打卡工资结算{$signTime}小时",
                     'status'=> 1
                 ];
                 if(!TradeModel::insertGetId($data)){
@@ -267,7 +269,7 @@ class SignsService extends BaseService
         \DB::commit();
 
         if($type == 2 && $cateId == 2 && $isSettle) {
-            $this->model::where(['id'=> $sid,'user_id'=> $userId])->update(['is_settle'=> 1,'remark'=>'自动结算成功']);
+            $this->model::where(['id'=> $sid,'user_id'=> $userId])->update(['is_settle'=> 1,'remark'=>"自动结算{$signTime}小时工资成功,{$yigongSalary}/小时"]);
         }
 
         return message('打卡成功', true);