From 44a738be66cd14c8f077d16258d732dc7405b011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 10:52:26 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81?= =?UTF-8?q?=E8=B4=B9=E6=94=B6=E5=8F=96=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 36 +++++++------- business/partner/delivery/dada/waybill.go | 52 ++++++++++++++++---- business/partner/delivery/fn/waybill.go | 45 +++++++++++++++-- business/partner/delivery/mtps/waybill.go | 46 +++++++++-------- 4 files changed, 126 insertions(+), 53 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index b2167f1e9..48e9b268b 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -712,24 +712,6 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string, return result, nil } -// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态 -func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) { - sql := `SELECT * - FROM order_status t1 - WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?` - sqlParams := []interface{}{ - LogisticsId, - orderId, - vendorId, - } - sql += ` ORDER BY status_time ASC ` - var result []*model.OrderStatus - if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil { - return nil, err - } - return result, nil -} - // GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) { sql := ` @@ -1718,3 +1700,21 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst } return isFirst, err } + +// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态 +func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) { + sql := `SELECT * + FROM order_status t1 + WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?` + sqlParams := []interface{}{ + LogisticsId, + orderId, + vendorId, + } + sql += ` ORDER BY status_time ASC ` + var result []*model.OrderStatus + if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil { + return nil, err + } + return result, nil +} diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 26c15e428..ff512bca7 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "time" "git.rosy.net.cn/baseapi/platformapi/dadaapi" @@ -546,14 +547,48 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso // 待接单,待取货(小于一分钟,大于十五分钟)不扣钱 // 待取货1-15分钟内取消扣两元 func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId string) (money int64, err error) { + orderStatus, err := orderman.FixedOrderManager.GetWayBillStatusList(orderId, deliverId, model.VendorIDDada) + if err != nil { + return 0, err + } + dadaOrder, err := api.DadaAPI.QueryOrderInfo(orderId) if err != nil { return 0, err } + // 本地状态兑换金额 + var localPrice int64 = 0 + for i := len(orderStatus) - 1; i >= 0; i-- { + if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusCanceled) { + continue + } + if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusFinished) || orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusDelivering) || orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusReturningInOrder) { + localPrice = utils.Float64TwoInt64(dadaOrder.DeliveryFee * float64(100)) + break + } + if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusAccepted) { + nowTime := time.Now().Unix() + fetchTime := orderStatus[i].StatusTime.Unix() + timeDiffer := nowTime - fetchTime + if timeDiffer > 15*60 || timeDiffer < 60 { + localPrice = 0 + } else { + localPrice = 200 + } + break + } + if orderStatus[i].VendorStatus == utils.Int2Str(dadaapi.OrderStatusWaitingForAccept) { + localPrice = 0 + break + } + } + + // 平台状态兑换金额 + var vendorPrice int64 = 0 // 未接单不扣款 if dadaOrder.AcceptTime == "" { - return 0, nil + vendorPrice = 0 } // 有了接单时间,订单变成了待取货 @@ -562,20 +597,19 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId fetchTime := utils.Str2Time(dadaOrder.AcceptTime).Unix() timeDiffer := nowTime - fetchTime if timeDiffer > 15*60 || timeDiffer < 60 { - return 0, nil + vendorPrice = 0 } - return 200, nil + vendorPrice = 200 } // fetchTime 已经有时间了,代表已经取货.次数取消扣除此订单全部金额 // 达达存在多个订单的运单违约金额统计在一起的情况 if dadaOrder.FetchTime != "" { - bill, err := partner.CurOrderManager.LoadWaybill(deliverId, model.VendorIDDada) - if err != nil { - return 0, err - } - return bill.DesiredFee, nil + vendorPrice = utils.Float64TwoInt64(dadaOrder.DeliveryFee * float64(100)) } - return 0, err + if localPrice > vendorPrice { + return localPrice, nil + } + return vendorPrice, nil } diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 6ccc9bf1b..bb8e47379 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -4,6 +4,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "strings" "time" @@ -415,16 +416,49 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId return 0, err } + // 本地状态兑换金额 + var localPrice int64 = 0 + orderStatus, err := orderman.FixedOrderManager.GetWayBillStatusList(orderId, deliverId, model.VendorIDFengNiao) + if err != nil { + return 0, err + } + for i := len(orderStatus) - 1; i >= 0; i-- { + if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAcceptCacle) { + continue + } + if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusArrived) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusDelivering) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusDelivered) { + localPrice = order.OrderTotalAmountCent + break + } + if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAssigned) { + nowTime := time.Now().Unix() + fetchTime := orderStatus[i].StatusTime.Unix() + timeDiffer := nowTime - fetchTime + if timeDiffer > 15*60 || timeDiffer < 60 { + localPrice = 0 + } else { + localPrice = 200 + } + break + } + if orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAcceptCreate) || orderStatus[i].VendorStatus == utils.Int2Str(fnpsapi.OrderStatusAccept) { + localPrice = 0 + break + } + } + // 已经分配骑手,且超过十五分钟,不扣款 + var vendorPrice int64 = 0 if len(order.EventLogDetails) != model.NO { for i := len(order.EventLogDetails) - 1; i >= 0; i-- { switch order.EventLogDetails[i].OrderStatus { case fnpsapi.OrderStatusDelivered, fnpsapi.OrderStatusArrived, fnpsapi.OrderStatusDelivering: // 送达,到店,配送中 取消订单全额扣款 - return order.OrderTotalAmountCent, nil + vendorPrice = order.OrderTotalAmountCent + break case fnpsapi.OrderStatusAcceptCacle, fnpsapi.OrderStatusException: // 取消和异常状态,跳过查看上一状态 continue case fnpsapi.OrderStatusAcceptCreate, fnpsapi.OrderStatusAccept: // 生成运单和系统接单取消不扣除费用 - return 0, nil + vendorPrice = 0 case fnpsapi.OrderStatusAssigned: if time.Now().UnixNano()/1e6-order.EventLogDetails[i].OccurTime > fnpsapi.WayBillPressureOrderTime { return 0, nil @@ -433,8 +467,9 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } } } - } - - return 0, err + if localPrice > vendorPrice { + return localPrice, nil + } + return vendorPrice, nil } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 364dabddc..2f3f662b0 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -493,29 +493,33 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId return 0, err } + bill, err := partner.CurOrderManager.LoadWaybill(deliverId, model.VendorIDMTPS) + if err != nil { + return 0, err + } + // 已经分配骑手,且超过十五分钟,不扣款 - if len(statusList) != model.NO { - for i := len(statusList) - 1; i >= 0; i-- { - switch statusList[i].VendorStatus { - case utils.Int2Str(mtpsapi.OrderStatusWaitingForSchedule): // 待调度 - return 0, nil - case utils.Int2Str(mtpsapi.OrderStatusCanceled): // 取消不管 - continue - case utils.Int2Str(mtpsapi.OrderStatusDeliverred): // 送达 - continue - case utils.Int2Str(mtpsapi.OrderStatusAccepted): // 接单 - // 接单取消扣凉快 - return 200, nil - case utils.Int2Str(mtpsapi.OrderStatusPickedUp): // 取货 - bill, err := partner.CurOrderManager.LoadWaybill(deliverId, model.VendorIDMTPS) - if err != nil { - return 0, err - } - return bill.DesiredFee, nil - - } + for i := len(statusList) - 1; i >= 0; i-- { + // 取消不管 + if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusCanceled) { + continue + } + // 送达 + if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusDeliverred) { + return bill.DesiredFee, nil + } + // 到店 + if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusPickedUp) { + return bill.DesiredFee, nil + } + // 接单 + if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusAccepted) { + return 200, nil + } + // 待调度 + if statusList[i].VendorStatus == utils.Int2Str(mtpsapi.OrderStatusWaitingForSchedule) { + return 0, nil } - } return 0, err } From d8714def741f70e6bb4946447953a893deb13de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 11:59:23 +0800 Subject: [PATCH 02/18] 1 --- business/jxcallback/orderman/orderman_ext.go | 37 ++++++++------------ business/partner/delivery/dada/waybill.go | 11 ++++++ business/partner/purchase/jdshop/callback.go | 5 ++- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 48e9b268b..8051da777 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -712,29 +712,22 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string, return result, nil } -// GetOrderStatusList2 查询订单流程 refVendorOrderID 订单Id -func GetOrderStatusList2(refVendorOrderID string, wayBillId string, orderType int, vendorID int) (statusList []*model.OrderStatus, err error) { - sql := ` - SELECT * +// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态 +func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) { + sql := `SELECT * FROM order_status t1 - WHERE t1.ref_vendor_order_id = ? AND t1.vendor_order_id = ? AND t1.vendor_id = ? - ` + WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?` sqlParams := []interface{}{ - refVendorOrderID, - wayBillId, - vendorID, + LogisticsId, + orderId, + vendorId, } - if orderType > 0 { - sql += " AND t1.order_type = ?" - sqlParams = append(sqlParams, orderType) - } - sql += " ORDER BY t1.status_time, t1.order_type DESC, t1.status" - - db := dao.GetDB() - if err = dao.GetRows(db, &statusList, sql, sqlParams...); err != nil { + sql += ` ORDER BY status_time ASC ` + var result []*model.OrderStatus + if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil { return nil, err } - return statusList, nil + return result, nil } // GetOrderStatusCancelList 取消订单 @@ -1701,15 +1694,15 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst return isFirst, err } -// GetWayBillStatusList 根据订单号和物流号查询运单的变化状态 -func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) { +// GetWaybillStatusList 查询订单的运单记录 +func (c *OrderManager) GetWaybillStatusList(orderId, waybillID string, waybillVendorId int) ([]*model.OrderStatus, error) { sql := `SELECT * FROM order_status t1 WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?` sqlParams := []interface{}{ - LogisticsId, + waybillID, orderId, - vendorId, + waybillVendorId, } sql += ` ORDER BY status_time ASC ` var result []*model.OrderStatus diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index ff512bca7..291892ad8 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -43,6 +43,17 @@ var ( "虞山街道": "虞山镇", "常福街道": "虞山镇", } + complaintReasonsMap = map[int]string{ + 1: "骑手态度恶劣", + 2: "骑手接单后未取货", + 3: "骑手取货太慢", + 4: "骑手送货太慢", + 5: "货品未送达", + 6: "货品有损坏", + 7: "骑手违规收取顾客其他费用", + 69: "骑手恶意取消订单", + 71: "骑手提前点击取货/送达", + } ) type DeliveryHandler struct { diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 5c0a43374..696fb067d 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -5,14 +5,13 @@ import ( "encoding/base64" "encoding/hex" "encoding/json" + "errors" "fmt" "math" "strings" "time" "git.rosy.net.cn/jx-callback/business/authz/autils" - "git.rosy.net.cn/jx-callback/business/partner/delivery/dada" - "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" beego "github.com/astaxie/beego/server/web" @@ -476,7 +475,7 @@ func getDataCityCodeFromOrder(order *model.GoodsOrder, db *dao.DaoDB) (retVal st }{} if err = dao.GetRow(db, codeInfo, sql, jxStoreID); err != nil { if err == nil { - err = dada.ErrCanNotFindDadaCityCode + err = errors.New("不能找到美团配送站点配置") } return "", err } From 0e3c4ab7fa28c1450f0fbfca84097bf17450ea6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 16:07:39 +0800 Subject: [PATCH 03/18] 1 --- business/jxstore/cms/store.go | 27 ++++++++++++++++++++++- business/jxstore/misc/misc.go | 8 ++++++- business/partner/delivery/mtps/store.go | 17 +++++++++----- business/partner/delivery/mtps/waybill.go | 11 +++++++++ 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8d0953306..5c9663323 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/jx-callback/business/partner/delivery/mtps" "io" "math" "mime/multipart" @@ -2215,6 +2216,24 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { return errList.GetErrListAsOne() } +func UpdateStoreName() error { + var db = dao.GetDB() + sql := ` SELECT * FROM store_courier_map WHERE vendor_id = ? AND deleted_at = ?` + data := make([]*model.StoreCourierMap, 0, 0) + if err := dao.GetRows(db, data, sql, []interface{}{model.VendorIDMTPS, utils.DefaultTimeValue}...); err != nil { + globals.SugarLogger.Debugf("query Order err := %v", err) + return err + } + for _, v := range data { + storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS) + formalizeStore4Courier(storeDetail) + err := mtps.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name) + globals.SugarLogger.Debug("err := %v", err) + } + + return nil +} + // ====================================第三方店铺创建============================= func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (isCreated bool, err error) { globals.SugarLogger.Debugf("updateOrCreateCourierStore %s, storeID:%d, vendorStoreID:%s", model.VendorChineseNames[storeDetail.VendorID], storeDetail.ID, storeDetail.VendorStoreID) @@ -2329,7 +2348,13 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd } func formalizeStore4Courier(storeDetail *dao.StoreDetail2) *dao.StoreDetail2 { - storeDetail.Name = fmt.Sprintf("%s-%s-%s", model.ShopChineseNames[model.VendorIDJD], storeDetail.CityName, storeDetail.Name) + // 获取品牌名称 + brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") + if err != nil { + return nil + } + + storeDetail.Name = fmt.Sprintf("%s-%s-%s", brandInfo[0].Name, storeDetail.CityName, storeDetail.Name) if storeDetail.PayeeName == "" { storeDetail.PayeeName = "店主" } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index a850c0968..50fa96fad 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -221,13 +221,19 @@ func Init() { "04:00:00", }) - // 每天更新美团门当的结算信息和配送费等等 + // 每天更新美团-门店结算方式[结算给企业/结算给个人] ScheduleTimerFunc("LoadingStoreOrderSettleAmount", func() { delivery.LoadingStoreOrderSettleAmount(0, 0, nil) }, []string{ "19:50:00", }) + ScheduleTimerFunc("UpdateStoreName ", func() { + cms.UpdateStoreName() + }, []string{ + "16:12:00", + }) + // 定时任务更新昨天的都要商品和本地商品id的映射关系 //ScheduleTimerFunc("RefreshStoreOperator", func() { // t := time.Now() diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index ee5563e07..485d4c036 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -71,12 +71,7 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S if shopInfo.ShopLat <= 9999999 { shopInfo.ShopLat *= 10 } - // 获取品牌名称 - brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") - if err != nil { - return "", -1, err - } - shopInfo.ShopName = brandInfo[0].Name + "-" + storeDetail.Name + if globals.EnableStoreWrite { shopStatus, err = api.MtpsAPI.ShopCreate(shopInfo) if err == nil { @@ -187,3 +182,13 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S } return err } + +// 美团配送,修改门店名称 +func UpdateStoreName(storeId, name string) (err error) { + shopInfo := &mtpsapi.ShopInfo{ + ShopID: storeId, + ShopName: name, + } + _, err = api.MtpsAPI.ShopUpdate(shopInfo) + return err +} diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 2f3f662b0..5601bafd8 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -86,6 +86,17 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) { order := c.callbackMsg2Waybill(msg) + // 多次取消,只处理第一次 + if msg.Status == mtpsapi.OrderStatusCanceled { + bill, err := partner.CurOrderManager.LoadWaybill(msg.MtPeisongID, model.VendorIDMTPS) + if err != nil { + return mtpsapi.Err2CallbackResponse(err, fmt.Sprintf("%s", "获取订单状态错误")) + } + if bill.Status == model.OrderStatusCanceled { + return mtpsapi.SuccessResponse + } + } + switch msg.Status { case mtpsapi.OrderStatusWaitingForSchedule: data, err := api.MtpsAPI.QueryOrderStatus(msg.DeliveryID, msg.MtPeisongID) From 5d6cef4976d31f48fb971f28465dcd55b9b58061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 16:17:17 +0800 Subject: [PATCH 04/18] 1 --- business/jxstore/cms/store.go | 2 +- business/jxstore/misc/misc.go | 2 +- main.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5c9663323..51d6a965c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2220,7 +2220,7 @@ func UpdateStoreName() error { var db = dao.GetDB() sql := ` SELECT * FROM store_courier_map WHERE vendor_id = ? AND deleted_at = ?` data := make([]*model.StoreCourierMap, 0, 0) - if err := dao.GetRows(db, data, sql, []interface{}{model.VendorIDMTPS, utils.DefaultTimeValue}...); err != nil { + if err := dao.GetRows(db, &data, sql, []interface{}{model.VendorIDMTPS, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 50fa96fad..ff907ccde 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "16:12:00", + "16:20:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 diff --git a/main.go b/main.go index 8bbdc397b..3276adf0b 100644 --- a/main.go +++ b/main.go @@ -164,12 +164,12 @@ func main() { return } - //if web.BConfig.RunMode != "jxgy" { - if err := tasks.RefreshFnToken(); err != nil { - globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err) - return + if web.BConfig.RunMode != "jxgy" { + if err := tasks.RefreshFnToken(); err != nil { + globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err) + return + } } - //} if err := tasks.RefreshQywxToken(); err != nil { globals.SugarLogger.Errorf("RefreshQywxToken failed with error:%s", err) return From cdf68b6501acc340aa6934495ca7adb4db4b3f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 16:28:56 +0800 Subject: [PATCH 05/18] 1 --- business/jxstore/cms/store.go | 4 ++-- business/jxstore/misc/misc.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 51d6a965c..29b90e198 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2228,7 +2228,7 @@ func UpdateStoreName() error { storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS) formalizeStore4Courier(storeDetail) err := mtps.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name) - globals.SugarLogger.Debug("err := %v", err) + globals.SugarLogger.Debug("err := %v,storeID : %d,storeName :%s", err, v.VendorStoreID, storeDetail.Name) } return nil @@ -2354,7 +2354,7 @@ func formalizeStore4Courier(storeDetail *dao.StoreDetail2) *dao.StoreDetail2 { return nil } - storeDetail.Name = fmt.Sprintf("%s-%s-%s", brandInfo[0].Name, storeDetail.CityName, storeDetail.Name) + storeDetail.Name = fmt.Sprintf("%s-%s-%s", strings.TrimSpace(brandInfo[0].Name), strings.TrimSpace(storeDetail.CityName), strings.TrimSpace(storeDetail.Name)) if storeDetail.PayeeName == "" { storeDetail.PayeeName = "店主" } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index ff907ccde..c3ea89d09 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "16:20:00", + "16:31:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From c3c7556a9c098a7398b172d6780f519d462dcf83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 16:44:01 +0800 Subject: [PATCH 06/18] 1' --- business/jxstore/cms/store.go | 2 +- business/jxstore/misc/misc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 29b90e198..d09a95482 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2354,7 +2354,7 @@ func formalizeStore4Courier(storeDetail *dao.StoreDetail2) *dao.StoreDetail2 { return nil } - storeDetail.Name = fmt.Sprintf("%s-%s-%s", strings.TrimSpace(brandInfo[0].Name), strings.TrimSpace(storeDetail.CityName), strings.TrimSpace(storeDetail.Name)) + storeDetail.Name = fmt.Sprintf("%s-%s-%s", strings.ReplaceAll(brandInfo[0].Name, " ", ""), strings.ReplaceAll(storeDetail.CityName, " ", ""), strings.ReplaceAll(storeDetail.Name, " ", "")) if storeDetail.PayeeName == "" { storeDetail.PayeeName = "店主" } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index c3ea89d09..a8c991cdb 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "16:31:00", + "16:45:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From c0d7e06b6697aba6c4ea9e5e4a99aa4eb5fdad61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 16:45:31 +0800 Subject: [PATCH 07/18] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index a8c991cdb..648710087 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "16:45:00", + "16:50:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From a8191341a033da8660ec51f50149fae3ba9ebf63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 17:11:12 +0800 Subject: [PATCH 08/18] 1 --- business/jxstore/cms/store.go | 2 +- business/jxstore/misc/misc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d09a95482..3dfbccc10 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2227,7 +2227,7 @@ func UpdateStoreName() error { for _, v := range data { storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS) formalizeStore4Courier(storeDetail) - err := mtps.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name) + err := mtps.UpdateStoreName(utils.Int2Str(v.StoreID), storeDetail.Name) globals.SugarLogger.Debug("err := %v,storeID : %d,storeName :%s", err, v.VendorStoreID, storeDetail.Name) } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 648710087..128c0c43f 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "16:50:00", + "17:13:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From 825216e9f95a7162c47fbbc480cebb5093dec72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 25 May 2023 17:25:22 +0800 Subject: [PATCH 09/18] 1 --- business/jxstore/cms/store.go | 5 +++-- business/jxstore/misc/misc.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3dfbccc10..3a2a4ba60 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2227,8 +2227,9 @@ func UpdateStoreName() error { for _, v := range data { storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS) formalizeStore4Courier(storeDetail) - err := mtps.UpdateStoreName(utils.Int2Str(v.StoreID), storeDetail.Name) - globals.SugarLogger.Debug("err := %v,storeID : %d,storeName :%s", err, v.VendorStoreID, storeDetail.Name) + if err := mtps.UpdateStoreName(v.VendorStoreID, storeDetail.Name); err != nil { + globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), v.VendorStoreID, storeDetail.Name) + } } return nil diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 128c0c43f..c6a142384 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "17:13:00", + "17:30:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From ae0e50926d10b52af2356673b72f006665736317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 14:01:25 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E8=9C=82=E9=B8=9F=E5=8A=A0=E5=9B=9B?= =?UTF-8?q?=E6=AF=9B,=E4=B8=8B=E8=BD=BDexcel=E8=BF=9D=E7=BA=A6=E9=87=91?= =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E8=BF=90=E8=B4=B9=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 1 + .../jxcallback/scheduler/defsch/defsch_ext.go | 3 ++ business/jxstore/cms/store.go | 35 +++++++++++++------ business/partner/delivery/dada/waybill.go | 4 +++ business/partner/delivery/fn/waybill.go | 8 +++-- business/partner/delivery/mtps/store.go | 2 +- business/partner/delivery/rider.go | 5 +++ business/partner/delivery/uupt/waybill.go | 4 +++ business/partner/partner_delivery.go | 1 + 9 files changed, 49 insertions(+), 14 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 8051da777..bdc7dd678 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -510,6 +510,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS paramDamages := []interface{}{v.VendorOrderID, model.OrderStatusCanceled} if err := dao.GetRow(dao.GetDB(), damages, sqlDamages, paramDamages); err == nil { v.LiquidatedDamages = damages.Damages + v.DesiredFee += damages.Damages } orders2 = append(orders2, v) } else { diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 4d5dd5433..a3b3017f6 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -500,6 +500,9 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor } } else { feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛 + if storeCourier.VendorID == model.VendorIDFengNiao { + feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 蜂鸟加 + } feeInfo.TimeoutSecond = timeoutSecond } } else { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3a2a4ba60..b1e69a54a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6,7 +6,6 @@ import ( "encoding/json" "errors" "fmt" - "git.rosy.net.cn/jx-callback/business/partner/delivery/mtps" "io" "math" "mime/multipart" @@ -2218,20 +2217,34 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { func UpdateStoreName() error { var db = dao.GetDB() - sql := ` SELECT * FROM store_courier_map WHERE vendor_id = ? AND deleted_at = ?` - data := make([]*model.StoreCourierMap, 0, 0) - if err := dao.GetRows(db, &data, sql, []interface{}{model.VendorIDMTPS, utils.DefaultTimeValue}...); err != nil { + sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?` + courierList := make([]*model.StoreCourierMap, 0, 0) + if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err } - for _, v := range data { - storeDetail, _ := dao.GetStoreDetail2(db, v.StoreID, v.VendorStoreID, model.VendorIDMTPS) - formalizeStore4Courier(storeDetail) - if err := mtps.UpdateStoreName(v.VendorStoreID, storeDetail.Name); err != nil { - globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), v.VendorStoreID, storeDetail.Name) - } - } + work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + var resultList []interface{} + storeCourier := batchItemList[0].(*model.StoreCourierMap) + errList := errlist.New() + db := dao.GetDB() + + storeDetail, _ := dao.GetStoreDetail2(db, storeCourier.StoreID, storeCourier.VendorStoreID, storeCourier.VendorID) + formalizeStore4Courier(storeDetail) + if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil { + if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil { + if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil { + errList.AddErr(err) + globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), storeDetail.VendorStoreID, storeDetail.Name) + } + } + } + return resultList, errList.GetErrListAsOne() + } + // 定时任务更新或者创建时修改东西 + task := tasksch.NewParallelTask("UpdateStoreName", tasksch.NewParallelConfig().SetIsContinueWhenError(false), jxcontext.AdminCtx, work, courierList) + tasksch.HandleTask(task, nil, len(courierList) > 1).Run() return nil } diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 291892ad8..1c3e4909c 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -624,3 +624,7 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } + +func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { + return err +} diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index bb8e47379..b640f7b01 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -344,10 +344,10 @@ func (c *DeliveryHandler) OnWaybillExcept(msg *fnpsapi.AbnormalReportNotify) (re return retVal } -// 查询订单配送费 +// 查询订单配送费(蜂鸟加4毛) func GetDesiredFee(vendorOrderID string) (desiredFee, acuteFee int64) { if result, err := api.FnAPI.QueryOrder(vendorOrderID); err == nil { - return result.OrderTotalAmountCent + int64(utils.WayBillDeliveryMarkUp), result.OrderActualAmountCent + return result.OrderTotalAmountCent, result.OrderActualAmountCent } return desiredFee, acuteFee } @@ -473,3 +473,7 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } + +func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { + return err +} diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index 485d4c036..6bda0797e 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -184,7 +184,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S } // 美团配送,修改门店名称 -func UpdateStoreName(storeId, name string) (err error) { +func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { shopInfo := &mtpsapi.ShopInfo{ ShopID: storeId, ShopName: name, diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 222e64471..bef95a17c 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -543,6 +543,11 @@ func GetVendorRiderInfo(wayBillVendorId, vendorId int, vendorOrderId, vendorWayb } } + if riderInfo.CourierName != "" && riderInfo.CourierPhone != "" { + riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) + } else { + riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, "暂无", "暂无") + } return } diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index e7a7cbad2..910925a20 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -404,3 +404,7 @@ func getReallyStoreID(storeID, jxStoreID int) int { return storeID } } + +func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { + return err +} diff --git a/business/partner/partner_delivery.go b/business/partner/partner_delivery.go index 59ed20cc3..b34087e85 100644 --- a/business/partner/partner_delivery.go +++ b/business/partner/partner_delivery.go @@ -54,6 +54,7 @@ type IDeliveryPlatformHandler interface { type IDeliveryUpdateStoreHandler interface { UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) + UpdateStoreName(storeId, name string) (err error) } type DeliveryPlatformHandlerInfo struct { From 0e74166aac0975f3a91151b537e8ebe2b7ae6b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 14:01:49 +0800 Subject: [PATCH 11/18] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index c6a142384..92adaa97b 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "17:30:00", + "14:05:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From bcfe5096b3a0719f013fd7480ac0b7c609f16244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 15:04:03 +0800 Subject: [PATCH 12/18] 1 --- business/partner/purchase/jx/localjx/kuaishou_pay.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/kuaishou_pay.go b/business/partner/purchase/jx/localjx/kuaishou_pay.go index 1cd8dcf8e..47243e554 100644 --- a/business/partner/purchase/jx/localjx/kuaishou_pay.go +++ b/business/partner/purchase/jx/localjx/kuaishou_pay.go @@ -62,7 +62,6 @@ func pay4OrderByKs(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp } // 预下单 prePayInfo, err := api.KuaiShouApi.PreCreateOrder(param) - globals.SugarLogger.Debugf("=======err : %v", err) if err == nil { orderPay = &model.OrderPay{ PayOrderID: order.VendorOrderID, // 抖音订单id @@ -72,8 +71,8 @@ func pay4OrderByKs(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp VendorID: order.VendorID, Status: 0, PayCreatedAt: time.Now(), - PrepayID: "", - CodeURL: prePayInfo, // 抖音支付token + PrepayID: prePayInfo.OrderInfoToken, + CodeURL: prePayInfo.OrderNo, // 抖音支付token TotalFee: int(order.ActualPayPrice), } } From e406cccc69c5e8da34010e6eeaf085c30011f119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 15:25:49 +0800 Subject: [PATCH 13/18] 1 --- business/jxstore/cms/store.go | 4 +++- business/jxstore/misc/misc.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index b1e69a54a..8fe36db0c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2219,6 +2219,7 @@ func UpdateStoreName() error { var db = dao.GetDB() sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?` courierList := make([]*model.StoreCourierMap, 0, 0) + globals.SugarLogger.Debugf("====================len : %d", len(courierList)) if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err @@ -2227,6 +2228,7 @@ func UpdateStoreName() error { work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { var resultList []interface{} storeCourier := batchItemList[0].(*model.StoreCourierMap) + globals.SugarLogger.Debugf("====================storeId : %d", storeCourier.StoreID) errList := errlist.New() db := dao.GetDB() @@ -2236,7 +2238,7 @@ func UpdateStoreName() error { if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil { if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil { errList.AddErr(err) - globals.SugarLogger.Debugf("err := %s,storeID : %s,storeName :%s", utils.Format4Output(err, false), storeDetail.VendorStoreID, storeDetail.Name) + globals.SugarLogger.Debugf("err := %v,storeID : %s,storeName :%s , vendorId : %d", err, storeDetail.VendorStoreID, storeDetail.Name, storeDetail.VendorID) } } } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 92adaa97b..e4ed5bd5a 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "14:05:00", + "15:30:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From 77eb8e19a6250cc68118cb73df09a3a31945b276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 17:13:19 +0800 Subject: [PATCH 14/18] 1 --- business/jxstore/cms/store.go | 5 ++-- business/partner/delivery/dada/waybill.go | 5 +++- business/partner/delivery/fn/waybill.go | 33 ++++++++++++++++++++++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8fe36db0c..89ec5dfa9 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2219,14 +2219,13 @@ func UpdateStoreName() error { var db = dao.GetDB() sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?` courierList := make([]*model.StoreCourierMap, 0, 0) - globals.SugarLogger.Debugf("====================len : %d", len(courierList)) if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err } + globals.SugarLogger.Debugf("====================len : %d", len(courierList)) work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - var resultList []interface{} storeCourier := batchItemList[0].(*model.StoreCourierMap) globals.SugarLogger.Debugf("====================storeId : %d", storeCourier.StoreID) errList := errlist.New() @@ -2242,7 +2241,7 @@ func UpdateStoreName() error { } } } - return resultList, errList.GetErrListAsOne() + return nil, errList.GetErrListAsOne() } // 定时任务更新或者创建时修改东西 task := tasksch.NewParallelTask("UpdateStoreName", tasksch.NewParallelConfig().SetIsContinueWhenError(false), jxcontext.AdminCtx, work, courierList) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 1c3e4909c..b5b954b4c 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -626,5 +626,8 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - return err + return api.DadaAPI.ShopUpdate(&dadaapi.ShopInfo{ + StationName: name, + OriginShopID: storeId, + }) } diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index b640f7b01..8ad67a44a 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -475,5 +475,36 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - return err + // 获取蜂鸟门店id + fnStore, err := api.FnAPI.GetStore(storeId) + if err != nil { + return err + } + + updateStore := &fnpsapi.UpdateStoreParam{ + ChainStoreID: fnStore.ChainStoreID, + ContactPhone: fnStore.ContactPhone, + Address: fnStore.Address, + Longitude: fnStore.Longitude, + Latitude: fnStore.Latitude, + PositionSource: 3, + OutShopCode: fnStore.OutShopCode, + CategoryID: utils.Int2Str(fnStore.CategoryID), + OwnerName: fnStore.OwnerName, + OwnerIDNum: fnStore.OwnerIDNum, + HandheldLicencePicHash: "暂不需要(手持身份证、营业执照图片)", + OwnerIDPicFrontHash: "暂不需要(省份证正)", + OwnerIDPicBackHash: "暂不需要(身份证反)", + CreditCode: fnStore.CreditCode, + } + updateStore.HeadShopName = name + updateStore.BranchShopName = name + if updateStore.OwnerName == "" { + updateStore.OwnerName = "石锋" + } + if updateStore.OwnerIDNum == "" { + updateStore.OwnerIDNum = "610126198012230014" + } + + return api.FnAPI.UpdateStore(updateStore) } From e7a235ebedb4ce0115e0704cb81273f5033734a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 17:14:39 +0800 Subject: [PATCH 15/18] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index e4ed5bd5a..5d2ca5622 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "15:30:00", + "17:20:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From bff2be81e8d297c8c7b39395c18d73180ef29822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 26 May 2023 17:31:30 +0800 Subject: [PATCH 16/18] 1 --- business/jxstore/cms/store.go | 14 ++------------ business/jxstore/misc/misc.go | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 89ec5dfa9..65edfced8 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2225,27 +2225,17 @@ func UpdateStoreName() error { } globals.SugarLogger.Debugf("====================len : %d", len(courierList)) - work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeCourier := batchItemList[0].(*model.StoreCourierMap) - globals.SugarLogger.Debugf("====================storeId : %d", storeCourier.StoreID) - errList := errlist.New() - db := dao.GetDB() - - storeDetail, _ := dao.GetStoreDetail2(db, storeCourier.StoreID, storeCourier.VendorStoreID, storeCourier.VendorID) + for i := 0; i < len(courierList); i++ { + storeDetail, _ := dao.GetStoreDetail2(db, courierList[i].StoreID, courierList[i].VendorStoreID, courierList[i].VendorID) formalizeStore4Courier(storeDetail) if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil { if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil { if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil { - errList.AddErr(err) globals.SugarLogger.Debugf("err := %v,storeID : %s,storeName :%s , vendorId : %d", err, storeDetail.VendorStoreID, storeDetail.Name, storeDetail.VendorID) } } } - return nil, errList.GetErrListAsOne() } - // 定时任务更新或者创建时修改东西 - task := tasksch.NewParallelTask("UpdateStoreName", tasksch.NewParallelConfig().SetIsContinueWhenError(false), jxcontext.AdminCtx, work, courierList) - tasksch.HandleTask(task, nil, len(courierList) > 1).Run() return nil } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 5d2ca5622..b9b013f24 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "17:20:00", + "17:35:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 From 2a4de66bd473b5bf47f8ec690bd37b91e3f28ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 29 May 2023 10:04:27 +0800 Subject: [PATCH 17/18] 1 --- business/jxstore/cms/store.go | 9 +++-- business/partner/delivery/dada/waybill.go | 15 +------- business/partner/delivery/fn/store.go | 8 +---- business/partner/delivery/fn/waybill.go | 35 ------------------- business/partner/delivery/mtps/store.go | 12 +------ business/partner/partner_delivery.go | 1 - .../purchase/jx/localjx/kuaishou_pay.go | 4 +-- 7 files changed, 11 insertions(+), 73 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 65edfced8..fa893049c 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -2216,21 +2216,24 @@ func updateCourierStores(ctx *jxcontext.Context, storeID int) (err error) { } func UpdateStoreName() error { - var db = dao.GetDB() + var ( + db = dao.GetDB() + context = jxcontext.AdminCtx + ) + sql := ` SELECT * FROM store_courier_map WHERE vendor_id IN (?,?,?,?) AND deleted_at = ?` courierList := make([]*model.StoreCourierMap, 0, 0) if err := dao.GetRows(db, &courierList, sql, []interface{}{model.VendorIDMTPS, model.VendorIDFengNiao, model.VendorIDDada, model.VendorIDUUPT, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("query Order err := %v", err) return err } - globals.SugarLogger.Debugf("====================len : %d", len(courierList)) for i := 0; i < len(courierList); i++ { storeDetail, _ := dao.GetStoreDetail2(db, courierList[i].StoreID, courierList[i].VendorStoreID, courierList[i].VendorID) formalizeStore4Courier(storeDetail) if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil { if updateHandler, _ := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); updateHandler != nil { - if err := updateHandler.UpdateStoreName(storeDetail.VendorStoreID, storeDetail.Name); err != nil { + if err := updateHandler.UpdateStore(context, storeDetail); err != nil { globals.SugarLogger.Debugf("err := %v,storeID : %s,storeName :%s , vendorId : %d", err, storeDetail.VendorStoreID, storeDetail.Name, storeDetail.VendorID) } } diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index b5b954b4c..c1e785a8b 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -188,12 +188,6 @@ func (c *DeliveryHandler) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal } func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.ShopInfo) { - // 获取品牌名称 - brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") - if err != nil { - return nil - } - lng := jxutils.IntCoordinate2Standard(storeDetail.Lng) lat := jxutils.IntCoordinate2Standard(storeDetail.Lat) cityName := storeDetail.CityName @@ -209,7 +203,7 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop } shopInfo = &dadaapi.ShopInfo{ OriginShopID: storeDetail.VendorStoreID, - StationName: brandInfo[0].Name + "-" + storeDetail.Name, + StationName: storeDetail.Name, Business: dadaapi.BusinessTypeConvStore, // 故意设置成这个的 CityName: cityName, AreaName: districtName, @@ -624,10 +618,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } - -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - return api.DadaAPI.ShopUpdate(&dadaapi.ShopInfo{ - StationName: name, - OriginShopID: storeId, - }) -} diff --git a/business/partner/delivery/fn/store.go b/business/partner/delivery/fn/store.go index 29c9fbddf..52f41bb10 100644 --- a/business/partner/delivery/fn/store.go +++ b/business/partner/delivery/fn/store.go @@ -109,12 +109,6 @@ func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool { } func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { - // 获取品牌名称 - brandInfo, err := dao.GetBrands(dao.GetDB(), "", storeDetail.BrandID, "", false, "") - if err != nil { - return err - } - // 获取蜂鸟门店id fnStore, err := api.FnAPI.GetStore(storeDetail.VendorStoreID) if err != nil { @@ -139,7 +133,7 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S BusinessLicencePicHash: storeDetail.Licence, } if storeDetail.Name != fnStore.Name { - updateStore.HeadShopName = brandInfo[0].Name + "-" + storeDetail.Name + updateStore.HeadShopName = storeDetail.Name updateStore.BranchShopName = storeDetail.Name } if updateStore.OwnerName == "" { diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 8ad67a44a..fa89e4f4d 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -473,38 +473,3 @@ func (c *DeliveryHandler) GetDeliverLiquidatedDamages(orderId string, deliverId } return vendorPrice, nil } - -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - // 获取蜂鸟门店id - fnStore, err := api.FnAPI.GetStore(storeId) - if err != nil { - return err - } - - updateStore := &fnpsapi.UpdateStoreParam{ - ChainStoreID: fnStore.ChainStoreID, - ContactPhone: fnStore.ContactPhone, - Address: fnStore.Address, - Longitude: fnStore.Longitude, - Latitude: fnStore.Latitude, - PositionSource: 3, - OutShopCode: fnStore.OutShopCode, - CategoryID: utils.Int2Str(fnStore.CategoryID), - OwnerName: fnStore.OwnerName, - OwnerIDNum: fnStore.OwnerIDNum, - HandheldLicencePicHash: "暂不需要(手持身份证、营业执照图片)", - OwnerIDPicFrontHash: "暂不需要(省份证正)", - OwnerIDPicBackHash: "暂不需要(身份证反)", - CreditCode: fnStore.CreditCode, - } - updateStore.HeadShopName = name - updateStore.BranchShopName = name - if updateStore.OwnerName == "" { - updateStore.OwnerName = "石锋" - } - if updateStore.OwnerIDNum == "" { - updateStore.OwnerIDNum = "610126198012230014" - } - - return api.FnAPI.UpdateStore(updateStore) -} diff --git a/business/partner/delivery/mtps/store.go b/business/partner/delivery/mtps/store.go index 6bda0797e..cbd945092 100644 --- a/business/partner/delivery/mtps/store.go +++ b/business/partner/delivery/mtps/store.go @@ -169,7 +169,6 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool { func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) { if globals.EnableStoreWrite { - // err = api.MtpsAPI.PagePoiUpdate(storeDetail.VendorStoreID, storeDetail.PayeeName, storeDetail.Tel1, fakeContactEmail) shopInfo := &mtpsapi.ShopInfo{ ShopID: utils.Int2Str(storeDetail.ID), ContactName: storeDetail.PayeeName, @@ -177,18 +176,9 @@ func (c *DeliveryHandler) UpdateStore(ctx *jxcontext.Context, storeDetail *dao.S ShopAddress: storeDetail.Address, ShopLat: storeDetail.Lat, ShopLng: storeDetail.Lng, + ShopName: storeDetail.Name, } _, err = api.MtpsAPI.ShopUpdate(shopInfo) } return err } - -// 美团配送,修改门店名称 -func (c *DeliveryHandler) UpdateStoreName(storeId, name string) (err error) { - shopInfo := &mtpsapi.ShopInfo{ - ShopID: storeId, - ShopName: name, - } - _, err = api.MtpsAPI.ShopUpdate(shopInfo) - return err -} diff --git a/business/partner/partner_delivery.go b/business/partner/partner_delivery.go index b34087e85..59ed20cc3 100644 --- a/business/partner/partner_delivery.go +++ b/business/partner/partner_delivery.go @@ -54,7 +54,6 @@ type IDeliveryPlatformHandler interface { type IDeliveryUpdateStoreHandler interface { UpdateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (err error) - UpdateStoreName(storeId, name string) (err error) } type DeliveryPlatformHandlerInfo struct { diff --git a/business/partner/purchase/jx/localjx/kuaishou_pay.go b/business/partner/purchase/jx/localjx/kuaishou_pay.go index 47243e554..e4ca64930 100644 --- a/business/partner/purchase/jx/localjx/kuaishou_pay.go +++ b/business/partner/purchase/jx/localjx/kuaishou_pay.go @@ -71,8 +71,8 @@ func pay4OrderByKs(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp VendorID: order.VendorID, Status: 0, PayCreatedAt: time.Now(), - PrepayID: prePayInfo.OrderInfoToken, - CodeURL: prePayInfo.OrderNo, // 抖音支付token + PrepayID: prePayInfo.OrderNo, + CodeURL: prePayInfo.OrderInfoToken, // 抖音支付token TotalFee: int(order.ActualPayPrice), } } From 440ab9cdeb649cb7c6bcd4b8cd9693382462e719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 29 May 2023 10:05:34 +0800 Subject: [PATCH 18/18] 1 --- business/jxstore/misc/misc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index b9b013f24..0dcdbbaa2 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -231,7 +231,7 @@ func Init() { ScheduleTimerFunc("UpdateStoreName ", func() { cms.UpdateStoreName() }, []string{ - "17:35:00", + "13:35:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系