1

business/jxcallback/auto_delivery/auto_delivery.go

@@ -109,6 +109,16 @@ func AutoSettingFakeDelivery() {
 		} else {
 			riderKey = strings.Split(v.ConsigneeAddress, "省")[0]
 		}
+
+		if riderKey == "" {
+			storeDetail, _ := dao.GetStoreDetail(db, v.JxStoreID, 0, "")
+			if strings.Contains(storeDetail.Address, "重庆") || strings.Contains(storeDetail.Address, "上海") || strings.Contains(storeDetail.Address, "北京") {
+				riderKey = strings.Split(storeDetail.Address, "市")[0]
+			} else {
+				riderKey = strings.Split(storeDetail.Address, "省")[0]
+			}
+		}
+
 		if len(riderListInfo[riderKey]) == model.NO {
 			// 骑手列表
 			configRiderList, err := dao.QueryConfigs(db, "riderList", "Sys", "")
@@ -137,7 +147,7 @@ func AutoSettingFakeDelivery() {
 		if v.Status < model.OrderStatusFinishedPickup { // 未拣货
 			handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
 			flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
-			if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil && v.VendorID == model.VendorIDDD {
+			if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
 				globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
 				break
 			}