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

物料运单配送员更新修改

Browse Source
This commit is contained in:
苏尹岚
2020-03-19 11:29:49 +08:00
parent 43a45df6fe
commit bdef8c5bb2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/misc/misc.go
View File

@@ -321,7 +321,7 @@ func doDailyWork() {
cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), nil, nil, true, true) cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), nil, nil, true, true)
syncStoreSku() syncStoreSku()
localjx.RefreshAllMatterOrderStatus()
InitEx() InitEx()
// 每天补全前一天与当天的订单 // 每天补全前一天与当天的订单

9
business/partner/purchase/jx/localjx/order.go
View File

@@ -771,7 +771,6 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
order.FromStoreID = jxOrder.FromStoreID order.FromStoreID = jxOrder.FromStoreID
order.WaybillVendorID = model.VendorIDJDWL order.WaybillVendorID = model.VendorIDJDWL
order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
order.DeliveryType = model.OrderDeliveryTypeSelfTake
order.Flag = 1 order.Flag = 1
} }
return order, err return order, err
@@ -808,6 +807,8 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
if err != nil || len(goods) == 0 { if err != nil || len(goods) == 0 {
return err return err
} }
order.WaybillVendorID = model.VendorIDJDWL
dao.UpdateEntity(db, order, "WaybillVendorID")
orderSkus := goods[0].Skus orderSkus := goods[0].Skus
if order.Weight <= 5000 { //如果总重量小于5kg就直接发单 if order.Weight <= 5000 { //如果总重量小于5kg就直接发单
var ( var (
@@ -845,7 +846,6 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
} }
order.EclpOutID = result order.EclpOutID = result
dao.UpdateEntity(db, order, "EclpOutID") dao.UpdateEntity(db, order, "EclpOutID")
globals.SugarLogger.Debugf("tryToSplitMatterOrderaaa,[%v]", utils.Format4Output(order, false))
waybill := &model.Waybill{ waybill := &model.Waybill{
VendorOrderID: order.VendorOrderID, VendorOrderID: order.VendorOrderID,
OrderVendorID: model.VendorIDJX, OrderVendorID: model.VendorIDJX,
@@ -1343,6 +1343,7 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
waybillCode = getTrackMessagePlusByOrderResult.ResultData[0].WaybillCode waybillCode = getTrackMessagePlusByOrderResult.ResultData[0].WaybillCode
cName string cName string
cMobile string cMobile string
waybills []*model.Waybill
) )
for _, vv := range getTrackMessagePlusByOrderResult.ResultData { for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
if vv.OpeTitle == "配送员收货" { if vv.OpeTitle == "配送员收货" {
@@ -1352,7 +1353,9 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
break break
} }
} }
waybills, _ := dao.GetWayBillByOrderID(db, -1, model.VendorIDJX, -1, vendorOrderID) sql := "SELECT * FROM waybill WHERE vendor_order_id = ?"
sqlParams := []interface{}{vendorOrderID}
err = dao.GetRows(db, &waybills, sql, sqlParams)
if len(waybills) > 0 { if len(waybills) > 0 {
waybills[0].VendorWaybillID = waybillCode waybills[0].VendorWaybillID = waybillCode
waybills[0].CourierName = cName waybills[0].CourierName = cName