- 调整CreateConsumerFromOrders

business/jxstore/cms/user2.go

@@ -161,6 +161,10 @@ func TryAddStoreBossRole4StoreByMobile(ctx *jxcontext.Context, storeID int, mobi
 
 func HandleOrder4Consignee(order *model.GoodsOrder) (err error) {
 	var user *model.User
+	mobileNumber := jxutils.GetRealMobile4Order(order)
+	if mobileNumber == "" && order.VendorUserID == "" {
+		return fmt.Errorf("订单:%s手机号与平台用户标识都是空", order.VendorOrderID)
+	}
 	authType := jxutils.GetAuthType4Vendor(order.VendorID)
 	if authType == "" {
 		msg := fmt.Sprintf("平台ID:%d当前不被支持，请联系开发", order.VendorID)
@@ -169,7 +173,6 @@ func HandleOrder4Consignee(order *model.GoodsOrder) (err error) {
 	}
 
 	oeratorName := order.VendorOrderID
-	mobileNumber := jxutils.GetRealMobile4Order(order)
 	db := dao.GetDB()
 	if mobileNumber != "" {
 		userList, _, err2 := dao.GetUsers(db, 0, "", nil, "", mobileNumber, 0, 0)

business/jxstore/tempop/tempop.go

@@ -1045,7 +1045,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 				sqlParams = append(sqlParams, vendorIDs)
 			}
 			if !isForce {
-				sql += " AND t1.vendor_user_id = ''"
+				sql += " AND t1.user_id = ''"
 			}
 			var orderList []*GoodsOrderWithOriginal
 			if err = dao.GetRows(db, &orderList, sql, sqlParams...); err == nil {
@@ -1054,8 +1054,10 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 					subTask := tasksch.NewParallelTask(fmt.Sprintf("处理日期:%s的订单", utils.Time2DateStr(curDate)), tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
 						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 							order := batchItemList[0].(*GoodsOrderWithOriginal)
-							if isForce || order.VendorUserID == "" {
+							if isForce || order.UserID == "" {
 								if handler := partner.GetPurchasePlatformFromVendorID(order.VendorID); handler != nil {
+									var updateFields []string
+									if isForce || order.VendorUserID == "" {
 										var order2 *model.GoodsOrder
 										if order.OriginalData != "" {
 											var orderData map[string]interface{}
@@ -1070,11 +1072,12 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 											order2, err = handler.GetOrder(order.VendorOrderID)
 										}
 										if order2 != nil {
-										var updateFields []string
 											if order2.VendorUserID != "" && order.VendorUserID != order2.VendorUserID {
 												updateFields = append(updateFields, "VendorUserID")
 												order.VendorUserID = order2.VendorUserID
 											}
+										}
+									}
 									if err = cms.HandleOrder4Consignee(&order.GoodsOrder); err == nil {
 										updateFields = append(updateFields, "UserID")
 									}
@@ -1083,7 +1086,6 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 									}
 								}
 							}
-							}
 							return nil, err
 						}, orderList)
 					tasksch.HandleTask(subTask, task, true).Run()