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

jdshop

Browse Source
This commit is contained in:
苏尹岚
2020-07-31 13:51:59 +08:00
parent 35914b5fae
commit aace78c4e2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ type StoreSkuSyncInfo struct {
Price int64 Price int64
UnitPrice int64 UnitPrice int64
Stock int
// 平台相关的store sku信息 // 平台相关的store sku信息
StoreSkuStatus int StoreSkuStatus int
@@ -421,7 +422,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
t14.vendor_id, t14.vendor_org_code, t14.vendor_id, t14.vendor_org_code,
t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status, t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status,
%s vendor_sku_id, t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price, t1.%s_lock_time lock_time, %s vendor_sku_id, t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price, t1.%s_lock_time lock_time,
t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, t1.jds_ware_id, t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, t1.jds_ware_id, t1.stock,
t2.*, t2.*,
t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.category_id name_category_id, t3.yb_name_suffix, t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.category_id name_category_id, t3.yb_name_suffix,
t3.jds_stock_switch, t3.preparation_time, t3.img_watermark, t3.ex_vendor_id, t3.img img_origin, t3.jds_stock_switch, t3.preparation_time, t3.img_watermark, t3.ex_vendor_id, t3.img img_origin,

8
business/partner/purchase/jdshop/callback.go
View File

@@ -29,13 +29,13 @@ func OnCallbackMsg(msg *jdshopapi.CallBackResult) (err error) {
msgType := msg.MsgType msgType := msg.MsgType
switch msgType { switch msgType {
case jcqapi.TopicOrderPay: case jcqapi.TopicOrderPay:
jxutils.CallMsgHandler(func() { utils.CallFuncAsync(func() {
SaveJdsOrders(msg) SaveJdsOrders(msg)
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop)) })
case jcqapi.TopicOrderCancel: case jcqapi.TopicOrderCancel:
jxutils.CallMsgHandler(func() { utils.CallFuncAsync(func() {
CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, getRealOrderID(msg.OrderID), "系统取消") CurPurchaseHandler.CancelOrder(jxcontext.AdminCtx, getRealOrderID(msg.OrderID), "系统取消")
}, jxutils.ComposeUniversalOrderID(msg.OrderID, model.VendorIDJDShop)) })
default: default:
return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType) return fmt.Errorf("暂不支持的topic类型！topic: %v", msgType)
} }