1

business/jxstore/act/act.go

@@ -2004,7 +2004,9 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) {
 			storeMap := batchItemList[0].(*model.StoreMap)
 			mtapi := mtwm.GetAPI(storeMap.VendorOrgCode, storeMap.StoreID, "")
 			for k, v := range actTypeMap {
-				if actList, _ := mtapi.RetailDiscountList(storeMap.VendorStoreID, k); len(actList) > 0 {
+				// 查询所有美团门店的折扣和爆款商品
+				actList, _ := mtapi.RetailDiscountList(storeMap.VendorStoreID, k)
+				if len(actList) > 0 {
 					for _, act := range actList {
 						if act.Status > 0 {
 							if checkActStoreSkuExist(db, storeMap.StoreID, utils.Str2Int(act.AppFoodCode), model.VendorIDMTWM, utils.Timestamp2Time(act.StartTime), utils.Timestamp2Time(act.EndTime)) {
@@ -2030,6 +2032,10 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) {
 							}
 						}
 					}
+					// 查询门店爆款商品,当门店存在爆款时,取消之前的力荐商品,将新的爆款设置为力荐商品
+					if k == mtwmapi.RetailActTypeSecKill && len(actList) > 0 {
+
+					}
 				}
 			}
 			return retVal, err

business/partner/purchase/ebai/waybill.go

@@ -67,8 +67,6 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap
 			}
 		})
 	}
-	vendorStatus := utils.Int64ToStr(utils.MustInterface2Int64(msg.Body["status"]))
-
 	return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 }