1

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -34,9 +34,11 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
 	courierVendorIDMap := jxutils.IntList2Map(courierVendorIDs)
 	excludeCourierVendorIDMap := jxutils.IntList2Map(excludeCourierVendorIDs)
 	errList := errlist.New()
+	globals.SugarLogger.Debugf("===excludeCourierVendorIDMap===========:%s", utils.Format4Output(excludeCourierVendorIDMap, false))
 
 	store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode)
 	for _, storeCourier := range storeCourierList {
+		globals.SugarLogger.Debugf("===excludeCourierVendorIDMap===========:%s", utils.Format4Output(excludeCourierVendorIDMap[storeCourier.VendorID], false))
 		switch storeCourier.Status {
 		case model.YES:
 			if (courierVendorIDs == nil || courierVendorIDMap[storeCourier.VendorID] == 1) &&

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -298,6 +298,7 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 		excludeCourierVendorIDs = append(excludeCourierVendorIDs, k)
 	}
 
+	globals.SugarLogger.Debugf("===excludeCourierVendorIDs===========:%s", utils.Format4Output(excludeCourierVendorIDs, false))
 	billFunc := func() {
 		bills, err = func() (bills []*model.Waybill, err error) {
 			if vendorID == model.VendorIDELM {

business/partner/purchase/tao_vegetable/order.go

@@ -842,7 +842,7 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
 
 	if err = api.DeliveryFinish(param); err != nil {
 		globals.SugarLogger.Debugf("PickupGoods  拣货失败可能是BizSubOrderId 没填写 : %s", err.Error())
-		return err
+		return fmt.Errorf("订单缺过失败,请拣货完成前取货.或者联系客户发起部分退款")
 	}
 	c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
 	return nil