liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-04 17:56:08 +08:00
parent ab9bdbbff9 e6004bea32
commit 621ae66f6e
22 changed files with 740 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/init_data.go
View File

@@ -22,22 +22,6 @@ func (c *InitDataController) InitPlace() {
})
}
// @Title 初始化skuname（当前主要是计算md5)
// @Description 初始化skuname（当前主要是计算md5)
// @Param token header string true "认证token"
// @Param isForce formData bool false "是否强刷，即即使本地已经有了hashCode也重新计算，缺省为false"
// @Param isAsync formData bool false "是否异步操作"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /InitSkuName [post]
func (c *InitDataController) InitSkuName() {
c.callInitSkuName(func(params *tInitdataInitSkuNameParams) (retVal interface{}, errCode string, err error) {
retVal, err = initdata.InitSkuName(params.Ctx, params.IsForce, params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
})
}
// @Title 初始化vendor category
// @Description 初始化vendor category
// @Param token header string true "认证token"
@@ -67,19 +51,3 @@ func (c *InitDataController) UploadImage4Vendors() {
return retVal, "", err
})
}
// @Title 从饿百店建商品
// @Description 从饿百店建商品
// @Param token header string true "认证token"
// @Param baiduShopID formData int true "skuNameID"
// @Param isAsync formData bool false "是否异步操作"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /BuildSkuFromEbaiStore [post]
func (c *InitDataController) BuildSkuFromEbaiStore() {
c.callBuildSkuFromEbaiStore(func(params *tInitdataBuildSkuFromEbaiStoreParams) (retVal interface{}, errCode string, err error) {
retVal, err = initdata.BuildSkuFromEbaiStore(params.Ctx, int64(params.BaiduShopID), params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
})
}

78
controllers/jd_callback.go
View File

@@ -2,14 +2,15 @@ package controllers
import (
"bytes"
"fmt"
"io/ioutil"
"net/http"
"net/url"
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego"
"github.com/astaxie/beego/context"
)
@@ -19,20 +20,27 @@ type DjswController struct {
beego.Controller
}
func (c *DjswController) handleMsg(isNeedDecode bool, handler func(*jdapi.API, url.Values, string) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
values, token, msgURL, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx), isNeedDecode)
if callbackResponse == nil {
if jdAPI := jd.GetAPIByToken(token); jdAPI != nil {
callbackResponse = handler(jdAPI, values, msgURL)
} else {
callbackResponse = jdapi.Err2CallbackResponse(fmt.Errorf("没有匹配的token,非法请求"), "")
}
}
return callbackResponse
}
func (c *DjswController) orderStatus(isCancelOrder bool) {
if c.Ctx.Input.Method() == http.MethodPost {
var obj *jdapi.CallbackOrderMsg
var callbackResponse *jdapi.CallbackResponse
if isCancelOrder {
obj, callbackResponse = api.JdAPI.GetOrderApplyCancelCallbackMsg(getUsefulRequest(c.Ctx))
} else {
obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx))
}
globals.SugarLogger.Debug(utils.Format4Output(obj, true))
if callbackResponse == nil {
callbackResponse = jd.OnOrderMsg(obj)
}
callbackResponse := c.handleMsg(isCancelOrder, func(a *jdapi.API, values url.Values, msgURL string) (callbackResponse *jdapi.CallbackResponse) {
obj, callbackResponse := a.GetOrderCallbackMsg(values, msgURL)
if callbackResponse == nil {
callbackResponse = jd.OnOrderMsg(obj)
}
return callbackResponse
})
c.Data["json"] = c.transferResponse("orderStatus", callbackResponse)
c.ServeJSON()
} else {
@@ -82,10 +90,13 @@ func (c *DjswController) ApplyCancelOrder() {
func (c *DjswController) PushDeliveryStatus() {
if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.JdAPI.GetOrderDeliveryCallbackMsg(getUsefulRequest(c.Ctx))
if callbackResponse == nil {
callbackResponse = jd.OnWaybillMsg(obj)
}
callbackResponse := c.handleMsg(true, func(a *jdapi.API, values url.Values, msgURL string) (callbackResponse *jdapi.CallbackResponse) {
obj, callbackResponse := a.GetOrderDeliveryCallbackMsg(values, msgURL)
if callbackResponse == nil {
callbackResponse = jd.OnWaybillMsg(obj)
}
return callbackResponse
})
c.Data["json"] = c.transferResponse("PushDeliveryStatus", callbackResponse)
c.ServeJSON()
} else {
@@ -109,10 +120,13 @@ func (c *DjswController) Token() {
func (c *DjswController) StockIsHave() {
// globals.SugarLogger.Info(string(c.Ctx.Input.RequestBody))
if c.Ctx.Input.Method() == http.MethodPost {
_, callbackResponse := api.JdAPI.GetStoreStockCallbackMsg(getUsefulRequest(c.Ctx))
if callbackResponse == nil {
// globals.SugarLogger.Debugf("StockIsHave, obj:%s", utils.Format4Output(obj, false))
}
callbackResponse := c.handleMsg(true, func(a *jdapi.API, values url.Values, msgURL string) (callbackResponse *jdapi.CallbackResponse) {
_, callbackResponse = a.GetStoreStockCallbackMsg(values, msgURL)
if callbackResponse == nil {
// globals.SugarLogger.Debugf("StockIsHave, obj:%s", utils.Format4Output(obj, false))
}
return callbackResponse
})
c.Data["json"] = c.transferResponse("StockIsHave", callbackResponse)
c.ServeJSON()
} else {
@@ -122,10 +136,13 @@ func (c *DjswController) StockIsHave() {
func (c *DjswController) SinglePromoteCreate() {
if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx))
if callbackResponse == nil {
callbackResponse = jd.OnActMsg(obj)
}
callbackResponse := c.handleMsg(false, func(a *jdapi.API, values url.Values, msgURL string) (callbackResponse *jdapi.CallbackResponse) {
obj, callbackResponse := a.GetOrderCallbackMsg(values, msgURL)
if callbackResponse == nil {
callbackResponse = jd.OnActMsg(obj)
}
return callbackResponse
})
c.Data["json"] = c.transferResponse("SinglePromoteCreate", callbackResponse)
c.ServeJSON()
} else {
@@ -135,10 +152,13 @@ func (c *DjswController) SinglePromoteCreate() {
func (c *DjswController) StoreCrud() {
if c.Ctx.Input.Method() == http.MethodPost {
obj, callbackResponse := api.JdAPI.GetOrderCallbackMsg(getUsefulRequest(c.Ctx))
if callbackResponse == nil {
callbackResponse = jd.OnStoreMsg(obj)
}
callbackResponse := c.handleMsg(false, func(a *jdapi.API, values url.Values, msgURL string) (callbackResponse *jdapi.CallbackResponse) {
obj, callbackResponse := a.GetOrderCallbackMsg(values, msgURL)
if callbackResponse == nil {
callbackResponse = jd.OnStoreMsg(obj)
}
return callbackResponse
})
c.Data["json"] = c.transferResponse("StoreCrud", callbackResponse)
c.ServeJSON()
} else {

16
controllers/temp_op.go
View File

@@ -352,3 +352,19 @@ func (c *TempOpController) FixMtwmCategory() {
return retVal, "", err
})
}
// @Title 从饿百店建商品
// @Description 从饿百店建商品
// @Param token header string true "认证token"
// @Param baiduShopID formData int true "skuNameID"
// @Param isAsync formData bool false "是否异步操作"
// @Param isContinueWhenError formData bool false "单个同步失败是否继续，缺省false"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /BuildSkuFromEbaiStore [post]
func (c *TempOpController) BuildSkuFromEbaiStore() {
c.callBuildSkuFromEbaiStore(func(params *tTempopBuildSkuFromEbaiStoreParams) (retVal interface{}, errCode string, err error) {
retVal, err = tempop.BuildSkuFromEbaiStore(params.Ctx, int64(params.BaiduShopID), params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
})
}

3
controllers/wxpay_callback.go
View File

@@ -17,9 +17,10 @@ type WXPayController struct {
func (c *WXPayController) Msg() {
if c.Ctx.Input.Method() == http.MethodPost {
msg, callbackResponse := api.WxpayAPI.GetCallbackMsg(c.Ctx.Request)
// globals.SugarLogger.Debugf("wxpay callback msg:%s, callbackResponse:%s, %t", utils.Format4Output(msg, true), utils.Format4Output(callbackResponse, true), callbackResponse == nil)
var err error
if callbackResponse == nil {
if msg.MsgType != wxpay.MsgTypeUnkown {
if msg.MsgType == wxpay.MsgTypeUnkown {
err = fmt.Errorf("未知的微信支付回调类型:%d", msg.MsgType)
} else {
err = localjx.OnWxPayCallback(msg)