diff --git a/controllers/event.go b/controllers/event.go index a6cacc026..4761d79bf 100644 --- a/controllers/event.go +++ b/controllers/event.go @@ -3,8 +3,11 @@ package controllers import ( "log" "net/http" + "time" + "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals" @@ -47,17 +50,17 @@ type Message struct { // @Failure 200 {object} controllers.CallResult // @router /GetWeixinUnlimited [post] func (c *EventController) GetWeixinUnlimited() { - // c.callGetWeixinUnlimited(func(params *tEventGetWeixinUnlimitedParams) (retVal interface{}, errCode string, err error) { - // // api.WeixinMiniAPI2.CBRetrieveToken() - // result, err := api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page) - // if err != nil || result == nil { - // return retVal, "", err - // } - // fileName := "wxcode" + utils.Int64ToStr(time.Now().Unix()) + ".jpg" - // retVal, err = jxutils.UploadExportContent([]byte(result["fakeData"].(string)), fileName) - // // tasks.RefreshWeixinToken() - // return retVal, "", err - // }) + c.callGetWeixinUnlimited(func(params *tEventGetWeixinUnlimitedParams) (retVal interface{}, errCode string, err error) { + // api.WeixinMiniAPI2.CBRetrieveToken() + result, err := api.WeixinMiniAPI2.GetUnlimited(params.Scene, params.Page) + if err != nil || result == nil { + return retVal, "", err + } + fileName := "wxcode" + utils.Int64ToStr(time.Now().Unix()) + ".jpg" + retVal, err = jxutils.UploadExportContent([]byte(result["fakeData"].(string)), fileName) + // tasks.RefreshWeixinToken() + return retVal, "", err + }) } // @Title 测试websocket @@ -174,8 +177,8 @@ func handleMessages() { // @Failure 200 {object} controllers.CallResult // @router /GetImMessageRecord [get] func (c *EventController) GetImMessageRecord() { - // c.callGetImMessageRecord(func(params *tEventGetImMessageRecordParams) (retVal interface{}, errCode string, err error) { - // retVal, err = dao.GetImMessageRecord(dao.GetDB(), params.VendorOrderID, "", 0, -1) - // return retVal, "", err - // }) + c.callGetImMessageRecord(func(params *tEventGetImMessageRecordParams) (retVal interface{}, errCode string, err error) { + retVal, err = dao.GetImMessageRecord(dao.GetDB(), params.VendorOrderID, "", 0, -1) + return retVal, "", err + }) } diff --git a/controllers/order_controller.go b/controllers/order_controller.go index e8c64040e..bfcd1074e 100644 --- a/controllers/order_controller.go +++ b/controllers/order_controller.go @@ -32,7 +32,10 @@ func (c *OrderController) Pay() { // @Failure 200 {object} controllers.CallResult // @router /CreateOrder [post] func (c *OrderController) CreateOrder() { + c.callCreateOrder(func(params *tOrderCreateOrderParams) (retVal interface{}, errCode string, err error) { + return retVal, "", err + }) } // @Title 请求支付订单