|
|
@@ -39,8 +39,8 @@ func (s *ShiftService) End(operatorID uint, actualCash float64, remark string) (
|
|
|
}
|
|
|
|
|
|
var collected float64
|
|
|
- global.GVA_DB.Raw("SELECT COALESCE(SUM(amount),0) FROM payment_record WHERE payment_method='cash' AND paid_at >= ? AND paid_at < ?",
|
|
|
- active.StartTime, time.Now()).Scan(&collected)
|
|
|
+ global.GVA_DB.Raw("SELECT COALESCE(SUM(amount),0) FROM payment_record WHERE payment_method='cash' AND operator_id = ? AND paid_at >= ? AND paid_at < ?",
|
|
|
+ operatorID, active.StartTime, time.Now()).Scan(&collected)
|
|
|
|
|
|
now := time.Now()
|
|
|
expected := active.StartingCash + collected
|