liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Change2JDSPU4Store

Browse Source
This commit is contained in:
gazebo
2019-01-11 18:52:58 +08:00
parent f79ee7808e
commit 7d5c49c52f
4 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/initdata/initdata.go
View File

@@ -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
}

36
business/jxstore/initdata/temp_op.go
View File

@@ -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 {

13
business/model/temp_model.go Normal file
View File

@@ -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"`
}

1
globals/beegodb/beegodb.go
View File

@@ -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))