收单宝新增重复收单统计，收单备注修改

i2bill.api

@@ -234,6 +234,9 @@ service i2bill-api{
 	
 	@handler AcquirerStudentTotal
 	get  /api/v1/acquirer_student/total returns(Response)
+	
+	@handler AcquirerStudentRemark
+	post  /api/v1/acquirer_student/remark returns(Response)
 }
 
 @server(

internal/handler/routes.go

@@ -138,6 +138,11 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/v1/acquirer_student/total",
 				Handler: acquirer_student.AcquirerStudentTotalHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/v1/acquirer_student/remark",
+				Handler: acquirer_student.AcquirerStudentRemarkHandler(serverCtx),
+			},
 		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 	)

internal/logic/acquirer_student/acquirer_student_add_logic.go

@@ -40,7 +40,7 @@ func (l *AcquirerStudentAddLogic) AcquirerStudentAdd(req types.EnrollAddReq) (*t
 	erpUser, err := model.GetAcquirePermInfo(userId, l.svcCtx.Transformer, l.svcCtx.DB, l.ctx)
 	if err != nil {
 		logx.Error(err.Error())
-		return &types.Response{500, err.Error(), nil}, nil
+		return &types.Response{500, "二维码已失效", nil}, nil
 	}
 	if erpUser == nil || erpUser.UserId == "" {
 		return &types.Response{500, "二维码已失效", nil}, nil

internal/logic/acquirer_student/acquirer_student_total_logic.go

@@ -68,7 +68,7 @@ func (l *AcquirerStudentTotalLogic) AcquirerStudentTotal(r *http.Request) (*type
 	var target int64
 	l.svcCtx.DB.Table("i2bill_mkt_part_time_user").Select("target").Where("user_id = ? and del_flag = 0", userId).Get(&target)
 	var res = make(map[string]interface{})
-	var invalide, untreated, valide int64
+	var invalide, untreated, valide, repeat int64
 	for _, t := range totalByCheck {
 		switch t["check_state"].(int64) {
 		case 54, 56, 59:
@@ -77,6 +77,8 @@ func (l *AcquirerStudentTotalLogic) AcquirerStudentTotal(r *http.Request) (*type
 			valide += t["total"].(int64)
 		case 58:
 			invalide += t["total"].(int64)
+		case 55:
+			repeat += t["total"].(int64)
 		default:
 			untreated += t["total"].(int64)
 		}
@@ -86,5 +88,6 @@ func (l *AcquirerStudentTotalLogic) AcquirerStudentTotal(r *http.Request) (*type
 	res["valide"] = valide
 	res["today_total"] = totalDay[0]["total"]
 	res["target"] = target
+	res["repeat"] = repeat
 	return &types.Response{200, "", res}, nil
 }

model/i2bill_acquirer_student.sql

@@ -20,5 +20,6 @@ CREATE TABLE `i2bill_acquirer_student` (
   `call_type` int DEFAULT NULL COMMENT '渠道',
   `ma_type` int DEFAULT NULL COMMENT '渠道',
   `quao_yji` int DEFAULT NULL COMMENT '渠道',
+  `remark`  varchar(255)  CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;

model/i2bill_acquirer_student_model.go

@@ -55,6 +55,7 @@ type (
 		NetworkDetailId sql.NullInt64  `db:"network_detail_id" json:"network_detail_id"` //渠道四级
 		LoadSchId       sql.NullInt64  `db:"load_sch_id" json:"load_sch_id"`             //资源收集校区
 		ActiveId        sql.NullInt64  `db:"active_id" json:"active_id"`                 //活动
+		Remark          sql.NullString `db:"remark" json:"remark"`                       //备注
 	}
 
 	I2billAcquirerStudentXorm struct {
@@ -79,6 +80,7 @@ type (
 		NetworkDetailId int64     `db:"network_detail_id" json:"network_detail_id"` //渠道四级
 		LoadSchId       int64     `db:"load_sch_id" json:"load_sch_id"`             //收集收集校区
 		ActiveId        int64     `db:"active_id" json:"active_id"`                 //活动
+		Remark          string    `db:"remark" json:"remark"`                       //备注
 	}
 )