Merge remote-tracking branch 'origin/master'

# Conflicts:
#	internal/dao/internal/rewards.go
#	internal/model/do/rewards.go
#	internal/model/entity/rewards.go

internal/controller/rewardType/rewardType_v1_list.go

@@ -20,13 +20,11 @@ func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListR
 	)
 
 	out, err := service.RewardType().List(ctx, &model.RewardTypeListIn{
-		Page:         req.Page,
-		Size:         req.Size,
-		OperatorId:   operatorId,
-		OperatorRole: operatorRole,
-		StoreId:      req.StoreId,
-		Name:         req.Name,
-		Source:       req.Source,
+		Page:    req.Page,
+		Size:    req.Size,
+		StoreId: req.StoreId,
+		Name:    req.Name,
+		Source:  req.Source,
 	})
 
 	if err != nil {

internal/controller/statistic/statistic_v1_get_online_device.go

@@ -10,6 +10,11 @@ import (
 )
 
 func (c *ControllerV1) GetOnlineDevice(ctx context.Context, req *v1.GetOnlineDeviceReq) (res *v1.GetOnlineDeviceRes, err error) {
-	card, err := g.Redis().SCard(ctx, fmt.Sprintf(consts.NetbarOnlineDeviceSetKey, req.NetbarAccount))
-	return &v1.GetOnlineDeviceRes{Total: card}, err
+	get, err := g.Redis().Get(ctx, fmt.Sprintf(consts.NetbarOnlineNumberKey, req.NetbarAccount))
+	if err != nil {
+		return nil, err
+	}
+	return &v1.GetOnlineDeviceRes{
+		Total: get.Int64(),
+	}, nil
 }

internal/controller/task/task_v1_get_user_task_records_list.go

@@ -0,0 +1,23 @@
+package task
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/frame/g"
+	"server/internal/model"
+	"server/internal/service"
+
+	"server/api/task/v1"
+)
+
+func (c *ControllerV1) GetUserTaskRecordsList(ctx context.Context, req *v1.GetUserTaskRecordsListReq) (res *v1.GetUserTaskRecordsListRes, err error) {
+	fromCtx := g.RequestFromCtx(ctx)
+	userId := fromCtx.GetCtxVar("id").Int()
+	out, err := service.Task().GetUserTaskRecordsList(ctx, &model.UserTaskRecordsListIn{UserId: userId})
+	if err != nil {
+		return nil, err
+	}
+	return &v1.GetUserTaskRecordsListRes{
+		List:  out.List,
+		Total: out.Total,
+	}, nil
+}