- mtps, dada create waybill
- create legacy jxorder(not finished).
This commit is contained in:
gazebo
@@ -1,6 +1,8 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"git.rosy.net.cn/baseapi"
|
||||
"git.rosy.net.cn/baseapi/utils"
|
||||
"git.rosy.net.cn/jx-callback/business/model"
|
||||
@@ -18,7 +20,7 @@ func NewOrderManager() *OrderController {
|
||||
return &OrderController{}
|
||||
}
|
||||
|
||||
func (c *OrderController) OnOrderNew(order *model.GoodsOrder, orderSkus []*model.OrderSku) (err error) {
|
||||
func (c *OrderController) OnOrderNew(order *model.GoodsOrder) (err error) {
|
||||
db := orm.NewOrm()
|
||||
isDuplicated, err := addOrderOrWaybillStatus(c.order2Status(order), db)
|
||||
if !isDuplicated {
|
||||
@@ -30,46 +32,48 @@ func (c *OrderController) OnOrderNew(order *model.GoodsOrder, orderSkus []*model
|
||||
order.Status = model.OrderStatusFailed
|
||||
}
|
||||
})
|
||||
if err = c.updateOrderOtherInfo(order, db); err == nil {
|
||||
if err = c.updateOrderSkuOtherInfo(orderSkus, db); err == nil {
|
||||
db.Begin()
|
||||
// globals.SugarLogger.Debugf("new order:%v", order)
|
||||
order.OrderFinishedAt = DefaultTimeValue
|
||||
order.ID = 0
|
||||
created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID")
|
||||
if err = err2; err == nil {
|
||||
c.orderMap.Store(ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), order.ID)
|
||||
if created {
|
||||
sql := "INSERT INTO order_sku(vendor_order_id, vendor_id, count, sku_id, vendor_sku_id, sku_name, shop_price, sale_price, weight, order_created_at) VALUES"
|
||||
params := []interface{}{}
|
||||
for _, sku := range orderSkus {
|
||||
sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
|
||||
params = append(params, sku.VendorOrderID, sku.VendorID, sku.Count, sku.SkuID, sku.VendorSkuID, sku.SkuName, sku.ShopPrice, sku.SalePrice, order.Weight, order.OrderCreatedAt)
|
||||
}
|
||||
sql = sql[:len(sql)-1] + ";"
|
||||
if _, err = db.Raw(sql, params...).Exec(); err != nil {
|
||||
db.Rollback()
|
||||
baseapi.SugarLogger.Infof("insert order_sku error:%v", err)
|
||||
} else {
|
||||
db.Commit()
|
||||
}
|
||||
} else {
|
||||
order.DuplicatedCount++
|
||||
db.Update(order, "DuplicatedCount")
|
||||
db.Commit()
|
||||
baseapi.SugarLogger.Infof("duplicated order:%s vendorID:%d, msg received", order.VendorOrderID, order.VendorID)
|
||||
}
|
||||
} else {
|
||||
db.Rollback()
|
||||
globals.SugarLogger.Warnf("create order:%v, error:%v", order, err)
|
||||
|
||||
// 忽略查找JX信息错误
|
||||
c.updateOrderOtherInfo(order, db)
|
||||
db.Begin()
|
||||
// globals.SugarLogger.Debugf("new order:%v", order)
|
||||
order.OrderFinishedAt = utils.DefaultTimeValue
|
||||
order.ID = 0
|
||||
created, _, err2 := db.ReadOrCreate(order, "VendorOrderID", "VendorID")
|
||||
if err = err2; err == nil {
|
||||
c.orderMap.Store(ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), order.ID)
|
||||
if created {
|
||||
sql := "INSERT INTO order_sku(vendor_order_id, vendor_id, count, vendor_sku_id, sku_id, jx_sku_id, sku_name, shop_price, sale_price, weight, order_created_at) VALUES"
|
||||
params := []interface{}{}
|
||||
for _, sku := range order.Skus {
|
||||
sql += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?),"
|
||||
params = append(params, sku.VendorOrderID, sku.VendorID, sku.Count, sku.VendorSkuID, sku.SkuID, sku.JxSkuID, sku.SkuName, sku.ShopPrice, sku.SalePrice, order.Weight, order.OrderCreatedAt)
|
||||
}
|
||||
sql = sql[:len(sql)-1] + ";"
|
||||
if _, err = db.Raw(sql, params...).Exec(); err != nil {
|
||||
db.Rollback()
|
||||
baseapi.SugarLogger.Infof("insert order_sku error:%v", err)
|
||||
} else {
|
||||
db.Commit()
|
||||
if globals.HandleLegacyJxOrder {
|
||||
c.legacyWriteJxOrder(order, db, false)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
order.DuplicatedCount++
|
||||
db.Update(order, "DuplicatedCount")
|
||||
db.Commit()
|
||||
baseapi.SugarLogger.Infof("duplicated order:%s vendorID:%d, msg received", order.VendorOrderID, order.VendorID)
|
||||
}
|
||||
} else {
|
||||
db.Rollback()
|
||||
globals.SugarLogger.Warnf("create order:%v, error:%v", order, err)
|
||||
}
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder, orderSkus []*model.OrderSku) (err error) {
|
||||
func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder) (err error) {
|
||||
db := orm.NewOrm()
|
||||
isDuplicated, err := addOrderOrWaybillStatus(c.order2Status(order), db)
|
||||
if err == nil && !isDuplicated {
|
||||
@@ -89,23 +93,93 @@ func (c *OrderController) OnOrderAdjust(order *model.GoodsOrder, orderSkus []*mo
|
||||
return err
|
||||
}
|
||||
}
|
||||
return c.OnOrderNew(order, orderSkus)
|
||||
err = c.OnOrderNew(order)
|
||||
if globals.HandleLegacyJxOrder && err == nil {
|
||||
c.legacyWriteJxOrder(order, db, true)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *OrderController) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) {
|
||||
isDuplicated, err := c.addOrderStatus(orderStatus, nil)
|
||||
if err == nil && !isDuplicated {
|
||||
if globals.HandleLegacyJxOrder {
|
||||
c.legacyJxOrderStatusChanged(orderStatus, nil)
|
||||
}
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// private
|
||||
func (c *OrderController) updateOrderSkuOtherInfo(orderSkus []*model.OrderSku, db orm.Ormer) (err error) {
|
||||
return nil
|
||||
var sql string
|
||||
if orderSkus[0].VendorID == model.VendorIDJD {
|
||||
sql = `
|
||||
SELECT t1.jdskuid, t2.id
|
||||
FROM skumapper t1
|
||||
JOIN jx_sku t2 ON t1.skuid = t2.id
|
||||
WHERE t1.jdskuid IN (
|
||||
`
|
||||
} else if orderSkus[0].VendorID == model.VendorIDELM {
|
||||
// 饿了么当前没有存映射关系
|
||||
return nil
|
||||
} else {
|
||||
panic(fmt.Sprintf("wrong vendorid:%d", orderSkus[0].VendorID))
|
||||
}
|
||||
|
||||
jdskuids := []interface{}{}
|
||||
for _, v := range orderSkus {
|
||||
sql += "?,"
|
||||
jdskuids = append(jdskuids, int(utils.Str2Int64(v.VendorSkuID)))
|
||||
}
|
||||
sql = sql[:len(sql)-1] + ")"
|
||||
var lists []orm.ParamsList
|
||||
if num, err := db.Raw(sql, jdskuids...).ValuesList(&lists); err == nil && num > 0 {
|
||||
skumapper := make(map[string]string)
|
||||
for _, v := range lists {
|
||||
skumapper[v[0].(string)] = v[1].(string)
|
||||
}
|
||||
globals.SugarLogger.Debug(skumapper)
|
||||
for _, v := range orderSkus {
|
||||
if jxskuid, ok := skumapper[v.VendorSkuID]; ok {
|
||||
v.JxSkuID = int(utils.Str2Int64(jxskuid))
|
||||
} else {
|
||||
globals.SugarLogger.Infof("can not find %v", jxskuid)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Errorf("can not get sku info for vendorID:%d, vendorOrderID:%s, num:%d, error:%v", orderSkus[0].VendorID, orderSkus[0].VendorOrderID, num, err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *OrderController) updateOrderOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) {
|
||||
return nil
|
||||
var sql string
|
||||
if order.VendorID == model.VendorIDJD {
|
||||
sql = `
|
||||
SELECT t2.storeid
|
||||
FROM jxstoremap t1
|
||||
JOIN jxstore t2 ON t1.jxstoreid = t2.storeid
|
||||
WHERE t1.jdstoreid = ?
|
||||
`
|
||||
} else if order.VendorID == model.VendorIDELM {
|
||||
sql = `
|
||||
SELECT t2.storeid
|
||||
FROM jx_to_elm_store_map t1
|
||||
JOIN jxstore t2 ON t1.jx_store_id = t2.storeid
|
||||
WHERE t1.elm_store_id = ?
|
||||
`
|
||||
} else {
|
||||
panic(fmt.Sprintf("wrong vendorid:%d", order.VendorID))
|
||||
}
|
||||
var lists []orm.ParamsList
|
||||
if num, err := db.Raw(sql, utils.Str2Int64(order.VendorStoreID)).ValuesList(&lists); err == nil && num == 1 {
|
||||
order.JxStoreID = int(utils.Str2Int64(lists[0][0].(string)))
|
||||
} else {
|
||||
globals.SugarLogger.Errorf("can not find store info for vendorID:%d, store:%s, num:%d, error:%v", order.VendorID, order.VendorStoreID, num, err)
|
||||
}
|
||||
err = c.updateOrderSkuOtherInfo(order.Skus, db)
|
||||
return err
|
||||
}
|
||||
|
||||
func (c *OrderController) handleAutoAcceptOrder(orderID string, vendorID int, userMobile string, jxStoreID int, db orm.Ormer, handler func(accepted bool)) int {
|
||||
@@ -129,7 +203,7 @@ func (c *OrderController) handleAutoAcceptOrder(orderID string, vendorID int, us
|
||||
handleType = -1
|
||||
}
|
||||
} else {
|
||||
globals.SugarLogger.Infof("order:%s, vendorID:%d, mobile is empty, should accept it", orderID, vendorID)
|
||||
globals.SugarLogger.Infof("order:%s, vendorID:%d, mobile is empty, should accept order", orderID, vendorID)
|
||||
handleType = 1
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user