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

- wsc

Browse Source
This commit is contained in:
gazebo
2019-01-21 22:46:46 +08:00
parent 9c3e9a89df
commit 64f2c371af
7 changed files with 223 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/order.go
View File

@@ -202,6 +202,12 @@ func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.
func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db orm.Ormer) (err error) {
globals.SugarLogger.Debugf("updateOrderSkuOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
jxStoreID := jxutils.GetJxStoreIDFromOrder(order)
// 这里的jxStoreID表示的是展示商品所属的门店，如果是微商城，以JxStoreID为准
// 所以而JxStoreID是由vendorStoreID经store_map表示查询得到的，所以要求绑定微商城店时，要给准确的微商城店号
if order.VendorID == model.VendorIDWSC {
jxStoreID = order.JxStoreID
}
if jxStoreID == 0 {
if order.VendorID != model.VendorIDEBAI {
globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营]订单在京西与平台都找不到京西门店信息orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)

21
business/model/dao/store_sku.go
View File

@@ -38,13 +38,14 @@ type StoreSkuSyncInfo struct {
StoreSkuStatus int
SkuSyncStatus int8
model.Sku
VendorSkuID string `orm:"column(vendor_sku_id)"`
Prefix string
NameID int `orm:"column(name_id)"`
Name string
Unit string
Img string
Upc string
VendorSkuID string `orm:"column(vendor_sku_id)"`
Prefix string
NameID int `orm:"column(name_id)"`
VendorNameID string `orm:"column(vendor_name_id)"`
Name string
Unit string
Img string
Upc string
VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"`
@@ -121,11 +122,13 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
tableName = "t2"
}
imgField := "img"
vendorSkuNameField := "0"
if vendorID == model.VendorIDWSC {
imgField = "img_weimob"
vendorSkuNameField = "t1.wsc_id2"
}
sql := `
SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status,
SELECT t1.id bind_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id, t1.%s_sync_status sku_sync_status, %s vendor_name_id,
t2.*,
t3.id name_id, t3.prefix, t3.name, t3.unit, t3.%s img, t3.upc,
t4.%s_category_id vendor_vendor_cat_id,
@@ -149,7 +152,7 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
sqlParams = append(sqlParams, skuIDs)
}
fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, imgField, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
sql = fmt.Sprintf(sql, tableName, fieldPrefix, fieldPrefix, vendorSkuNameField, imgField, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix)
// globals.SugarLogger.Debug(sql)
if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
globals.SugarLogger.Debug("fuck")

9
business/model/store_sku.go
View File

@@ -68,10 +68,11 @@ type StoreSkuBind struct {
UnitPrice int // 这个是一斤的门店商品价，放在这里的原因是避免额外增加一张store sku_name表，逻辑上要保证同一SKU NAME中的所有SKU这个字段的数据一致
Status int
ElmID int64 `orm:"column(elm_id);index"`
EbaiID int64 `orm:"column(ebai_id);index"`
MtwmID int64 `orm:"column(mtwm_id)"` // 这个也不是必须的，只是为了DAO取数据语句一致
WscID string `orm:"column(wsc_id);size(64);index"`
ElmID int64 `orm:"column(elm_id);index"`
EbaiID int64 `orm:"column(ebai_id);index"`
MtwmID int64 `orm:"column(mtwm_id)"` // 这个也不是必须的，只是为了DAO取数据语句一致
WscID int64 `orm:"column(wsc_id);index"` // 表示微盟skuId
WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId
JdSyncStatus int8 `orm:"default(2)"`

9
business/partner/purchase/weimob/wsc/callback.go
View File

@@ -2,8 +2,15 @@ package wsc
import (
"git.rosy.net.cn/baseapi/platformapi/weimobapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
)
func OnCallbackMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
return weimobapi.SuccessResponse
orderID := utils.Int64ToStr(msg.OrderNo)
jxutils.CallMsgHandler(func() {
response = curPurchaseHandler.onOrderMsg(msg)
}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDWSC))
return response
}

156
business/partner/purchase/weimob/wsc/order.go
View File

@@ -3,13 +3,140 @@ package wsc
import (
"time"
"git.rosy.net.cn/baseapi/platformapi/weimobapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
func (p *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int {
return 0
const (
FakeOrderStatusAccepted = 101
FakeOrderStatusFinishedPickup = 102
)
var (
VendorStatus2StatusMap = map[int]int{
weimobapi.OrderStatusWait4Pay: model.OrderStatusUnknown,
weimobapi.OrderStatusPayed: model.OrderStatusNew,
FakeOrderStatusAccepted: model.OrderStatusAccepted,
FakeOrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
weimobapi.OrderStatusDelivering: model.OrderStatusDelivering,
weimobapi.OrderStatusFinished: model.OrderStatusFinished,
weimobapi.OrderStatusCanceled: model.OrderStatusCanceled,
}
)
func (p *PurchaseHandler) onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
if weimobapi.MsgEventCreateOrder == msg.MsgEvent {
order, err := p.GetOrder(utils.Int64ToStr(msg.OrderNo))
if err == nil {
order.StatusTime = msg.StatusTime
err = partner.CurOrderManager.OnOrderNew(order, order.VendorStatus)
}
return weimobapi.Err2CallbackResponse(err, "")
} else {
status, err := p.callbackMsg2Status(msg)
if status != nil {
err = partner.CurOrderManager.OnOrderStatusChanged(status)
}
response = weimobapi.Err2CallbackResponse(err, "")
}
return response
}
func (p *PurchaseHandler) callbackMsg2Status(msg *weimobapi.CallbackMsg) (orderStatus *model.OrderStatus, err error) {
orderID := utils.Int64ToStr(msg.OrderNo)
var intStatus int
if msg.IsFake {
intStatus = int(utils.Str2Int64(msg.MsgEvent))
} else {
intStatus, err = p.getOrderStatus(msg.OrderNo)
}
if err == nil {
vendorStatus := utils.Int2Str(intStatus)
orderStatus = &model.OrderStatus{
VendorOrderID: orderID,
VendorID: model.VendorIDWSC,
OrderType: model.OrderTypeOrder,
RefVendorOrderID: orderID,
RefVendorID: model.VendorIDWSC,
VendorStatus: vendorStatus,
Status: p.GetStatusFromVendorStatus(vendorStatus),
StatusTime: msg.StatusTime,
Remark: "",
}
}
return orderStatus, err
}
func (p *PurchaseHandler) getOrderStatus(orderNo int64) (status int, err error) {
result, err := api.WeimobAPI.QueryOrderDetail(orderNo, false)
if err != nil {
return 0, err
}
return int(utils.MustInterface2Int64(result["orderStatus"])), nil
}
func (p *PurchaseHandler) GetStatusFromVendorStatus(vendorStatus string) int {
if status, ok := VendorStatus2StatusMap[int(utils.Str2Int64(vendorStatus))]; ok {
return status
}
return model.OrderStatusUnknown
}
func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrder, err error) {
globals.SugarLogger.Debug(vendorOrderID)
result, err := api.WeimobAPI.QueryOrderDetail(utils.Str2Int64(vendorOrderID), false)
if err != nil {
return nil, err
}
deliveryDetail := result["deliveryDetail"].(map[string]interface{})
logisticsDeliveryDetail := deliveryDetail["logisticsDeliveryDetail"].(map[string]interface{})
order = &model.GoodsOrder{
VendorOrderID: vendorOrderID,
VendorID: model.VendorIDWSC,
VendorStoreID: utils.Int64ToStr(utils.MustInterface2Int64(result["processStoreId"])), // 这个不是通常意义上的vendor store id
// StoreID
// StoreName
ConsigneeName: utils.Interface2String(logisticsDeliveryDetail["receiverName"]),
ConsigneeMobile: utils.Interface2String(logisticsDeliveryDetail["receiverMobile"]),
ConsigneeAddress: utils.Interface2String(logisticsDeliveryDetail["receiverAddress"]),
CoordinateType: model.CoordinateTypeMars,
ConsigneeLng: jxutils.StandardCoordinate2Int(utils.Str2Float64(utils.Interface2String(logisticsDeliveryDetail["receiverLongitude"]))),
ConsigneeLat: jxutils.StandardCoordinate2Int(utils.Str2Float64(utils.Interface2String(logisticsDeliveryDetail["receiverLatitude"]))),
BuyerComment: utils.Interface2String(result["buyerRemark"]),
ExpectedDeliveredTime: utils.DefaultTimeValue,
VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(result["orderStatus"])),
OrderSeq: 0,
// StatusTime:,
OriginalData: string(utils.MustMarshal(result)),
ActualPayPrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(result["totalAmount"])),
}
order.Status = p.GetStatusFromVendorStatus(order.VendorStatus)
itemList := result["itemList"].([]interface{})
for _, v := range itemList {
item := v.(map[string]interface{})
skuName := utils.Interface2String(item["goodsTitle"])
_, _, _, specUnit, _, specQuality := jxutils.SplitSkuName(skuName)
sku := &model.OrderSku{
VendorOrderID: vendorOrderID,
VendorID: model.VendorIDWSC,
Count: int(utils.MustInterface2Int64(item["skuNum"])),
SkuID: int(utils.Str2Int64(utils.Interface2String(item["skuCode"]))),
VendorSkuID: utils.Int64ToStr(utils.MustInterface2Int64(item["skuId"])),
SkuName: skuName,
Weight: jxutils.FormatSkuWeight(specQuality, specUnit), // 订单信息里没有重量，只有名字里尝试找
SalePrice: jxutils.StandardPrice2Int(utils.MustInterface2Float64(item["price"])),
}
order.Skus = append(order.Skus, sku)
order.SkuCount++
order.GoodsCount += sku.Count
order.SalePrice += sku.SalePrice * int64(sku.Count)
order.Weight += sku.Weight * sku.Count
}
return order, err
}
@@ -18,9 +145,22 @@ func (p *PurchaseHandler) GetStatusActionTimeout(statusType, status int) time.Du
}
func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableWscStoreWrite {
if !isAcceptIt {
err = api.WeimobAPI.CancelOrder(utils.Str2Int64(order.VendorOrderID), "")
} else {
// 微商城没有确认，只有取消，模拟接受
p.postFakeMsg(utils.Str2Int64(order.VendorOrderID), FakeOrderStatusAccepted)
}
}
return err
}
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableStoreWrite && globals.EnableWscStoreWrite {
// 微商城没有拣货完成，模拟
p.postFakeMsg(utils.Str2Int64(order.VendorOrderID), FakeOrderStatusFinishedPickup)
}
return err
}
@@ -43,3 +183,15 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
return err
}
func (p *PurchaseHandler) postFakeMsg(orderNo int64, fakeStatus int) {
msg := &weimobapi.CallbackMsg{
IsFake: true,
MsgEvent: utils.Int2Str(fakeStatus),
OrderNo: orderNo,
StatusTime: time.Now(),
}
go func() {
OnCallbackMsg(msg)
}()
}

52
business/partner/purchase/weimob/wsc/store_sku.go
View File

@@ -3,7 +3,7 @@ package wsc
import (
"errors"
"fmt"
"strings"
"math/rand"
"git.rosy.net.cn/baseapi/platformapi/weimobapi"
"git.rosy.net.cn/baseapi/utils"
@@ -40,7 +40,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
if globals.EnableStoreWrite && globals.EnableWscStoreWrite {
if catInfo.WscSyncStatus&model.SyncFlagDeletedMask != 0 { // 删除
globals.SugarLogger.Debugf("UpdateClassify strStoreID:%s, WscID:%d", strStoreID, catInfo.WscID)
err = api.WeimobAPI.UpdateClassify(catInfo.WscID, catInfo.CatName+"del", "")
err = api.WeimobAPI.UpdateClassify(catInfo.WscID, composeFakeDelName(catInfo.CatName), "")
} else if catInfo.WscSyncStatus&(model.SyncFlagNewMask|model.SyncFlagModifiedMask) != 0 { // 新增
catImg := ""
if level == 2 {
@@ -177,9 +177,9 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
storeSkuBind := &model.StoreSkuBind{}
storeSkuBind.ID = skuItem.BindID
if skuItem.SkuSyncStatus&model.SyncFlagDeletedMask != 0 {
goodsID, _ := SplitGoodsAndSkuIDFromJXVendorSkuID(skuItem.VendorSkuID)
goodsID := utils.Str2Int64(skuItem.VendorNameID)
if err = api.WeimobAPI.UpdateGoodsShelfStatus([]int64{goodsID}, false); err == nil {
err = api.WeimobAPI.UpdateGoodsTitle(goodsID, skuItem.Name+"del")
err = api.WeimobAPI.UpdateGoodsTitle(goodsID, composeFakeDelName(skuItem.Name))
}
} else if skuItem.SkuSyncStatus&(model.SyncFlagModifiedMask|model.SyncFlagNewMask) != 0 {
outerGoodsCode := utils.Int2Str(skuItem.NameID)
@@ -200,12 +200,15 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
DeliveryTypeIdList: []int64{DefDeliveryTypeId},
B2cGoodsType: weimobapi.GoodsTypeNormal,
}
salePrice := int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), int(storeDetail.PricePercentage)))
skuList := []map[string]interface{}{
map[string]interface{}{
weimobapi.KeyOuterSkuCode: utils.Int2Str(skuItem.ID),
weimobapi.KeyImageURL: skuItem.Img,
weimobapi.KeySalePrice: jxutils.IntPrice2Standard(int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), int(storeDetail.PricePercentage)))),
weimobapi.KeyEditStockNum: model.MaxStoreSkuStockQty,
weimobapi.KeyOuterSkuCode: utils.Int2Str(skuItem.ID),
weimobapi.KeyImageURL: skuItem.Img,
weimobapi.KeySalePrice: jxutils.IntPrice2Standard(salePrice),
weimobapi.KeyCostPrice: jxutils.IntPrice2Standard(salePrice * 8 / 10),
weimobapi.KeyOriginalPrice: jxutils.IntPrice2Standard(salePrice * 10 / (6 + rand.Int63n(4))),
weimobapi.KeyEditStockNum: model.MaxStoreSkuStockQty,
weimobapi.KeyB2cSku: &weimobapi.PendingSaveB2CSkuVo{
Weight: jxutils.IntWeight2Float(skuItem.Weight),
},
@@ -215,11 +218,15 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
if skuItem.SkuSyncStatus&model.SyncFlagNewMask != 0 {
goodsID, skuMap, err2 := api.WeimobAPI.AddGoods(outerGoodsCode, title, false, []string{skuItem.Img}, skuItem.Comment, isPutAway, 0, categoryId, classifyIdList, b2cGoods, skuList, nil)
if err = err2; err == nil {
storeSkuBind.WscID = ComposeJXVendorSkuIDFromGoodsAndSkuID(goodsID, skuMap[utils.Int2Str(skuItem.ID)])
storeSkuBind.WscID = skuMap[utils.Int2Str(skuItem.ID)]
storeSkuBind.WscID2 = goodsID
updateFields = append(updateFields, model.FieldWscID)
}
} else {
goodsID, _ := SplitGoodsAndSkuIDFromJXVendorSkuID(skuItem.VendorSkuID)
// http://open.weimob.com/docapi/article?tag=Af
// sku id，如果为空，则新增sku； 如果更新之前的skuId与入参skuId对应，则更新sku； 如果更新之前的skuId没有和入参的skuId对应，删除更新之前的sku
skuList[0][weimobapi.KeySkuID] = utils.Str2Int64(skuItem.VendorSkuID)
goodsID := utils.Str2Int64(skuItem.VendorNameID)
_, _, err = api.WeimobAPI.UpdateGoods(goodsID, title, false, []string{skuItem.Img}, skuItem.Comment, isPutAway, 0, categoryId, classifyIdList, b2cGoods, skuList, nil)
}
}
@@ -254,15 +261,20 @@ func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTa
return hint, err
}
func SplitGoodsAndSkuIDFromJXVendorSkuID(vendorSkuID string) (goodsID, skuID int64) {
list := strings.Split(vendorSkuID, ",")
if len(list) == 2 {
goodsID = utils.Str2Int64(list[0])
skuID = utils.Str2Int64(list[1])
}
return goodsID, skuID
func composeFakeDelName(name string) string {
return name + "_del"
}
func ComposeJXVendorSkuIDFromGoodsAndSkuID(goodsID, skuID int64) (vendorSkuID string) {
return utils.Int64ToStr(goodsID) + "," + utils.Int64ToStr(skuID)
}
// func SplitGoodsAndSkuIDFromJXVendorSkuID(vendorSkuID string) (goodsID, skuID int64) {
// list := strings.Split(vendorSkuID, ",")
// if len(list) == 2 {
// skuID = utils.Str2Int64(list[0])
// goodsID = utils.Str2Int64(list[1])
// }
// return goodsID, skuID
// }
// // skuID放在前面的原因是存入数据库后，便于以skuID的查找
// func ComposeJXVendorSkuIDFromGoodsAndSkuID(goodsID, skuID int64) (vendorSkuID string) {
// return utils.Int64ToStr(skuID) + "," + utils.Int64ToStr(goodsID)
// }

6
business/partner/purchase/weimob/wsc/wsc.go
View File

@@ -7,6 +7,12 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
)
// 对于微盟来说，只有一个展示商品的商家，但有多个拣货的商家
// 订单中的
// VendorStoreID表示在微盟上的商家编码
// JxStoreID表示的是展示商品的商家
// StoreID才是实际派单的商家
var (
curPurchaseHandler *PurchaseHandler
)