diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index b1e744088..cf0d39d2a 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -67,6 +67,11 @@ func SaveJdsOrders(msg *jdshopapi.CallBackResult) (err error) { if err != nil || order == nil { return err } + order.StoreID = 102919 + order.JxStoreID = 102919 + order.StoreName = "商城模板(成都发货)" + order.VendorStoreID = model.JdShopMainVendorStoreID + order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order)) noticeMsg := fmt.Sprintf("京东商城新订单,订单号:[%v] ,将要发到的门店id:[%v] , 门店名:[%v]", order.VendorOrderID, order.StoreID, order.StoreName) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "京东商城来新订单了!", noticeMsg) @@ -137,31 +142,31 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err return order, err } if len(storeList) > 0 { - for _, store := range storeList { - order.StoreID = store.ID - order.JxStoreID = store.ID - order.StoreName = store.Name - globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID) - //结算类型 - storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop) - if storeDetail != nil { - if storeDetail.PayPercentage < 50 { - order.EarningType = model.EarningTypePoints - } else { - order.EarningType = model.EarningTypeQuote - } - } - if order.EarningType == model.EarningTypeQuote { - var shopPriceSum int - storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs) - for _, storeSku := range storeSkuList { - shopPriceSum += storeSku.Price - } - if shopPriceSum+700 > int(order.TotalShopMoney) { + // for _, store := range storeList { + // order.StoreID = store.ID + // order.JxStoreID = store.ID + // order.StoreName = store.Name + // globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID) + // //结算类型 + // storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop) + // if storeDetail != nil { + // if storeDetail.PayPercentage < 50 { + // order.EarningType = model.EarningTypePoints + // } else { + // order.EarningType = model.EarningTypeQuote + // } + // } + // if order.EarningType == model.EarningTypeQuote { + // var shopPriceSum int + // storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs) + // for _, storeSku := range storeSkuList { + // shopPriceSum += storeSku.Price + // } + // if shopPriceSum+700 > int(order.TotalShopMoney) { - } - } - } + // } + // } + // } } else { order.StoreID = 102919 order.JxStoreID = 102919