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:
邹宗楠
2022-10-13 09:51:16 +08:00
parent 72079a6ba3
commit 1133dd5acc
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
business/partner/purchase/tiktok_store/order.go
View File

@@ -75,22 +75,19 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, orderMap *order_orderDetail_response.ShopOrderDetail, err error) {
// 平台获取订单详情
result, err := getAPI(vendorOrgCode, 0, vendorStoreID).GetTiktokOrderDetail(vendorOrderID)
api := getAPI(vendorOrgCode, 0, vendorStoreID)
result, err := api.GetTiktokOrderDetail(vendorOrderID)
if err != nil {
return nil, nil, err
}
globals.SugarLogger.Debugf("======orderDetail:%s", utils.Format4Output(result, false))
orderMap = result
order = &model.GoodsOrder{
VendorOrderID: result.OrderId,
VendorID: model.VendorIDDD,
VendorStoreID: "",
StoreID: 0,
StoreName: result.ShopName,
ConsigneeName: result.MaskPostReceiver,
ConsigneeMobile: result.MaskPostTel,
ConsigneeAddress: result.MaskPostAddr.Detail,
VendorOrderID: result.OrderId,
VendorID: model.VendorIDDD,
VendorStoreID: "",
StoreID: 0,
CoordinateType: model.CoordinateTypeMars,
BuyerComment: result.BuyerWords,
ExpectedDeliveredTime: getTimeFromTimestamp(utils.Interface2Int64WithDefault(result.TargetArrivalTime, 0)),
@@ -128,7 +125,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat)
order.DiscountMoney = result.PromotionAmount
vendorStoreIdRelly := ""
vendorStoreIdRelly := "" // 门店id
vendorNameRelly := "" // 门店id
// 添加需要赠送的东西(暂时没有赠品套餐直接商品)
multiSkuMap := make(map[int]int)
if len(result.SkuOrderList) > 0 {
@@ -171,9 +169,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
multiSkuMap[sku.SkuID]++
order.Skus = append(order.Skus, sku)
vendorStoreIdRelly = extra.StoreInfo.StoreId
vendorNameRelly = extra.StoreInfo.StoreName
}
}
// 预订单还是快速达
localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
if err != nil {
return nil, nil, err
@@ -192,9 +192,18 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
}
// 用户保密信息脱敏
// ConsigneeName: result.MaskPostReceiver,
// ConsigneeMobile: result.MaskPostTel,
// ConsigneeAddress: result.MaskPostAddr.Detail,
name, tel, address, _ := api.OrderUserInfoDecrypt(vendorOrderID, result.EncryptPostReceiver, result.EncryptPostTel, result.PostAddr.EncryptDetail)
order.ConsigneeName = name
order.ConsigneeMobile = tel
order.ConsigneeAddress = fmt.Sprintf("%s%s%s%s%s", result.PostAddr.Province.Name, result.PostAddr.City.Name, result.PostAddr.Town.Name, result.PostAddr.Street.Name, address)
order.JxStoreID = localStore.ID
order.StoreID = localStore.ID
order.VendorStoreID = vendorStoreIdRelly
order.VendorStoreID = vendorStoreIdRelly // 真实门店id
order.StoreName = vendorNameRelly // 真实门店名称
order.PmSubsidyMoney = result.PromotionAmount // 美团记录订单优惠总金额
for _, v := range order.Skus {
if multiSkuMap[v.SkuID] > 1 && v.SalePrice == v.VendorPrice {
@@ -207,7 +216,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
// GetOrderRider 商家自配送同步配送信息
func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) {
return nil
return getAPI(vendorOrgCode, 0, vendorStoreID).OrderStatusAndPsInfo(param)
}
func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) {

3
business/partner/purchase/tiktok_store/store_sku2.go
View File

@@ -283,6 +283,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
PickupMethod: "0",
OuterProductId: utils.Int2Str(storeSku.SkuID), // 本地skuId为外部商品id
}
globals.SugarLogger.Debugf("====OuterProductId====%d", storeSku.SkuID)
globals.SugarLogger.Debugf("====OuterProductId====%d", storeSku.ID)
globals.SugarLogger.Debugf("====OuterProductId====%s", utils.Format4Output(storeSku, false))
// param.AccountTemplateId = ""
// 获取上传图,商品轮播图
img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5)

2
business/partner/purchase/tiktok_store/store_sku2_utils.go
View File

@@ -124,7 +124,7 @@ func GetSpecPrices(specs, storeId string, mainSkuId int64, localSku *dao.StoreSk
Code: utils.Int2Str(localSku.SkuID),
StepStockNum: 0,
SupplierID: "",
OuterSkuID: utils.Int2Str(localSku.NameID),
OuterSkuID: utils.Int2Str(localSku.SkuID),
DeliveryInfos: []*tiktokShop.DeliveryInfos{
{InfoType: "weight", InfoUnit: localSku.SpecUnit, InfoValue: fmt.Sprintf("%f", localSku.SpecQuality)},
},