From fb607a3c419a4fabe51b81c8c6a4eaef43bcbd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 15 Apr 2021 15:44:24 +0800
Subject: [PATCH] aa

---
 business/jxstore/partner/jds/union.go |  2 +-
 business/jxstore/partner/mt/mt.go     |  8 ++++++--
 business/jxstore/partner/mt/union.go  | 18 ++++++++++++++++--
 business/jxstore/partner/partner.go   | 12 ++++++++++--
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/partner/jds/union.go b/business/jxstore/partner/jds/union.go
index 856c29455..c6750c5f6 100644
--- a/business/jxstore/partner/jds/union.go
+++ b/business/jxstore/partner/jds/union.go
@@ -22,6 +22,6 @@ func (s *UnionHandler) ShareUnionLink(ctx *jxcontext.Context, linkType int) (lin
 	return "jds", err
 }
 
-func (s *UnionHandler) GetUnionActList(ctx *jxcontext.Context, actType int) (link interface{}, err error) {
+func (s *UnionHandler) GetUnionActList(ctx *jxcontext.Context, actType int) (actList []*partner.ActivityList, err error) {
 	return
 }
diff --git a/business/jxstore/partner/mt/mt.go b/business/jxstore/partner/mt/mt.go
index 9d88710ff..be3948585 100644
--- a/business/jxstore/partner/mt/mt.go
+++ b/business/jxstore/partner/mt/mt.go
@@ -4,6 +4,8 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/mtunionapi"
 	"git.rosy.net.cn/jx-callback/business/jxstore/partner"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type UnionHandler struct {
@@ -18,6 +20,8 @@ func init() {
 }
 
 func getAPI() (apiobj *mtunionapi.API) {
-
-	return apiobj
+	if configs, err := dao.QueryConfigs(dao.GetDB(), "mtunionCookie", model.ConfigTypeCookie, ""); err == nil {
+		api.MtUnionAPI.SetCookieWithStr(configs[0].Value)
+	}
+	return api.MtUnionAPI
 }
diff --git a/business/jxstore/partner/mt/union.go b/business/jxstore/partner/mt/union.go
index 24ecc07c7..11e83d7e2 100644
--- a/business/jxstore/partner/mt/union.go
+++ b/business/jxstore/partner/mt/union.go
@@ -1,6 +1,7 @@
 package mt
 
 import (
+	"git.rosy.net.cn/jx-callback/business/jxstore/partner"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 )
 
@@ -8,6 +9,19 @@ func (s *UnionHandler) ShareUnionLink(ctx *jxcontext.Context, linkType int) (lin
 	return "mt", err
 }
 
-func (s *UnionHandler) GetUnionActList(ctx *jxcontext.Context, actType int) (link interface{}, err error) {
-	return
+func (s *UnionHandler) GetUnionActList(ctx *jxcontext.Context, actType int) (actList []*partner.ActivityList, err error) {
+	if result, err := getAPI().ActivityList(actType, 20, 0); err == nil {
+		for _, v := range result {
+			act := &partner.ActivityList{
+				ActID:   v.ID,
+				ActName: v.ActName,
+				ActDes:  v.ActDes,
+				Ratio:   v.Ratio,
+				ActSrc:  v.ActSrc,
+			}
+
+			actList = append(actList, act)
+		}
+	}
+	return actList, err
 }
diff --git a/business/jxstore/partner/partner.go b/business/jxstore/partner/partner.go
index b8377f3a2..cb934e21e 100644
--- a/business/jxstore/partner/partner.go
+++ b/business/jxstore/partner/partner.go
@@ -1,6 +1,8 @@
 package partner
 
 import (
+	"time"
+
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 )
 
@@ -14,7 +16,13 @@ const (
 )
 
 type ActivityList struct {
-	ActID int `json:"actID"`
+	ActID     int       `json:"actID"`
+	ActName   string    `json:"actName"`
+	ActDes    string    `json:"actDes"`
+	Ratio     string    `json:"ratio"` //返现比？
+	DateBegin time.Time `json:"dateBegin"`
+	DateEnd   time.Time `json:"dateEnd"`
+	ActSrc    string    `json:"actSrc"` //物料？
 }
 
 func init() {
@@ -23,7 +31,7 @@ func init() {
 
 type UnionInterface interface {
 	ShareUnionLink(ctx *jxcontext.Context, linkType int) (link string, err error)
-	GetUnionActList(ctx *jxcontext.Context, actType int) (result interface{}, err error)
+	GetUnionActList(ctx *jxcontext.Context, actType int) (result []*ActivityList, err error)
 }
 
 func GetHandler(vendorID int) UnionInterface {