1

business/partner/purchase/tao_vegetable/order.go

@@ -127,7 +127,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 				Upc:              *extra.Barcode,
 			}
 			// extra.SkuCode 为int类型会超出长度,有时商品为平台创建
-			if len(*extra.SkuCode) <= 10 {
+			if len(*extra.SkuCode) < 10 {
 				sku.SkuID = utils.Str2Int(*extra.SkuCode)
 				sku.JxSkuID = utils.Str2Int(*extra.SkuCode)
 			}
@@ -157,7 +157,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
 			}
 
 			if len(activityId) > 0 {
-				sku.StoreSubID = activityId[0]
+				//sku.StoreSubID = activityId[0]
 				sku.StoreSubName = strings.Join(activityName, ",")
 			}
 			if sku.Weight == 0 {
@@ -354,6 +354,9 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
 				utils.CallFuncAsync(func() {
 					if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
 						c.OnOrderDetail(orderMap, partner.CreatedPeration)
+						if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDTaoVegetable); handler != nil {
+							handler.AcceptOrRefuseOrder(order, true, "jxAdmin")
+						}
 					} else {
 						c.OnOrderDetail(orderMap, partner.UpdatedPeration)
 					}
@@ -521,7 +524,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 			}
 			if err2 == nil {
 				c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
-				break
+				return nil
 			}
 		}