|
@@ -92,6 +92,7 @@ func ActiveConfigCreate(c *gin.Context) {
|
|
|
sqlData.GroupBuyUrl = inData.GroupBuyUrl
|
|
|
sqlData.GroupBuy = `{}`
|
|
|
sqlData.DrawProduct = `{}`
|
|
|
+ sqlData.BackgroundImage = inData.BackgroundImage
|
|
|
|
|
|
configData, err := sqlData.Create()
|
|
|
if err != nil {
|
|
@@ -128,6 +129,7 @@ func ActiveConfigInfo(c *gin.Context) {
|
|
|
var outData models.ActiveConfigReply
|
|
|
var drawInfoSql shanghu.MerchantActiveDrawProduct
|
|
|
var groupBuy shanghu.MerchantActiveGroupBuy
|
|
|
+ var merchant shanghu.Merchant
|
|
|
|
|
|
err := c.ShouldBindJSON(&inData)
|
|
|
if err != nil {
|
|
@@ -217,6 +219,15 @@ func ActiveConfigInfo(c *gin.Context) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ merchant.OpenId = inData.MerchantOpenID
|
|
|
+ merchantInfo, err := merchant.GetMerchant()
|
|
|
+ if err != nil {
|
|
|
+ app.Error(c, 500, err, err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ outData.MerchantName = merchantInfo.MerchantName
|
|
|
+
|
|
|
app.OK(c, outData, app.Success)
|
|
|
|
|
|
}
|