WH01243 3 vuotta sitten
vanhempi
commit
49b3d94866

+ 1 - 0
src/main.go

@@ -15,6 +15,7 @@ import (
 	"task"
 	_ "task"
 	_ "template"
+	_ "templateManage"
 	"time"
 	_ "users"
 	"util"

+ 1 - 0
src/order/otherOrderController.go

@@ -812,6 +812,7 @@ func CreateVipOrder(context *admin.Context) (interface{}, error) {
 	param.Commission = "0"
 	param.SalesChannel = "x010"
 	param.PaybackCompany = "h01"
+
 	fool, endTime := createVipOrder(param, code)
 	if !fool {
 		return nil, errors.New("创建VIP订单失败")

+ 5 - 5
src/templateManage/jyTemplateManageController.go

@@ -2,9 +2,9 @@ package templateManage
 
 import (
 	"errors"
+	"fmt"
 	"github.com/baiy/Cadmin-server-go/admin"
 	"math/rand"
-	qutil "qfw/util"
 	"time"
 	"util"
 )
@@ -89,7 +89,7 @@ func Add(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("模板名称不可为空")
 	}
 	now := time.Now()
-	id := util.JysqlDB.Insert("template_config", map[string]interface{}{
+	id := util.JysqlDB.Insert(TemplateManage, map[string]interface{}{
 		"template_name": param.TemplateName,
 		"news_type":     param.NewsType,
 		"news_title":    param.NewsTitle,
@@ -98,10 +98,10 @@ func Add(context *admin.Context) (interface{}, error) {
 		"android_link":  param.AndroidLink,
 		"apple_link":    param.AppleLink,
 		"wx_link":       param.WxLink,
-		"template_id":   now.Unix() + qutil.Int64All(rand.Intn(100)),
+		"template_id":   fmt.Sprint(now.Unix()) + fmt.Sprint(rand.Intn(100)),
 		"create_people": context.User.Username,
-		"create_time":   now.Unix(),
-		"last_time":     now.Unix(),
+		"create_time":   now,
+		"last_time":     now,
 		"state":         "1",
 	})
 	if id <= 0 {

+ 1 - 1
src/templateManage/jyTemplateManageService.go

@@ -17,7 +17,7 @@ func FindOneTemplate(id int) (res map[string]interface{}) {
 }
 
 func UpdateSceneOne(id int, newsContent, newsTitle, newsType, pcLink, templateName, wxLink, androidLink, appleLink string) bool {
-	ok := util.JysqlDB.Update("template_config", map[string]interface{}{"id": id}, map[string]interface{}{"newsContent": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now().Unix()})
+	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now()})
 	if !ok {
 		return false
 	}

+ 2 - 2
src/templateManage/router.go

@@ -52,7 +52,7 @@ func (d *TemplateManageDispatchers) Call(c *Context) (interface{}, error) {
 }
 
 // 注册调度器请求处理方法
-func RegisterTemplate(methods map[string]TemplateManageDispatcherHandleMethod) {
+func RegisterTemplateManage(methods map[string]TemplateManageDispatcherHandleMethod) {
 	TemplateManageDispatcher.Register(methods)
 }
 
@@ -66,7 +66,7 @@ func (d *TemplateManageDispatchers) Register(methods map[string]TemplateManageDi
 }
 
 func init() {
-	RegisterTemplate(map[string]TemplateManageDispatcherHandleMethod{
+	RegisterTemplateManage(map[string]TemplateManageDispatcherHandleMethod{
 		"Baiy.Cadmin.TemplateManage.list":   List,
 		"Baiy.Cadmin.TemplateManage.info":   Info,
 		"Baiy.Cadmin.TemplateManage.add":    Add,