2

modules/config/controller/admin/cdk.go

@@ -29,6 +29,10 @@ type BatchGenerateReq struct {
 	Count  int `json:"count" v:"required|min:1#请输入正确的生成数量"`
 }
 
+type SignRewardOptionsReq struct {
+	g.Meta `path:"/signRewardOptions" method:"POST"`
+}
+
 func (c *CdkController) BatchGenerate(ctx context.Context, req *BatchGenerateReq) (res *cool.BaseRes, err error) {
 	data, err := service.NewCdkService().BatchGenerate(ctx, req.Count)
 	if err != nil {
@@ -36,3 +40,7 @@ func (c *CdkController) BatchGenerate(ctx context.Context, req *BatchGenerateReq
 	}
 	return cool.Ok(data), nil
 }
+
+func (c *CdkController) SignRewardOptions(ctx context.Context, req *SignRewardOptionsReq) (res *cool.BaseRes, err error) {
+	return cool.Ok(service.NewCdkService().SignRewardOptions()), nil
+}

modules/config/service/cdk.go

@@ -145,6 +145,22 @@ func (s *CdkService) GetByID(id uint32) *model.CDKConfig {
 	return item
 }
 
+func (s *CdkService) GetRewardByIDIncludeDeleted(id uint32) *model.CDKConfig {
+	if id == 0 {
+		return nil
+	}
+
+	var item *model.CDKConfig
+	dbm_nocache_noenable(s.Model).Unscoped().Where("id", id).Where("type", CDKTypeReward).Scan(&item)
+	return item
+}
+
+func (s *CdkService) SignRewardOptions() []model.CDKConfig {
+	var items []model.CDKConfig
+	dbm_nocache_noenable(s.Model).Unscoped().Where("type", CDKTypeReward).OrderDesc("id").Scan(&items)
+	return items
+}
+
 func (s *CdkService) All() []model.CDKConfig {
 	var item []model.CDKConfig
 	dbm_notenable(s.Model).WhereLT("exchange_remain_count", 0).Scan(&item)

modules/config/service/sign.go

@@ -58,8 +58,8 @@ func (s *SignInService) ModifyBefore(ctx context.Context, method string, param g
 	if cdkID == 0 {
 		return fmt.Errorf("cdk_id不能为空")
 	}
-	if NewCdkService().GetByID(cdkID) == nil {
-		return fmt.Errorf("绑定的CDK不存在")
+	if NewCdkService().GetRewardByIDIncludeDeleted(cdkID) == nil {
+		return fmt.Errorf("绑定的CDK不存在或不是普通奖励类型")
 	}
 	return nil
 }