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-11-09 15:44:04 +08:00
parent af6533fd9b
commit e42d99b8b8
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/thing_map.go
View File

@@ -37,6 +37,10 @@ func CreateThingMap(thingId int64, vendorThingID, appOrgCode, skuAttrId string)
Remark: skuAttrId, Remark: skuAttrId,
SyncStatus: 0, SyncStatus: 0,
} }
// 正常来说这个skuAttrId 不应该为空
if skuAttrId == "" {
thingMap.Remark = "这个值不应该为空才对"
}
WrapAddIDCULDEntity(thingMap, "jxadmin") WrapAddIDCULDEntity(thingMap, "jxadmin")
return CreateEntity(GetDB(), thingMap) return CreateEntity(GetDB(), thingMap)

8
business/partner/delivery/rider.go
View File

@@ -171,8 +171,6 @@ func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
riderInfo.LogisticsStatus = 40 riderInfo.LogisticsStatus = 40
riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED
case 115: // 取消 case 115: // 取消
riderInfo.CourierName = ""
riderInfo.CourierPhone = ""
riderInfo.LogisticsStatus = 100 riderInfo.LogisticsStatus = 100
riderInfo.OpCode = tiktok_api.TiktokLogisticsCANCELDELIVERY riderInfo.OpCode = tiktok_api.TiktokLogisticsCANCELDELIVERY
case 22, 0, 120: // 异常配送 case 22, 0, 120: // 异常配送
@@ -181,14 +179,14 @@ func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
} }
if riderInfo.CourierPhone == "" { if riderInfo.CourierPhone == "" {
riderInfo.CourierPhone = "18981810000" riderInfo.CourierPhone = " 暂无电话 "
} }
if riderInfo.CourierName == "" { if riderInfo.CourierName == "" {
riderInfo.CourierName = "暂无" riderInfo.CourierName = " 暂无骑手 "
} }
if riderInfo.LogisticsStatus != 22 && riderInfo.LogisticsStatus != 120 && riderInfo.LogisticsStatus != 0 { if riderInfo.LogisticsStatus != 22 && riderInfo.LogisticsStatus != 120 && riderInfo.LogisticsStatus != 0 {
riderInfo.LogisticsContext += fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone)
} }
// 呼叫骑手的时候推送发货 // 呼叫骑手的时候推送发货

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

@@ -281,17 +281,17 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
api := getAPI(vendorOrgCode, storeID, vendorStoreID) api := getAPI(vendorOrgCode, storeID, vendorStoreID)
for _, v := range storeSkuList { for _, v := range storeSkuList {
// 更新主品 // 更新主品 (暂不支持渠道主商品)
err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{ //err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{
Price: v.VendorPrice, // Price: v.VendorPrice,
SkuId: utils.Str2Int64(v.VendorSkuAttrId), // SkuId: utils.Str2Int64(v.VendorSkuAttrId),
ProductId: utils.Str2Int64(v.VendorMainId), // ProductId: utils.Str2Int64(v.VendorMainId),
}) //})
if err != nil { //if err != nil {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格异常")...) // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格异常")...)
} else { //} else {
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格正常")...) // failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新主品价格正常")...)
} //}
// 更新子品 // 更新子品
err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{ err = api.EditPrice(&sku_editPrice_request.SkuEditPriceParam{