充值码

apis/shanghu/base.go

@@ -63,5 +63,6 @@ func InitShangHuRouter(engine *gin.RouterGroup) {
 		recharge.POST("/client/account/list", GetMerchantRechargeClientAccountList) //客户端展示金额
 		recharge.POST("/client/ticket/list", GetMerchantRechargeList)               //客户端展示优惠券
 		recharge.POST("/client/recharge/list", GetMerchantClientTicketAccountLog)   //获取充值记录
+		recharge.POST("/verification/code", GetRechargeVerificationCode)            //获取code                                                         //核销码
 	}
 }

apis/shanghu/client.trans.go

@@ -118,6 +118,39 @@ func GetVerificationCode(c *gin.Context) {
 	app.OK(c, encodedData, app.Success)
 }
 
+// 充值核销码
+func GetRechargeVerificationCode(c *gin.Context) {
+	var inData models.RechargeVerificationCodeRequest
+
+	err := c.ShouldBindJSON(&inData)
+	if err != nil {
+		app.Error(c, 400, err, err.Error())
+		return
+	}
+	if inData.MerchantOpenId == "" || inData.ClientOpenId == "" {
+		app.Error(c, 400, errors.New("参数错误"), "参数错误")
+		return
+	}
+
+	str, err := json.Marshal(&inData)
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+
+	key := tools.MD5(string(str))
+
+	key = "AKN" + key
+	qr, err := qrcode.Encode(key, qrcode.High, 200)
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+	encodedData := base64.StdEncoding.EncodeToString(qr)
+
+	app.OK(c, encodedData, app.Success)
+}
+
 func GetMerchantPayTransList(c *gin.Context) {
 	var inData models.MerchantTransRequest
 	var sqlMerchant shanghu.MerchantCard

apis/shanghu/merchant.client.ticket.go

@@ -76,6 +76,7 @@ func GetMerchantRechargeList(c *gin.Context) {
 	}
 
 	sqlData.ClientOpenID = inData.ClientOpenId
+	sqlData.MerchantOpenID = inData.MerchantOpenId
 	cashOutList, count, err := sqlData.MerchantRechargeTicketList(pageSize, pageIndex)
 	if err != nil {
 		app.Error(c, 500, err, err.Error())

apis/shanghu/models/client.trans.go

@@ -37,6 +37,11 @@ type VerificationCodeReply struct {
 	QR string `json:"qr"`
 }
 
+type RechargeVerificationCodeRequest struct {
+	ClientOpenId   string `json:"client_open_id"`
+	MerchantOpenId string `json:"merchant_open_id"`
+}
+
 type MerchantTransRequest struct {
 	MerchantOpenId string `json:"open_id"`
 	PageSize       int    `json:"page_size"`

apis/shanghu/models/merchant.client.ticket.go

@@ -7,9 +7,10 @@ type MerchantRechargeRequest struct {
 }
 
 type MerchantRechargeTicketListRequest struct {
-	ClientOpenId string `json:"client_open_id"`
-	PageSize     int    `json:"page_size"`
-	PageIndex    int    `json:"page_index"`
+	ClientOpenId   string `json:"client_open_id"`
+	MerchantOpenId string `json:"merchant_open_id"`
+	PageSize       int    `json:"page_size"`
+	PageIndex      int    `json:"page_index"`
 }
 
 type MerchantRechargeTicketListReply struct {

models/shanghu/merchant.client.ticket.go

@@ -169,7 +169,7 @@ func (m *MerchantClientTicket) MerchantRechargeTicketList(pageSize int, pageInde
 
 	table := orm.ShMysql.Table(m.TableName())
 
-	table = table.Where("client_open_id = ? ", m.ClientOpenID)
+	table = table.Where("client_open_id = ? and merchant_open_id = ?", m.ClientOpenID, m.MerchantOpenID)
 	var count int
 	if err := table.Select("*").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
 		return nil, 0, err