diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go index 143b976c5..8ab98a7a0 100644 --- a/business/jxstore/initdata/initdata.go +++ b/business/jxstore/initdata/initdata.go @@ -325,7 +325,7 @@ func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, step int, isAsyn SELECT t1.id FROM store t1 JOIN store_map t2 ON t2.store_id = t1.id AND t2.vendor_id = 0 AND t2.deleted_at = ? AND t2.status <> ? - WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.city_code IN (110100, 120100, 440100, 440300, 510100) + WHERE t1.deleted_at = ? AND t1.status <> ? /* AND t1.city_code IN (110100, 120100, 440100, 440300, 510100)*/ `, utils.DefaultTimeValue, model.StoreStatusDisabled, utils.DefaultTimeValue, model.StoreStatusDisabled); err != nil { return "", err } diff --git a/business/jxstore/initdata/temp_op.go b/business/jxstore/initdata/temp_op.go index afed605f3..418002b11 100644 --- a/business/jxstore/initdata/temp_op.go +++ b/business/jxstore/initdata/temp_op.go @@ -111,7 +111,19 @@ func TransferLegacyElmOrder(ctx *jxcontext.Context, isAsync, isContinueWhenError return hint, err } -func saveJdOrderList(existJdIDMap map[string]int, jdOrderList []interface{}) (err error) { +func saveJdOrderList(existJdIDMap map[string]int, jdOrderList []interface{}, jdStoreOrderList []map[string]interface{}) (err error) { + var storeOrderList []*model.TempGoodsOrderMobile + for _, v := range jdStoreOrderList { + order := &model.TempGoodsOrderMobile{ + VendorOrderID: v["orderId"].(string), + VendorID: model.VendorIDJD, + AccountNo: v["venderId"].(string), + OrderCreatedAt: utils.Timestamp2Time(utils.MustInterface2Int64(v["orderPaidTime"]) / 1000), + Mobile: v["mobile"].(string), + } + storeOrderList = append(storeOrderList, order) + } + var orderDetailList []*model.GoodsOrderOriginal for _, v := range jdOrderList { orderMap := v.(map[string]interface{}) @@ -128,12 +140,15 @@ func saveJdOrderList(existJdIDMap map[string]int, jdOrderList []interface{}) (er orderDetailList = append(orderDetailList, orderDetail) } } - if len(orderDetailList) > 0 { - // for _, v := range orderDetailList { - // globals.SugarLogger.Debug(v.VendorOrderID) - // } + + if len(orderDetailList) > 0 || len(storeOrderList) > 0 { db := dao.GetDB() - err = dao.CreateMultiEntities(db, orderDetailList) + if len(orderDetailList) > 0 { + err = dao.CreateMultiEntities(db, orderDetailList) + } + if len(storeOrderList) > 0 { + err = dao.CreateMultiEntities(db, storeOrderList) + } } return err } @@ -155,6 +170,9 @@ func PullJdOrder(ctx *jxcontext.Context, fromTime, toTime time.Time, isAsync, is pageSize := 100 hourGap := 1 gapCount := int((toTime.Sub(fromTime)-time.Hour*time.Duration(hourGap))/(time.Hour*time.Duration(hourGap)) + 1) + if gapCount <= 0 { + gapCount = 1 + } gapList := make([]int, gapCount) for k := range gapList { gapList[k] = k @@ -176,11 +194,15 @@ func PullJdOrder(ctx *jxcontext.Context, fromTime, toTime time.Time, isAsync, is "orderPurchaseTime_begin": utils.Time2Str(subFromTime), "orderPurchaseTime_end": utils.Time2Str(subToTime), } + globals.SugarLogger.Debugf("PullJdOrder, commonParams=%s", utils.Format4Output(commonParams, false)) orderList, totalCount, err := api.JdAPI.OrderQuery(utils.MergeMaps(commonParams, utils.Params2Map("pageNo", 0))) if err != nil { return "", err } - if err = saveJdOrderList(existJdIDMap, orderList); err != nil { + storeOrderList, err := api.JdAPI.GetStoreOrderInfoList(utils.Time2Str(subFromTime), utils.Time2Str(subToTime)) + if err != nil { + } + if err = saveJdOrderList(existJdIDMap, orderList, storeOrderList); err != nil { return "", err } if false { diff --git a/business/model/temp_model.go b/business/model/temp_model.go new file mode 100644 index 000000000..00ba100e6 --- /dev/null +++ b/business/model/temp_model.go @@ -0,0 +1,13 @@ +package model + +import "time" + +type TempGoodsOrderMobile struct { + ID int64 `orm:"column(id)" json:"-"` + VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` + VendorID int `orm:"column(vendor_id)" json:"vendorID"` + AccountNo string `orm:"size(32)" json:"accountNo"` + OrderCreatedAt time.Time `orm:"type(datetime);index" json:"orderCreatedAt"` // 这里记录的是订单生效时间,即用户支付完成(货到付款即为下单时间) + CreatedAt time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"` + Mobile string `orm:"size(32);index" json:"mobile"` +} diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 8887989bf..51b3808ac 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -24,6 +24,7 @@ func Init() { orm.RegisterModel(new(model.GoodsOrder)) orm.RegisterModel(new(model.GoodsOrderOriginal)) + orm.RegisterModel(new(model.TempGoodsOrderMobile)) orm.RegisterModel(new(model.OrderSku)) orm.RegisterModel(new(model.Waybill)) orm.RegisterModel(new(model.OrderStatus))