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

1

Browse Source
This commit is contained in:
邹宗楠
2023-07-10 10:11:19 +08:00
parent 4a489cb297
commit 412ef88bbd
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/sync_store_sku.go
View File

@@ -78,6 +78,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
case "dev": case "dev":
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469) totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668469)
case "jxgy": case "jxgy":
default: default:
totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594) totalCategory, _ = dao.GetDetailStoreSkuCategoryMap(db, 668594)
} }

43
business/partner/purchase/tao_vegetable/order.go
View File

@@ -494,8 +494,8 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// PickupGoods 拣货 // PickupGoods 拣货
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
globals.SugarLogger.Debugf("PickupGoods 自动拣货:%s, %s", utils.Format4Output(isSelfDelivery, false), utils.Format4Output(order, false)) store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "")
if isSelfDelivery { if isSelfDelivery && store.AutoPickup == model.YES {
param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
if err != nil { if err != nil {
return err return err
@@ -504,9 +504,8 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
globals.SugarLogger.Debugf("PickupGoods 拣货失败可能是BizSubOrderId 没填写 : %s", err.Error()) 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)
}
return err return err
} }
@@ -693,26 +692,30 @@ func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.Goods
} }
// 获取订单的子订单id // 获取订单的子订单id
requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{ //requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
StoreId: utils.String2Pointer(order.VendorStoreID), // StoreId: utils.String2Pointer(order.VendorStoreID),
BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)), // BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
}} //}}
orderDetail, err := api.QueryOrderDetail(requestParam) //orderDetail, err := api.QueryOrderDetail(requestParam)
if err != nil { //if err != nil {
return err // return err
} //}
//
skuMap := make(map[string]string, 0) //skuMap := make(map[string]string, 0)
for _, v := range *orderDetail.SubOrderResponseList { //for _, v := range *orderDetail.SubOrderResponseList {
skuMap[*v.SkuCode] = *v.OutSubOrderId // skuMap[*v.SkuCode] = *v.OutSubOrderId
} //}
// 获取需要退货商品的子订单id // 获取需要退货商品的子订单id
refundSkuOrderID := make([]string, 0, len(removedSkuList)) refundSkuOrderID := make([]string, 0, len(removedSkuList))
//for _, v := range removedSkuList {
// if orderId, ok := skuMap[v.VendorSkuID]; ok {
// refundSkuOrderID = append(refundSkuOrderID, orderId)
// }
//}
for _, v := range removedSkuList { for _, v := range removedSkuList {
if orderId, ok := skuMap[v.VendorSkuID]; ok { refundSkuOrderID = append(refundSkuOrderID, v.VendorSubOrderID)
refundSkuOrderID = append(refundSkuOrderID, orderId)
}
} }
// 商家申请退货 // 商家申请退货