diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index da0733aa8..b4f2b805a 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -78,6 +78,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
 		case "dev":
 			totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469)
 		case "jxgy":
+
 		default:
 			totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594)
 		}
diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go
index 64a7670bf..e6025ae56 100644
--- a/business/partner/purchase/tao_vegetable/order.go
+++ b/business/partner/purchase/tao_vegetable/order.go
@@ -494,8 +494,8 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
 
 // PickupGoods 拣货
 func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
-	globals.SugarLogger.Debugf("PickupGoods  自动拣货:%s, %s", utils.Format4Output(isSelfDelivery, false), utils.Format4Output(order, false))
-	if isSelfDelivery {
+	store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "")
+	if isSelfDelivery && store.AutoPickup == model.YES {
 		param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
 		if err != nil {
 			return err
@@ -504,9 +504,8 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 			globals.SugarLogger.Debugf("PickupGoods  拣货失败可能是BizSubOrderId 没填写 : %s", err.Error())
 			return err
 		}
+		c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
 	}
-
-	c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
 	return err
 }
 
@@ -693,26 +692,30 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
 	}
 
 	// 获取订单的子订单id
-	requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
-		StoreId:    utils.String2Pointer(order.VendorStoreID),
-		BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
-	}}
-	orderDetail, err := api.QueryOrderDetail(requestParam)
-	if err != nil {
-		return err
-	}
-
-	skuMap := make(map[string]string, 0)
-	for _, v := range *orderDetail.SubOrderResponseList {
-		skuMap[*v.SkuCode] = *v.OutSubOrderId
-	}
+	//requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
+	//	StoreId:    utils.String2Pointer(order.VendorStoreID),
+	//	BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
+	//}}
+	//orderDetail, err := api.QueryOrderDetail(requestParam)
+	//if err != nil {
+	//	return err
+	//}
+	//
+	//skuMap := make(map[string]string, 0)
+	//for _, v := range *orderDetail.SubOrderResponseList {
+	//	skuMap[*v.SkuCode] = *v.OutSubOrderId
+	//}
 
 	// 获取需要退货商品的子订单id
 	refundSkuOrderID := make([]string, 0, len(removedSkuList))
+	//for _, v := range removedSkuList {
+	//	if orderId, ok := skuMap[v.VendorSkuID]; ok {
+	//		refundSkuOrderID = append(refundSkuOrderID, orderId)
+	//	}
+	//}
+
 	for _, v := range removedSkuList {
-		if orderId, ok := skuMap[v.VendorSkuID]; ok {
-			refundSkuOrderID = append(refundSkuOrderID, orderId)
-		}
+		refundSkuOrderID = append(refundSkuOrderID, v.VendorSubOrderID)
 	}
 
 	// 商家申请退货