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

Accept Merge Request #190: (su -> mark)

Browse Source 
Merge Request: 优化饿鲜达
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/190
This commit is contained in:
苏尹岚
2020-02-19 14:35:01 +08:00
parent 6dfbdc62d1 fabed5e239
commit 511da0f1a4
17 changed files with 105 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/cms.go
View File

@@ -286,7 +286,7 @@ func (c *CmsController) UpdateConfig() {
// @Title 查询配置
// @Description 查询配置
// @Param token header string true "认证token"
// @Param token header string fasle "认证token"
// @Param type query string false "配置类型（当前只支持PricePack）"
// @Param key query string false "配置名"
// @Param keyword query string false "关键字"

9
controllers/cms_sku.go
View File

@@ -185,6 +185,7 @@ func (c *SkuController) AddSkuName() {
// @Param token header string true "认证token"
// @Param nameID formData int true "需要修改的商品名ID，payload中的相应数据会被忽略"
// @Param payload formData string true "json数据，SkuNameExt对象()，Skus无效, Places有效"
// @Param isExd formData bool fasle "是否要修改饿鲜达商品"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /UpdateSkuName [put]
@@ -197,7 +198,7 @@ func (c *SkuController) UpdateSkuName() {
delete(payload, "exPrefix")
delete(payload, "exPrefixBegin")
delete(payload, "exPrefixEnd")
retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload)
retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload, params.IsExd)
}
return retVal, "", err
})
@@ -435,7 +436,7 @@ func (c *SkuController) SumExianDaDepot() {
// @Title 复制一个饿百的店的商品的价格和分类到京西饿鲜达商品
// @Description 复制一个饿百的店的商品的价格和分类到京西饿鲜达商品
// @Param token header string true "认证token"
// @Param baiduShopID formdata string true "饿百店ID"
// @Param baiduShopID formData string true "饿百店ID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /CopyEbaiSkuPriceToJx [post]
@@ -449,8 +450,8 @@ func (c *SkuController) CopyEbaiSkuPriceToJx() {
// @Title 复制饿鲜达的门店商品到京西对应门店
// @Description 复制饿鲜达的门店商品到京西对应门店
// @Param token header string true "认证token"
// @Param baiduShopID formdata string true "饿百店ID"
// @Param storeID formdata int true "门店ID"
// @Param baiduShopID formData string true "饿百店ID"
// @Param storeID formData int true "门店ID"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /CopyEbaiStoreSkusToJx [post]