From 65d9055762ba68d8b031e88b8e4121960401f0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Oct 2022 17:49:19 +0800 Subject: [PATCH 1/3] 1 --- business/model/const.go | 1 + business/model/dao/dao_order.go | 5 +++-- business/partner/delivery/rider.go | 16 ++++++++++++---- business/partner/purchase/tiktok_store/order.go | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/business/model/const.go b/business/model/const.go index 6ea8ef303..40a5d2608 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -151,6 +151,7 @@ var ( VendorIDMTWM: 0, VendorIDELM: 0, VendorIDEBAI: 0, + VendorIDDD: 0, } ZXCityCodeMap = map[int]string{ diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 62f4df89d..d839942ff 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1382,10 +1382,11 @@ func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goo } func GetWaybills(db *DaoDB, vendorOrderID string) (waybills []*model.Waybill, err error) { - sql := `SELECT * + sql := ` SELECT * FROM waybill - WHERE vendor_order_id = ? + WHERE vendor_order_id = ? ORDER BY waybill_created_at asc ` + sqlParams := []interface{}{vendorOrderID} err = GetRows(db, &waybills, sql, sqlParams) return waybills, err diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index e83496405..e87bc8cef 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -77,16 +77,16 @@ func GetOrderRiderInfoToPlatform(orderId string) { switch riderInfo.LogisticsStatus { case 20: //配送中 riderInfo.LogisticsStatus = 20 - riderInfo.LogisticsContext = `正在配送中` + //riderInfo.LogisticsContext = `正在配送中` case 110: // 完成 riderInfo.LogisticsStatus = 40 - riderInfo.LogisticsContext = `配送完成` + //riderInfo.LogisticsContext = `配送完成` case 105: // 完成 riderInfo.LogisticsStatus = 40 - riderInfo.LogisticsContext = `被取消` + //riderInfo.LogisticsContext = `被取消` case 115: // 取消 riderInfo.LogisticsStatus = 100 - riderInfo.LogisticsContext = `被取消` + //riderInfo.LogisticsContext = `被取消` default: continue } @@ -114,6 +114,14 @@ func GetOrderRiderInfoToPlatform(orderId string) { case model.VendorIDJDShop: // 京东商城 case model.VendorIDWSC: // 微盟微商城 case model.VendorIDDD: // 抖店小时达 + globals.SugarLogger.Debugf("riderInfo Order========:%s", utils.Format4Output(riderInfo, false)) + // 抖店由于发配送时运单id已经固定了,我们系统在重新发货,或者运单号发生改变时去推送信息时.抖店只识别第一个运单号所以在这儿修改成发单时的第一个运单号! + wayBillList, err := dao.GetWaybills(dao.GetDB(), riderInfo.OrderId) + if err != nil || len(wayBillList) == 0 { + globals.SugarLogger.Errorf("Get WayBill List err := %s", err) + continue + } + riderInfo.ThirdCarrierOrderId = wayBillList[0].VendorWaybillID paramsMap := utils.Struct2Map(riderInfo, "", true) if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil { diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index cca759f84..d11839f2b 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -143,7 +143,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s SkuID: utils.Str2Int(extra.OutSkuId), JxSkuID: utils.Str2Int(extra.OutSkuId), SkuName: extra.ProductName, - ShopPrice: 0, + ShopPrice: extra.OriginAmount, VendorPrice: extra.OrderAmount / extra.ItemNum, SalePrice: extra.OriginAmount, EarningPrice: 0, From 059d83f41e5fa1b75a0af0f70725a9090e46b00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Oct 2022 17:55:44 +0800 Subject: [PATCH 2/3] 1 --- business/jxstore/cms/store_sku.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 421daff35..8c622dd5f 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1152,6 +1152,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str if isHighPrice || priceType != 0 { sql += " , t4.unit_price DESC LIMIT 99" } + globals.SugarLogger.Debugf("==========slq := %s", sql) + globals.SugarLogger.Debugf("==========param := %s", utils.Format4Output(params, false)) var tmpList []*tGetStoresSkusInfo if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil { dao.Rollback(db, txDB) From 2de52008ba7edc95da857d6a3cc5fce2120d11c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 31 Oct 2022 17:58:43 +0800 Subject: [PATCH 3/3] 1' --- business/jxstore/cms/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 8c622dd5f..31d87decb 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -1153,7 +1153,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []str sql += " , t4.unit_price DESC LIMIT 99" } globals.SugarLogger.Debugf("==========slq := %s", sql) - globals.SugarLogger.Debugf("==========param := %s", utils.Format4Output(params, false)) + globals.SugarLogger.Debugf("==========sqlParams := %s", utils.Format4Output(sqlParams, false)) var tmpList []*tGetStoresSkusInfo if err = dao.GetRowsTx(txDB, &tmpList, sql, sqlParams...); err != nil { dao.Rollback(db, txDB)