修改用户反馈信息，新增系统奖励

internal/logic/feedback/feedback.go

@@ -35,7 +35,7 @@ func (s *sFeedback) List(ctx context.Context, in *model.FeedbackIn) (out *model.
 	// 判断角色
 	if in.Role == consts.MerchantRoleCode {
 		m = m.Where(do.Feedbacks{
-			MerchatId: in.OperatorId,
+			MerchantId: in.OperatorId,
 		})
 	} else if in.Role == consts.StoreRoleCode {
 		m = m.Where(do.Feedbacks{
@@ -87,7 +87,7 @@ func (s *sFeedback) Create(ctx context.Context, in *model.FeedbackCreateIn) (out
 		FeedbackType: in.FeedbackType,
 		UserId:       in.OperatorId,
 		StoreId:      in.StoreId,
-		MerchatId:    in.MerchantId,
+		MerchantId:   in.MerchantId,
 	})
 	if err != nil {
 		return nil, err

internal/logic/reward/reward.go

@@ -45,7 +45,7 @@ func (s *sReward) CreateSystemReward(ctx context.Context, in *model.RewardCreate
 		RewardTypeId: in.RewardTypeID,
 		RewardScope:  consts.SystemReward, // 系统奖励
 		Name:         in.Name,
-		Code:         "",
+		Code:         "xmax",
 		Description:  in.Description,
 		Status:       in.Status,
 		Stock:        in.Stock,
@@ -139,7 +139,28 @@ func (s *sReward) CreateStoreReward(ctx context.Context, in *model.RewardCreateI
 
 // ListSystemReward 查询系统奖励列表
 func (s *sReward) ListSystemReward(ctx context.Context, in *model.RewardListIn) (out *model.RewardListOut, err error) {
-	return
+	m := dao.Rewards.Ctx(ctx)
+
+	// 构建查询条件
+	if in.Name != "" {
+		m = m.WhereLike(dao.Rewards.Columns().Name, "%"+in.Name+"%")
+	}
+
+	if in.RewardTypeID != 0 {
+		m = m.Where(do.Rewards{RewardTypeId: in.RewardTypeID})
+	}
+
+	list := make([]model.Reward, 0)
+	var total int
+	err = m.Page(in.Page, in.Size).Where(do.Rewards{RewardScope: 1, Status: in.Status}).OrderDesc(dao.Rewards.Columns().CreatedAt).OrderDesc(dao.Rewards.Columns().Id).ScanAndCount(&list, &total, false)
+	if err != nil {
+		return nil, ecode.Fail.Sub("查询系统奖励失败")
+	}
+
+	return &model.RewardListOut{
+		List:  list,
+		Total: total,
+	}, nil
 }
 
 // ListStoreReward 查询门店奖励列表
@@ -201,7 +222,28 @@ func (s *sReward) ListStoreReward(ctx context.Context, in *model.RewardListIn) (
 
 // UpdateSystemReward 更新系统奖励
 func (s *sReward) UpdateSystemReward(ctx context.Context, in *model.RewardUpdateIn) (out *model.UpdateOut, err error) {
-	return
+	exist, err := dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.ID}).Exist()
+	if err != nil {
+		return nil, ecode.Fail.Sub("查询该奖励失败")
+	}
+	if !exist {
+		return nil, ecode.Params.Sub("该奖励不存在")
+	}
+
+	_, err = dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.ID, RewardScope: 1}).Update(do.Rewards{
+		RewardTypeId: in.RewardTypeID,
+		Name:         in.Name,
+		Description:  in.Description,
+		Status:       in.Status,
+		Stock:        in.Stock,
+		StartAt:      in.StartAt,
+		ExpireAt:     in.ExpireAt,
+	})
+
+	if err != nil {
+		return nil, ecode.Fail.Sub("更新奖励失败")
+	}
+	return &model.UpdateOut{Success: true}, nil
 }
 
 // UpdateStoreReward 更新门店奖励
@@ -295,7 +337,22 @@ func (s *sReward) UpdateStoreReward(ctx context.Context, in *model.RewardUpdateI
 
 // DeleteSystemReward 删除系统奖励
 func (s *sReward) DeleteSystemReward(ctx context.Context, in *model.RewardDeleteIn) (out *model.DeleteOut, err error) {
-	return
+
+	exist, err := dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.ID}).Exist()
+	if err != nil {
+		return nil, ecode.Fail.Sub("查询该奖励失败")
+	}
+
+	if !exist {
+		return nil, ecode.Params.Sub("该奖励不存在")
+	}
+
+	_, err = dao.Rewards.Ctx(ctx).Where(do.Rewards{Id: in.ID}).Delete()
+	if err != nil {
+		return nil, ecode.Fail.Sub("删除奖励失败")
+	}
+
+	return &model.DeleteOut{Success: true}, nil
 }
 
 // DeleteStoreReward 删除门店奖励