1

business/partner/purchase/mtwm/store.go

@@ -230,23 +230,34 @@ func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName strin
 }
 
 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
-	var name string
 	if db == nil {
 		db = dao.GetDB()
 	}
-	mtapi := getAPI(getStoreVendorOrgCode(storeID), storeID, "")
+	var (
+		name    string
+		mtapi   = getAPI(getStoreVendorOrgCode(storeID), storeID, "")
+		errList = errlist.New()
+	)
+
 	//获取本地store信息
 	storeDetail, err := dao.GetStoreDetail(db, storeID, model.VendorIDMTWM, "")
 	if err != nil {
 		return err
 	}
-	errList := errlist.New()
+
 	//获取平台store信息
 	remoteStoreInfo, err := mtapi.PoiGet(storeDetail.VendorStoreID)
 	if err != nil {
 		return err
 	}
 	mergedStoreStatus := jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)
+
+	// 平台状态和本地状态相同且都为禁用时不再更新
+	vendorStatus := bizStatusMtwm2JX(remoteStoreInfo.OpenLevel, remoteStoreInfo.IsOnline)
+	if vendorStatus == mergedStoreStatus && mergedStoreStatus == model.StoreStatusDisabled {
+		return nil
+	}
+
 	name = remoteStoreInfo.Name
 	if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreName) != 0 {
 		if storeDetail.VendorStoreName != "" {
@@ -362,9 +373,9 @@ func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod
 			if err = getAPI(vendorOrgCode, storeID, vendorStoreID).PoiOffline(vendorStoreID); err == nil {
 				switch beego.BConfig.RunMode {
 				case "jxgy":
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!")
+					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdGuoYuan, fmt.Sprintf("果园美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!")
 				default:
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!")
+					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, model.DefaultUserIdCaiShi, fmt.Sprintf("菜市美团门店被下线了:门店id[%d],平台门店id[%s]", storeID, vendorStoreID), "!")
 				}
 			}
 		} else {

business/partner/purchase/tao_vegetable/order_afs.go

@@ -119,6 +119,9 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
 			refundSkuCount += refundSku.RefundAmount
 			for _, sku := range *skuList.SubOrderResponseList { // 总订单
 				if refundSku.OutSubOrderId == *sku.OutSubOrderId {
+					if *sku.SkuCode == "6108080" {
+						continue
+					}
 					orderSku := &model.OrderSkuFinancial{
 						Count:             utils.Float64TwoInt(*sku.BuySaleQuantity),
 						VendorSkuID:       *sku.SkuCode,
@@ -247,6 +250,9 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
 			for _, v := range *orderDetail.SubOrderResponseList {
 				for _, v2 := range onSaleMsg.PartCancelRequest.SubOrders {
 					if *v.BizSubOrderId == v2.BizSubOrderId {
+						if *v.SkuCode == "6108080" {
+							continue
+						}
 						orderSku := &model.OrderSkuFinancial{
 							Count:             utils.Float64TwoInt(*v.BuySaleQuantity),
 							VendorSkuID:       *v.SkuCode,
@@ -331,7 +337,9 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
 						if err := json.Unmarshal([]byte(*v.Attributes), &skuDetail); err != nil {
 							return tao_vegetable.CallBackResultInfo(err)
 						}
-
+						if *v.SkuCode == "6108080" {
+							continue
+						}
 						orderSku := &model.OrderSkuFinancial{
 							Count:             utils.Float64TwoInt(utils.Str2Float64(*v.RefundQuantity)),
 							VendorSkuID:       *v.SkuCode,