Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/mail/api_comp.go

@@ -50,6 +50,7 @@ func (this *Api_Comp) Start() (err error) {
 	return
 }
 
+// 查看所有邮件信息
 func (this *Api_Comp) QueryUserMailReq(ctx context.Context, session comm.IUserSession, req *pb.QueryUserMailReq) (err error) {
 
 	code := pb.ErrorCode_Success
@@ -70,6 +71,7 @@ func (this *Api_Comp) QueryUserMailReq(ctx context.Context, session comm.IUserSe
 	return
 }
 
+// 查看某一封邮件
 func (this *Api_Comp) ReadUserMailReq(ctx context.Context, session comm.IUserSession, req *pb.ReadUserMailReq) (err error) {
 	var (
 		code pb.ErrorCode
@@ -91,6 +93,7 @@ func (this *Api_Comp) ReadUserMailReq(ctx context.Context, session comm.IUserSes
 	return
 }
 
+// 领取附件
 func (this *Api_Comp) GetUserMailAttachmentReq(ctx context.Context, session comm.IUserSession, req *pb.GetUserMailAttachmentReq) (err error) {
 
 	var (
@@ -124,6 +127,7 @@ func (this *Api_Comp) GetUserMailAttachmentReq(ctx context.Context, session comm
 	return
 }
 
+// 删除邮件
 func (this *Api_Comp) DelUserMailReq(ctx context.Context, session comm.IUserSession, req *pb.DelUserMailReq) (err error) {
 
 	code := pb.ErrorCode_Success

sys/db/mail.go

@@ -38,6 +38,7 @@ func (this *DB) QueryUserMail(uId string) (mail []*pb.DB_MailData, err error) {
 	return
 }
 
+// 插入一封新的邮件
 func (this *DB) InsertUserMail(mail *pb.DB_MailData) (err error) {
 
 	mail.ObjId = primitive.NewObjectID().Hex()
@@ -101,6 +102,7 @@ func (this *DB) UpdateMailAttachmentState(objId string) bool {
 	return true
 }
 
+// 删除一封邮件
 func (this *DB) DelUserMail(objId string) bool {
 	var obj *pb.DB_MailData
 	err := this.mgo.FindOne(DB_MailTable, bson.M{"_id": objId}).Decode(obj)

sys/db/mail_test.go

@@ -0,0 +1,37 @@
+package db
+
+import (
+	"go_dreamfactory/pb"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreateEmail(t *testing.T) {
+	err := db.InsertUserMail(&pb.DB_MailData{
+
+		UserId:     "uid123",
+		Title:      "系统邮件",
+		Contex:     "恭喜获得专属礼包一份",
+		CreateTime: uint64(time.Now().Unix()),
+		DueTime:    uint64(time.Now().Unix()) + 30*24*3600,
+		Check:      false,
+		Reward:     false,
+	})
+	_data, err := db.QueryUserMail("uid123")
+
+	for _, v := range _data {
+		log.Printf("userid = %s", v.UserId)
+	}
+	require.Nil(t, err, nil)
+}
+
+func TestReadEmail(t *testing.T) {
+	data, err := db.ReadOneMail("62a078c0726ea54890c34937")
+	if err != nil {
+		log.Printf("%v", data.Reward)
+	}
+	require.Nil(t, err, data)
+}