From a89928a36637cbd6e471ffa4d43a7afe2170f20d Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 6 Sep 2019 15:11:36 +0800
Subject: [PATCH] - remove fuck

---
 business/jxstore/cms/user2.go              |  4 ++--
 business/jxstore/tempop/tempop.go          | 20 ++++++++++++--------
 business/jxutils/cache/redis/redis_test.go |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 2d5684644..954f66590 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -211,10 +211,10 @@ func HandleOrder4Consignee(order *model.GoodsOrder) (err error) {
 		setUserAddress(db, user, order)
 
 		if user.GetID2() == "" {
-			user.UserID2 = vendorUserID
+			user.UserID2 = order.VendorUserID
 		}
 		if user.GetID2() == "" {
-			user.UserID2 = order.VendorUserID
+			user.UserID2 = order.VendorOrderID
 		}
 
 		user.Type = model.UserTypeConsumer
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 85bcfe920..2ce24e036 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1028,7 +1028,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 	}
 
 	db := dao.GetDB()
-	rootTask := tasksch.NewParallelTask("从订单中创建消费都账户", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+	rootTask := tasksch.NewParallelTask("从订单中创建消费者账户", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			curDate := batchItemList[0].(time.Time)
 			sql := `
@@ -1051,13 +1051,12 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 			if err = dao.GetRows(db, &orderList, sql, sqlParams...); err == nil {
 				if len(orderList) > 0 {
 					// 并发必须是1，否则在HandleOrder4Consignee中可能导致主键重，错误
-					subTask := tasksch.NewParallelTask("RefreshMtpsWaybillFee", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+					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 handler := partner.GetPurchasePlatformFromVendorID(order.VendorID); handler != nil {
 									var order2 *model.GoodsOrder
-									// globals.SugarLogger.Debugf("fuck:%s", order.OriginalData)
 									if order.OriginalData != "" {
 										var orderData map[string]interface{}
 										if utils.UnmarshalUseNumber([]byte(order.OriginalData), &orderData) == nil {
@@ -1071,12 +1070,17 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 										order2, err = handler.GetOrder(order.VendorOrderID)
 									}
 									if order2 != nil {
-										isNeedUpdateOrder := order.VendorUserID != order2.VendorUserID
-										order.VendorUserID = order2.VendorUserID
-										if isNeedUpdateOrder {
-											dao.UpdateEntity(db, &order.GoodsOrder, "VendorUserID")
+										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")
+										}
+										if len(updateFields) > 0 {
+											dao.UpdateEntity(db, &order.GoodsOrder, updateFields...)
 										}
-										err = cms.HandleOrder4Consignee(&order.GoodsOrder)
 									}
 								}
 							}
diff --git a/business/jxutils/cache/redis/redis_test.go b/business/jxutils/cache/redis/redis_test.go
index 789ece200..0a314b783 100644
--- a/business/jxutils/cache/redis/redis_test.go
+++ b/business/jxutils/cache/redis/redis_test.go
@@ -16,7 +16,7 @@ func init() {
 	cacher = New("localhost", 6379, "")
 }
 
-type FuckYou struct {
+type TestType struct {
 	Key string `json:"key"`
 }
 
@@ -35,7 +35,7 @@ func TestIt(t *testing.T) {
 		t.Fatal("should not get nothing")
 	}
 
-	result := new(FuckYou)
+	result := new(TestType)
 	cacher.GetAs("key", result)
 	if result.Key != "value" {
 		t.Fatal("should get value")