1

business/partner/purchase/mtwm/order_afs.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -142,11 +143,17 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 				afsOrder.ReasonImgList = utils.LimitUTF8StringLen(strings.Join(refundData.PictureList, ","), 1024)
 			}
 		}
+
 		if afsOrder != nil {
 			//直接就来一个新的售后单，并且还是售后完成的
 			if orderStatus.Status == model.AfsOrderStatusFinished {
 				afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
 			}
+			// 补丁,这种类型的退款申请,不会在推送退款成功消息,直接将售后单标记为完成
+			if strings.Contains(afsOrder.ReasonDesc, "商家开通极速退款服务，用户申请系统自动通过") {
+				afsOrder.Status = model.AfsOrderStatusFinished
+				afsOrder.AfsFinishedAt = time.Now()
+			}
 			err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
 		}
 	} else {

controllers/cms_sync.go

@@ -442,3 +442,22 @@ func (c *SyncController) SyncJdsStoresSkus() {
 		return retVal, "", err
 	})
 }
+
+// @Title 取消商品美团的活动,用于改价
+// @Description 取消商品美团的活动,用于改价
+// @Param	token				header		string	true	"认证token"
+// @Param	storeIDs			formData	string	false	"门店ID列表"
+// @Param	isAsync				formData	bool	false	"是否异步操作"
+// @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /SyncJdsStoresSkus [put]
+func (c *SyncController) CancelMtSkuAct() {
+	c.callSyncJdsStoresSkus(func(params *tSyncSyncJdsStoresSkusParams) (retVal interface{}, errCode string, err error) {
+		var storeIDs []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err == nil {
+			retVal, err = cms.CurVendorSync.SyncJdsStoresSkus(params.Ctx, storeIDs, params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
+}