删除打印
This commit is contained in:
@@ -396,8 +396,6 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
|
|||||||
txDB, _ := dao.Begin(db)
|
txDB, _ := dao.Begin(db)
|
||||||
defer dao.Commit(db, txDB)
|
defer dao.Commit(db, txDB)
|
||||||
|
|
||||||
//globals.SugarLogger.Debugf("store_sku 检查:sql:%s sqlParams:%s", sql, sqlParams)
|
|
||||||
|
|
||||||
if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil {
|
if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil {
|
||||||
//globals.SugarLogger.Debugf(" 检查参数:SkuNames:%s", utils.Format4Output(SkuNames, false))
|
//globals.SugarLogger.Debugf(" 检查参数:SkuNames:%s", utils.Format4Output(SkuNames, false))
|
||||||
skuNamesInfo = &dao.StoreSkuNamesInfo2{
|
skuNamesInfo = &dao.StoreSkuNamesInfo2{
|
||||||
@@ -441,9 +439,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
|
|||||||
sql2 += " AND b.status = ?"
|
sql2 += " AND b.status = ?"
|
||||||
sqlParams2 = append(sqlParams2, status)
|
sqlParams2 = append(sqlParams2, status)
|
||||||
}
|
}
|
||||||
//globals.SugarLogger.Debugf("store_sku 检查:sql2:%s sqlParams2:%s", sql2, sqlParams2)
|
|
||||||
if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil {
|
if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil {
|
||||||
//globals.SugarLogger.Debugf(" 检查参数:skus:%s", utils.Format4Output(skus, false))
|
|
||||||
v.Skus = skus
|
v.Skus = skus
|
||||||
}
|
}
|
||||||
return retVal, err
|
return retVal, err
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
|
|||||||
}
|
}
|
||||||
} else if model.IsSyncStatusNew(catInfo.CatSyncStatus) { // 新增 2
|
} else if model.IsSyncStatusNew(catInfo.CatSyncStatus) { // 新增 2
|
||||||
err = handler.CreateStoreCategory(ctx, storeID, vendorStoreID, catInfo)
|
err = handler.CreateStoreCategory(ctx, storeID, vendorStoreID, catInfo)
|
||||||
globals.SugarLogger.Debugf("CreateStoreCategory err ========= %v", err)
|
|
||||||
if err != nil && handler.IsErrCategoryExist(err) {
|
if err != nil && handler.IsErrCategoryExist(err) {
|
||||||
if cat, err2 := handler.GetStoreCategory(ctx, storeID, vendorStoreID, catInfo.Name); err2 == nil {
|
if cat, err2 := handler.GetStoreCategory(ctx, storeID, vendorStoreID, catInfo.Name); err2 == nil {
|
||||||
catInfo.VendorCatID = cat.VendorCatID
|
catInfo.VendorCatID = cat.VendorCatID
|
||||||
@@ -710,17 +709,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
updateList = updateList[:]
|
updateList = updateList[:]
|
||||||
updateList = rList2
|
updateList = rList2
|
||||||
}
|
}
|
||||||
// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
|
|
||||||
// api.JdShop2API.SetCookieWithStr(configs[0].Value)
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("createList ==== := %s", utils.Format4Output(createList, false))
|
|
||||||
globals.SugarLogger.Debugf("updateList ==== := %s", utils.Format4Output(updateList, false))
|
|
||||||
globals.SugarLogger.Debugf("deleteList ==== := %s", utils.Format4Output(deleteList, false))
|
|
||||||
globals.SugarLogger.Debugf("stockList ==== := %s", utils.Format4Output(stockList, false))
|
|
||||||
globals.SugarLogger.Debugf("onlineList ==== := %s", utils.Format4Output(onlineList, false))
|
|
||||||
globals.SugarLogger.Debugf("offlineList ==== := %s", utils.Format4Output(offlineList, false))
|
|
||||||
globals.SugarLogger.Debugf("priceList ==== := %s", utils.Format4Output(priceList, false))
|
|
||||||
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
|
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
|
||||||
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
||||||
step := batchItemList[0].(int)
|
step := batchItemList[0].(int)
|
||||||
@@ -788,7 +778,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil, len(successList), err
|
return nil, len(successList), err
|
||||||
}, ctx, task, createList, 20, isContinueWhenError2)
|
}, ctx, task, createList, singleStoreHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkus), isContinueWhenError2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debug("create sku wrong on :", err)
|
globals.SugarLogger.Debug("create sku wrong on :", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ func (c *PrinterHandler) GetVendorID() int {
|
|||||||
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, sn, copies, voiceType, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
|
func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, sn, copies, voiceType, msgContent string) (printerStatus *partner.PrinterStatus, err error) {
|
||||||
if sn != "" {
|
if sn != "" {
|
||||||
//if globals.EnableStoreWrite {
|
//if globals.EnableStoreWrite {
|
||||||
globals.SugarLogger.Debugf("printMsg voiceType====%s", voiceType)
|
|
||||||
printOrderID, err1 := api.XpyunAPI.Print(&xpyunapi.PrintRequest{
|
printOrderID, err1 := api.XpyunAPI.Print(&xpyunapi.PrintRequest{
|
||||||
Sn: sn,
|
Sn: sn,
|
||||||
Content: msgContent,
|
Content: msgContent,
|
||||||
@@ -101,9 +100,7 @@ func (c *PrinterHandler) RebindPrinter(ctx *jxcontext.Context, lastBindResult *p
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) {
|
func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) {
|
||||||
globals.SugarLogger.Debugf("打印order参数:%s", utils.Format4Output(order, false))
|
|
||||||
if len(order.Skus) == 0 {
|
if len(order.Skus) == 0 {
|
||||||
globals.SugarLogger.Debugf("order.sku为空")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
content := ""
|
content := ""
|
||||||
|
|||||||
@@ -77,7 +77,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, v := range actStoreSku {
|
for _, v := range actStoreSku {
|
||||||
globals.SugarLogger.Debugf("打印初始商品参数 sku=%s", utils.Format4Output(v, false))
|
|
||||||
if handler == nil || handler(v.SyncStatus) {
|
if handler == nil || handler(v.SyncStatus) {
|
||||||
stock := int64(0)
|
stock := int64(0)
|
||||||
if v.Stock > 0 {
|
if v.Stock > 0 {
|
||||||
@@ -192,7 +191,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
|||||||
actData := act2TxdActivity(act)
|
actData := act2TxdActivity(act)
|
||||||
//2 活动商品详情
|
//2 活动商品详情
|
||||||
actSkuData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate)
|
actSkuData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate)
|
||||||
globals.SugarLogger.Debugf("进入获取活动参数,actData=%s,actSkuData=%s", utils.Format4Output(actData, false), utils.Format4Output(actSkuData, false))
|
|
||||||
|
|
||||||
if actData != nil && actSkuData != nil {
|
if actData != nil && actSkuData != nil {
|
||||||
if globals.EnableMtwmStoreWrite {
|
if globals.EnableMtwmStoreWrite {
|
||||||
@@ -200,7 +198,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
|||||||
//创建活动
|
//创建活动
|
||||||
actData.StoreIds = &[]string{vendorStoreID}
|
actData.StoreIds = &[]string{vendorStoreID}
|
||||||
actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData)
|
actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData)
|
||||||
globals.SugarLogger.Debugf("createOneShopAct actData=%s,err=%v", utils.Format4Output(actData, false), err1)
|
|
||||||
if err1 != nil || actID == 0 {
|
if err1 != nil || actID == 0 {
|
||||||
failedList = append(failedList, &partner.StoreSkuInfoWithErr{
|
failedList = append(failedList, &partner.StoreSkuInfoWithErr{
|
||||||
VendoreID: model.VendorIDTaoVegetable,
|
VendoreID: model.VendorIDTaoVegetable,
|
||||||
@@ -213,7 +210,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
|||||||
//活动增加商品
|
//活动增加商品
|
||||||
actSkuData.ActId = &actID
|
actSkuData.ActId = &actID
|
||||||
err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData)
|
err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData)
|
||||||
globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err3=%v", utils.Format4Output(actSkuData, false), err3)
|
|
||||||
err = err3
|
err = err3
|
||||||
if err != nil { //商品新增失败,回滚删除创建的活动
|
if err != nil { //商品新增失败,回滚删除创建的活动
|
||||||
err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID)
|
err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID)
|
||||||
@@ -295,12 +291,9 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A
|
|||||||
task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx,
|
task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx,
|
||||||
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
||||||
list := batchItemList[0].([]*model.ActStoreSku2)
|
list := batchItemList[0].([]*model.ActStoreSku2)
|
||||||
globals.SugarLogger.Debugf("我在这里4")
|
|
||||||
failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list)
|
failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list)
|
||||||
globals.SugarLogger.Debugf("我在这里6,failedList=%s, err2=%v", utils.Format4Output(failedList, false), err2)
|
|
||||||
if err = err2; err2 == nil {
|
if err = err2; err2 == nil {
|
||||||
if len(failedList) > 0 {
|
if len(failedList) > 0 {
|
||||||
globals.SugarLogger.Debugf("我在这里5")
|
|
||||||
failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList)
|
failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList)
|
||||||
list = []*model.ActStoreSku2{}
|
list = []*model.ActStoreSku2{}
|
||||||
for _, v := range actStoreSku {
|
for _, v := range actStoreSku {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package tao_vegetable
|
|||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
||||||
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
|
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils"
|
"git.rosy.net.cn/jx-callback/business/jxutils"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
"git.rosy.net.cn/jx-callback/globals"
|
||||||
@@ -16,7 +15,6 @@ func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_
|
|||||||
if CurPurchaseHandler != nil {
|
if CurPurchaseHandler != nil {
|
||||||
jxutils.CallMsgHandler(func() {
|
jxutils.CallMsgHandler(func() {
|
||||||
response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg)
|
response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg)
|
||||||
globals.SugarLogger.Debugf("OnCallbackMsg response : %s", utils.Format4Output(response, false))
|
|
||||||
}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable))
|
}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable))
|
||||||
}
|
}
|
||||||
return response
|
return response
|
||||||
|
|||||||
@@ -214,6 +214,5 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *domain591.AlibabaAelophy
|
|||||||
orderFinancial.SelfDeliveryDiscountMoney = *result.SkuDiscountPlatformFee // 平台承担运费补贴(商家自送)+
|
orderFinancial.SelfDeliveryDiscountMoney = *result.SkuDiscountPlatformFee // 平台承担运费补贴(商家自送)+
|
||||||
orderFinancial.DistanceFreightMoney = 0
|
orderFinancial.DistanceFreightMoney = 0
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("orderFinancial===============: %s", utils.Format4Output(orderFinancial, false))
|
|
||||||
return orderFinancial
|
return orderFinancial
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,14 +156,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
|
|||||||
}
|
}
|
||||||
multiSkuMap[sku.SkuID]++
|
multiSkuMap[sku.SkuID]++
|
||||||
order.Skus = append(order.Skus, sku)
|
order.Skus = append(order.Skus, sku)
|
||||||
//salePrice += sku.SalePrice
|
|
||||||
//weight += sku.Weight
|
|
||||||
globals.SugarLogger.Debugf("=====skuPrice := %d", sku.SalePrice)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//order.SalePrice = salePrice
|
|
||||||
//order.Weight = weight
|
|
||||||
//globals.SugarLogger.Debugf("=====skuPrice := %d", salePrice)
|
|
||||||
|
|
||||||
// 淘宝默认自配送
|
// 淘宝默认自配送
|
||||||
if *orderDetail.DeliveryType == tao_vegetable.OrderDeliveryTypeTime {
|
if *orderDetail.DeliveryType == tao_vegetable.OrderDeliveryTypeTime {
|
||||||
@@ -514,7 +508,6 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param); err != nil {
|
if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param); err != nil {
|
||||||
globals.SugarLogger.Debugf("PickupGoods 拣货失败可能是BizSubOrderId 没填写 : %s", err.Error())
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
|
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
|
||||||
@@ -717,7 +710,6 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
|
|||||||
func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
|
func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
|
||||||
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
|
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("removedSkuList := %s", utils.Format4Output(removedSkuList, false))
|
|
||||||
// 获取需要退货商品的子订单id
|
// 获取需要退货商品的子订单id
|
||||||
refundSkuOrderID := make(map[int]*model.OrderSku, 0)
|
refundSkuOrderID := make(map[int]*model.OrderSku, 0)
|
||||||
for _, v := range removedSkuList {
|
for _, v := range removedSkuList {
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ func (c *PurchaseHandler) isAfsMsg(orderStatus string, orderId string, orderCall
|
|||||||
// RefundIds: &[]int64{utils.Str2Int64(success.BizSubRefundId)},
|
// RefundIds: &[]int64{utils.Str2Int64(success.BizSubRefundId)},
|
||||||
//}
|
//}
|
||||||
//refundAfs, _ := getAPI("", 0, success.StoreId).QueryAfsOrderDetail(param)
|
//refundAfs, _ := getAPI("", 0, success.StoreId).QueryAfsOrderDetail(param)
|
||||||
//globals.SugarLogger.Debugf("==============refundAfs.Orders : %s", utils.Format4Output(refundAfs.Orders != nil, false))
|
|
||||||
//if refundAfs.Orders != nil {
|
//if refundAfs.Orders != nil {
|
||||||
// return true
|
// return true
|
||||||
//}
|
//}
|
||||||
@@ -72,9 +71,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
var err error
|
var err error
|
||||||
var db = dao.GetDB()
|
var db = dao.GetDB()
|
||||||
orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg)
|
orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg)
|
||||||
globals.SugarLogger.Debugf("status := %s", status)
|
|
||||||
globals.SugarLogger.Debugf("orderStatus := %s", utils.Format4Output(orderStatus, false))
|
|
||||||
globals.SugarLogger.Debugf("scarceGoods := %s", utils.Format4Output(scarceGoods, false))
|
|
||||||
// 用户取消售后
|
// 用户取消售后
|
||||||
switch status {
|
switch status {
|
||||||
case tao_vegetable.OrderStatusApplyAfs:
|
case tao_vegetable.OrderStatusApplyAfs:
|
||||||
@@ -286,8 +282,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
//直接就来一个新的售后单,并且还是售后完成的
|
//直接就来一个新的售后单,并且还是售后完成的
|
||||||
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
||||||
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund
|
||||||
globals.SugarLogger.Debugf("==============onsaleRefund afsOrd: = %s", utils.Format4Output(afsOrder, false))
|
|
||||||
globals.SugarLogger.Debugf("==============onsaleRefund orderStatus: = %s", utils.Format4Output(orderStatus, false))
|
|
||||||
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
||||||
}
|
}
|
||||||
case tao_vegetable.OrderStatusRefundSuccess:
|
case tao_vegetable.OrderStatusRefundSuccess:
|
||||||
@@ -341,8 +335,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal
|
|||||||
|
|
||||||
afsOrder.SkuUserMoney += refundFee
|
afsOrder.SkuUserMoney += refundFee
|
||||||
afsOrder.RefundType = model.AfsTypePartRefund
|
afsOrder.RefundType = model.AfsTypePartRefund
|
||||||
globals.SugarLogger.Debugf("============OrderStatusRefundSuccess afsOrder: %s", utils.Format4Output(afsOrder, false))
|
|
||||||
globals.SugarLogger.Debugf("============OrderStatusRefundSuccess orderStatus: %s", utils.Format4Output(orderStatus, false))
|
|
||||||
if afsOrder != nil {
|
if afsOrder != nil {
|
||||||
//直接就来一个新的售后单,并且还是售后完成的
|
//直接就来一个新的售后单,并且还是售后完成的
|
||||||
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt
|
||||||
|
|||||||
@@ -41,19 +41,19 @@ var (
|
|||||||
func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
|
func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
|
||||||
switch funcID {
|
switch funcID {
|
||||||
case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice:
|
case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice:
|
||||||
batchSize = mtwmapi.MaxStoreSkuBatchSize
|
batchSize = 20
|
||||||
case partner.FuncDeleteStoreSkus:
|
case partner.FuncDeleteStoreSkus:
|
||||||
batchSize = mtwmapi.MaxBatchDeleteSize
|
batchSize = 20
|
||||||
case partner.FuncCreateStoreSkus:
|
case partner.FuncCreateStoreSkus:
|
||||||
batchSize = 1 // 可考虑用批量操作
|
batchSize = 20 // 可考虑用批量操作
|
||||||
case partner.FuncUpdateStoreSkus:
|
case partner.FuncUpdateStoreSkus:
|
||||||
batchSize = 1 // mtwmapi.MaxStoreSkuBatchSize
|
batchSize = 20 // mtwmapi.MaxStoreSkuBatchSize
|
||||||
case partner.FuncGetStoreSkusFullInfo:
|
case partner.FuncGetStoreSkusFullInfo:
|
||||||
batchSize = 1
|
batchSize = 20
|
||||||
case partner.FuncCreateActs:
|
case partner.FuncCreateActs:
|
||||||
batchSize = mtwmapi.MaxRetailDiscountCreateBatchSize
|
batchSize = 20
|
||||||
case partner.FuncCancelActs:
|
case partner.FuncCancelActs:
|
||||||
batchSize = mtwmapi.MaxRetailDiscountDeleteBatchSize
|
batchSize = 20
|
||||||
}
|
}
|
||||||
return batchSize
|
return batchSize
|
||||||
}
|
}
|
||||||
@@ -122,7 +122,6 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
|
|||||||
Code: utils.String2Pointer(utils.Int2Str(storeCat.StoreCatID)),
|
Code: utils.String2Pointer(utils.Int2Str(storeCat.StoreCatID)),
|
||||||
Name: &storeCat.StoreCatName,
|
Name: &storeCat.StoreCatName,
|
||||||
}})
|
}})
|
||||||
globals.SugarLogger.Debugf("CreateStoreCategory=====err := %v", err)
|
|
||||||
if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && storeCat.StoreCatName != "" { // 修改分类名,但分类不存在
|
if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && storeCat.StoreCatName != "" { // 修改分类名,但分类不存在
|
||||||
storeCat.CatSyncStatus |= model.SyncFlagNewMask
|
storeCat.CatSyncStatus |= model.SyncFlagNewMask
|
||||||
createCategory := &request.AlibabaWdkSkuCategoryAddRequest{Param: &domain.AlibabaWdkSkuCategoryAddCategoryDo{
|
createCategory := &request.AlibabaWdkSkuCategoryAddRequest{Param: &domain.AlibabaWdkSkuCategoryAddCategoryDo{
|
||||||
@@ -136,7 +135,6 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
|
|||||||
}
|
}
|
||||||
|
|
||||||
skuCode, err := api.AddStoreCategoryInfo(createCategory)
|
skuCode, err := api.AddStoreCategoryInfo(createCategory)
|
||||||
globals.SugarLogger.Debugf("AddStoreCategoryInfo=====err := %v", err)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -207,8 +205,6 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
|
|||||||
|
|
||||||
func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
||||||
failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false)
|
failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false)
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,13 +226,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
api := getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID)
|
api := getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID)
|
||||||
if isCreate {
|
if isCreate {
|
||||||
failedList, err = createTaoVegetable(ctx, api, storeSkuList, vendorStoreID, storeID, syncType)
|
failedList, err = createTaoVegetable(ctx, api, storeSkuList, vendorStoreID, storeID, syncType)
|
||||||
globals.SugarLogger.Debugf("创建淘鲜达商品异常:%v", err)
|
|
||||||
} else {
|
} else {
|
||||||
failedList, err = UpdateTaoVegetable(api, storeSkuList, vendorStoreID, storeID, syncType)
|
failedList, err = UpdateTaoVegetable(api, storeSkuList, vendorStoreID, storeID, syncType)
|
||||||
globals.SugarLogger.Debugf("更新淘鲜达商品异常:%v", err)
|
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -278,8 +270,6 @@ func UpdateTaoVegetable(api *tao_vegetable.API, storeSkuList []*dao.StoreSkuSync
|
|||||||
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -375,7 +365,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku
|
|||||||
if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || index+model.YES == totalCount {
|
if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || index+model.YES == totalCount {
|
||||||
createPram.ParamList = ¶m
|
createPram.ParamList = ¶m
|
||||||
result, err := api.AddStoreSku(createPram)
|
result, err := api.AddStoreSku(createPram)
|
||||||
globals.SugarLogger.Debugf("创建淘鲜达商品异常 result :%s", utils.Format4Output(result, false))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("创建淘鲜达商品异常:%s", err.Error())
|
globals.SugarLogger.Debugf("创建淘鲜达商品异常:%s", err.Error())
|
||||||
}
|
}
|
||||||
@@ -400,10 +389,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku
|
|||||||
}
|
}
|
||||||
failedListStock := updateStoreSkusStockByCreate(ctx, api, storeID, vendorStoreID, successSku)
|
failedListStock := updateStoreSkusStockByCreate(ctx, api, storeID, vendorStoreID, successSku)
|
||||||
failedList = append(failedList, failedListStock...)
|
failedList = append(failedList, failedListStock...)
|
||||||
globals.SugarLogger.Debugf("storeSkuList=====err := %s", utils.Format4Output(storeSkuList, false))
|
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", failedList)
|
|
||||||
return failedList, nil
|
return failedList, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -460,8 +445,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
|
|||||||
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
//param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{
|
//param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{
|
||||||
// StoreId: utils.String2Pointer(vendorStoreID),
|
// StoreId: utils.String2Pointer(vendorStoreID),
|
||||||
@@ -514,8 +497,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
|
|||||||
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -548,8 +529,6 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg
|
|||||||
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -619,8 +598,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
|
|||||||
param.BatchStockPublishDto = nil
|
param.BatchStockPublishDto = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", err)
|
|
||||||
globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", failedList)
|
|
||||||
return failedList, err
|
return failedList, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -505,7 +505,6 @@ func CreateFreightTemplate(storeCode, deliveryFeeDeductionSill int) (int64, erro
|
|||||||
//param.Columns = nil
|
//param.Columns = nil
|
||||||
param.Template.TemplateName += "固定运费模板"
|
param.Template.TemplateName += "固定运费模板"
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("创建运费模板")
|
|
||||||
if resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param); err != nil {
|
if resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param); err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -226,8 +226,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
} else if localThing[0].SyncStatus == model.ThingTypeSyncSuccess {
|
} else if localThing[0].SyncStatus == model.ThingTypeSyncSuccess {
|
||||||
// 主商品存在,直接同步子商品
|
// 主商品存在,直接同步子商品
|
||||||
childrenProductId, err := api.CreateSubProduct(utils.Str2Int64(localThing[0].VendorThingID), utils.Str2Int64(vendorStoreID))
|
childrenProductId, err := api.CreateSubProduct(utils.Str2Int64(localThing[0].VendorThingID), utils.Str2Int64(vendorStoreID))
|
||||||
globals.SugarLogger.Debugf("==========:%s", localThing[0].VendorThingID)
|
|
||||||
globals.SugarLogger.Debugf("==========:%v", err)
|
|
||||||
if err != nil && strings.Contains(err.Error(), "2010004") { // 2010004:主商品非在线审核通过状态,不允许绑定子商品
|
if err != nil && strings.Contains(err.Error(), "2010004") { // 2010004:主商品非在线审核通过状态,不允许绑定子商品
|
||||||
// 线上本地都存在,但是线上审核不成功,就去更新主商品
|
// 线上本地都存在,但是线上审核不成功,就去更新主商品
|
||||||
mainOrderDetail = loadMainProductId(api, storeSku, localThing[0].VendorThingID)
|
mainOrderDetail = loadMainProductId(api, storeSku, localThing[0].VendorThingID)
|
||||||
|
|||||||
@@ -295,7 +295,6 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
|
|||||||
}
|
}
|
||||||
//3.设置门店起送价 默认为0
|
//3.设置门店起送价 默认为0
|
||||||
if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil {
|
if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil {
|
||||||
//errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err))
|
|
||||||
globals.SugarLogger.Debugf("获取门店限售模板失败:%v", err)
|
globals.SugarLogger.Debugf("获取门店限售模板失败:%v", err)
|
||||||
} else {
|
} else {
|
||||||
if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建
|
if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建
|
||||||
|
|||||||
@@ -29,17 +29,14 @@ func (c *TaoBaoVegetableController) GetCode() {
|
|||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
body, err := ioutil.ReadAll(c.Ctx.Request.Body)
|
body, err := ioutil.ReadAll(c.Ctx.Request.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("商户收取code获取:%s,%s", string(body), err.Error())
|
|
||||||
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("商户收取code获取:%s", string(body))
|
|
||||||
codeData = string(body)
|
codeData = string(body)
|
||||||
} else {
|
} else {
|
||||||
codeData = c.Ctx.Input.Query("code")
|
codeData = c.Ctx.Input.Query("code")
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("code:%s", utils.Format4Output(codeData, false))
|
|
||||||
tokenInfo, err := api.TaoVegetableApi.GetStoreToken(codeData, "")
|
tokenInfo, err := api.TaoVegetableApi.GetStoreToken(codeData, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("获取门店token错误:%s", err.Error())
|
globals.SugarLogger.Debugf("获取门店token错误:%s", err.Error())
|
||||||
@@ -47,7 +44,6 @@ func (c *TaoBaoVegetableController) GetCode() {
|
|||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("token:%s", utils.Format4Output(tokenInfo, false))
|
|
||||||
|
|
||||||
// 创建或者更新账号token
|
// 创建或者更新账号token
|
||||||
param := &model.VendorOrgCode{
|
param := &model.VendorOrgCode{
|
||||||
@@ -137,7 +133,6 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
|
|||||||
globals.SugarLogger.Debugf("ApplyCancelOrder := %s", utils.Format4Output(afsOrder, false))
|
globals.SugarLogger.Debugf("ApplyCancelOrder := %s", utils.Format4Output(afsOrder, false))
|
||||||
globals.SugarLogger.Debugf("ApplyCancelOrder err := %s", utils.Format4Output(err, false))
|
globals.SugarLogger.Debugf("ApplyCancelOrder err := %s", utils.Format4Output(err, false))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("用户发起售后:%s", err.Error())
|
|
||||||
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
@@ -183,7 +178,6 @@ func (c *TaoBaoVegetableController) UserCancelRefund() {
|
|||||||
globals.SugarLogger.Debugf("UserCancelRefund := %s", utils.Format4Output(afsOrder, false))
|
globals.SugarLogger.Debugf("UserCancelRefund := %s", utils.Format4Output(afsOrder, false))
|
||||||
globals.SugarLogger.Debugf("UserCancelRefund err := %s", utils.Format4Output(err, false))
|
globals.SugarLogger.Debugf("UserCancelRefund err := %s", utils.Format4Output(err, false))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("用户取消售后:%s", err.Error())
|
|
||||||
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
@@ -229,7 +223,6 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() {
|
|||||||
globals.SugarLogger.Debugf("CancelOnSaleRefundOrder := %s", utils.Format4Output(afsOrder, false))
|
globals.SugarLogger.Debugf("CancelOnSaleRefundOrder := %s", utils.Format4Output(afsOrder, false))
|
||||||
globals.SugarLogger.Debugf("CancelOnSaleRefundOrder err := %s", utils.Format4Output(err, false))
|
globals.SugarLogger.Debugf("CancelOnSaleRefundOrder err := %s", utils.Format4Output(err, false))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("用户售中取消:%s", err.Error())
|
|
||||||
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
@@ -274,7 +267,6 @@ func (c *TaoBaoVegetableController) RefundOrderSuccess() {
|
|||||||
globals.SugarLogger.Debugf("RefundOrderSuccess := %s", utils.Format4Output(refundSuccess, false))
|
globals.SugarLogger.Debugf("RefundOrderSuccess := %s", utils.Format4Output(refundSuccess, false))
|
||||||
globals.SugarLogger.Debugf("RefundOrderSuccess err := %s", utils.Format4Output(err, false))
|
globals.SugarLogger.Debugf("RefundOrderSuccess err := %s", utils.Format4Output(err, false))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("用户售后成功消息通知:%s", err.Error())
|
|
||||||
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
c.Data["json"] = tao_vegetable.CallBackResultInfo(err)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user