- 京西自营商城可以存订单了

business/partner/purchase/jx/act.go

@@ -0,0 +1,11 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actOrderRules []*model.ActOrderRule, actStoreSkuList []*model.ActStoreSku2) (err error) {
+	return err
+}

business/partner/purchase/jx/callback.go

@@ -0,0 +1,36 @@
+package jx
+
+import "fmt"
+
+const (
+	appKey = "4A86853D-E4B6-454E-940A-B68ECDA2B73E"
+
+	MsgTypeOrder               = "order"
+	SubMsgTypeOrderNew         = "newOrder"
+	SubMsgTypeOrderAdjust      = "adjustOrder"
+	SubMsgTypeOrderApplyCancel = "applyCancel"
+	// SubMsgTypeOrderApplayRefund = "applyRefund"
+)
+
+type CallbackResponse struct {
+	Code int    `json:"code"`
+	Data string `json:"data"`
+}
+
+type CallbackMsg struct {
+	AppKey     string `json:"appKey"`
+	MsgType    string `json:"msgType"`
+	SubMsgType string `json:"subMsgType"`
+	ThingID    string `json:"thingID"`
+	Data       string `json:"data"`
+}
+
+func OnCallbackMsg(msg *CallbackMsg) (retVal, errCode string, err error) {
+	if msg.AppKey != appKey {
+		return retVal, errCode, fmt.Errorf("无效的AppKey:%s", msg.AppKey)
+	}
+	if msg.MsgType == MsgTypeOrder {
+		retVal, errCode, err = CurPurchaseHandler.OnOrderMsg(msg)
+	}
+	return retVal, errCode, err
+}

business/partner/purchase/jx/jx.go

@@ -0,0 +1,32 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+type PurchaseHandler struct {
+	partner.BasePurchasePlatform
+}
+
+var (
+	CurPurchaseHandler *PurchaseHandler
+)
+
+func init() {
+	globals.SugarLogger.Debug("init jx")
+	if true {
+		CurPurchaseHandler = new(PurchaseHandler)
+		partner.RegisterPurchasePlatform(CurPurchaseHandler)
+	}
+}
+
+func (c *PurchaseHandler) GetVendorID() int {
+	return model.VendorIDJX
+}
+
+func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, imgURL string, imgData []byte, imgName string) (imgHint string, err error) {
+	return imgHint, err
+}

business/partner/purchase/jx/jx_test.go

@@ -0,0 +1,52 @@
+package jx
+
+import (
+	"testing"
+
+	_ "git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals/testinit"
+)
+
+func init() {
+	testinit.Init()
+}
+
+func TestBuildNewJxOrder(t *testing.T) {
+	order, err := partner.CurOrderManager.LoadOrder("920931913000041", model.VendorIDJD)
+	if err != nil {
+		t.Fatal(err)
+	}
+	order.VendorID = model.VendorIDJX
+	order.VendorStoreID = utils.Int2Str(order.StoreID)
+	for _, sku := range order.Skus {
+		sku.VendorID = model.VendorIDJX
+		sku.VendorSkuID = utils.Int2Str(sku.SkuID)
+	}
+	order2 := &Data4Neworder{
+		GoodsOrder: *order,
+		Skus:       order.Skus,
+	}
+	msg := &CallbackMsg{
+		AppKey:     appKey,
+		MsgType:    MsgTypeOrder,
+		SubMsgType: SubMsgTypeOrderNew,
+		ThingID:    order.VendorOrderID,
+		Data:       utils.Format4Output(order2, true),
+	}
+	t.Logf("\n%s", msg.AppKey)
+	t.Logf("\n%s", msg.MsgType)
+	t.Logf("\n%s", msg.SubMsgType)
+	t.Logf("\n%s", msg.ThingID)
+	t.Logf("\n%s", msg.Data)
+
+	var order3 *model.GoodsOrder
+	err = utils.UnmarshalUseNumber([]byte(msg.Data), &order3)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(order3.OrderCreatedAt)
+}

business/partner/purchase/jx/order.go

@@ -0,0 +1,120 @@
+package jx
+
+import (
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+type Data4Neworder struct {
+	model.GoodsOrder
+	Skus []*model.OrderSku `json:"skus"`
+}
+
+func (c *PurchaseHandler) OnOrderMsg(msg *CallbackMsg) (retVal, errCode string, err error) {
+	jxutils.CallMsgHandler(func() {
+		retVal, errCode, err = c.onOrderMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.ThingID, c.GetVendorID()))
+	return retVal, errCode, err
+}
+
+func (c *PurchaseHandler) onOrderMsg(msg *CallbackMsg) (retVal, errCode string, err error) {
+	if msg.SubMsgType == SubMsgTypeOrderNew || msg.SubMsgType == SubMsgTypeOrderAdjust {
+		var order *Data4Neworder
+		if err = utils.UnmarshalUseNumber([]byte(msg.Data), &order); err == nil {
+			retVal, errCode, err = c.onOrderNew(msg, order)
+		}
+	}
+	return retVal, errCode, err
+}
+
+func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, order *Data4Neworder) (retVal, errCode string, err error) {
+	globals.SugarLogger.Debugf("onOrderNew orderID:%s", msg.ThingID)
+	order.GoodsOrder.Skus = order.Skus
+	orderStatus := model.Order2Status(&order.GoodsOrder)
+	if msg.SubMsgType == SubMsgTypeOrderNew {
+		err = partner.CurOrderManager.OnOrderNew(&order.GoodsOrder, orderStatus)
+	} else {
+		err = partner.CurOrderManager.OnOrderAdjust(&order.GoodsOrder, orderStatus)
+	}
+	return retVal, errCode, err
+}
+
+func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	return order
+}
+
+func (c *PurchaseHandler) GetOrder(orderID string) (order *model.GoodsOrder, err error) {
+	return order, err
+}
+
+func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) CallCourier(ctx *jxcontext.Context, order *model.GoodsOrder) (err error) { // 拣货失败后再次招唤平台配送
+	return err
+}
+
+func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *model.GoodsOrder) (err error) { // 投递失败后确认收到退货
+	return err
+}
+
+func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+// 京东送达接口都是一样的
+func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *model.GoodsOrder) (mobile string, err error) {
+	return mobile, err
+}
+
+func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.ITask, queryDate time.Time, vendorStoreID string) (vendorOrderIDs []string, err error) {
+	return vendorOrderIDs, err
+}
+
+func (c *PurchaseHandler) GetWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder) (tipFee int64, err error) {
+	return tipFee, err
+}
+
+func (c *PurchaseHandler) AddWaybillTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee2Add int64) (err error) {
+	return err
+}

business/partner/purchase/jx/order_afs.go

@@ -0,0 +1,38 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func (c *PurchaseHandler) OnAfsOrderMsg(msg *CallbackMsg) (retVal *CallbackResponse) {
+	jxutils.CallMsgHandlerAsync(func() {
+		retVal = c.onAfsOrderMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(msg.ThingID, c.GetVendorID()))
+	return retVal
+}
+
+func (c *PurchaseHandler) onAfsOrderMsg(msg *CallbackMsg) (retVal *CallbackResponse) {
+	return retVal
+}
+
+//  审核售后单申请
+func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
+	return err
+}
+
+// 确认收到退货
+func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, order *model.AfsOrder) (err error) {
+	return err
+}
+
+// 发起全款退款
+func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
+	return err
+}
+
+// 发起部分退款
+func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) {
+	return err
+}

business/partner/purchase/jx/order_comment.go

@@ -0,0 +1,10 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func (c *PurchaseHandler) ReplyOrderComment(ctx *jxcontext.Context, orderComment *model.OrderComment, replyComment string) (err error) {
+	return err
+}

business/partner/purchase/jx/sku.go

@@ -0,0 +1,59 @@
+package jx
+
+// 这里函数取得的信息，除了与自身实体相关的ID（比如PARENT ID），都已经转换成了本地ID了
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner"
+)
+
+func (p *PurchaseHandler) CreateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) GetAllCategories(ctx *jxcontext.Context, vendorOrgCode string) (cats []*partner.BareCategoryInfo, err error) {
+	return cats, err
+}
+
+func (p *PurchaseHandler) UpdateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
+	return nil
+}
+
+func (p *PurchaseHandler) DeleteCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
+	return nil
+}
+
+func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuNameExt *model.SkuNameExt, err error) {
+	return skuNameExt, err
+}
+
+func (p *PurchaseHandler) UpdateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) RefreshAllSkusID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
+	return hint, err
+}
+
+func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
+	return vendorCats, err
+}
+
+func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*partner.SkuNameInfo, err error) {
+	return skuNameList, err
+}

business/partner/purchase/jx/store.go

@@ -0,0 +1,40 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+)
+
+func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string) (storeDetail *dao.StoreDetail, err error) {
+	return storeDetail, err
+}
+
+// stoerIDs为nil表示所有
+func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
+	return hint, err
+}
+
+func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeStatus int, err error) {
+	return storeStatus, err
+}
+
+func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, status int) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, vendorStoreID string, opTimeList []int16) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorStoreIDs []string, err error) {
+	return vendorStoreIDs, err
+}
+
+func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorStoreID string, storeID int64) (err error) {
+	return err
+}

business/partner/purchase/jx/store_sku2.go

@@ -0,0 +1,28 @@
+package jx
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/partner"
+)
+
+func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
+	batchSize = 1
+	return batchSize
+}
+
+func (p *PurchaseHandler) GetStoreSkusBareInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*partner.StoreSkuInfo) (outStoreSkuList []*partner.StoreSkuInfo, err error) {
+	return outStoreSkuList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (successList []*partner.StoreSkuInfo, err error) {
+	return successList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (successList []*partner.StoreSkuInfo, err error) {
+	return successList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (successList []*partner.StoreSkuInfo, err error) {
+	return successList, err
+}