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-11-19 09:22:53 +08:00
parent f1cb1cfd67
commit 6b91919789
2 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -808,25 +808,33 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
} }
//2020-11-16 预计收益-配送费 > 0 再发 //2020-11-16 预计收益-配送费 > 0 再发
for _, vendorID := range waybillVendorIDs { for _, vendorID := range waybillVendorIDs {
var fee int64
handler := partner.GetDeliveryPlatformFromVendorID(vendorID) handler := partner.GetDeliveryPlatformFromVendorID(vendorID)
if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil { if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil {
if income-deliveryFeeInfo.DeliveryFee <= 0 { if income-deliveryFeeInfo.DeliveryFee <= 0 {
excludeVendorIDs = append(excludeVendorIDs, vendorID) excludeVendorIDs = append(excludeVendorIDs, vendorID)
} }
fee = deliveryFeeInfo.DeliveryFee
} }
globals.SugarLogger.Debugf("count order income, vendorID: %v, income :%v , deliveryFee : %v", vendorID, income, fee)
} }
if savedOrderInfo != nil {
//TODO 2020-07-21 发单时间要在门店的营业时间内 //TODO 2020-07-21 发单时间要在门店的营业时间内
var storeDetail *dao.StoreDetail
if savedOrderInfo.storeDetail != nil { if savedOrderInfo.storeDetail != nil {
if savedOrderInfo.storeDetail.OpenTime1 != 0 && savedOrderInfo.storeDetail.CloseTime1 != 0 { storeDetail = savedOrderInfo.storeDetail
time1 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime1, time.Now()) } else {
time2 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime1, time.Now()) storeDetail, err = dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
globals.SugarLogger.Debugf("三方运单不在门店营业时间范围 ：time1 %v ,time2 %v", time1, time2) }
if storeDetail != nil {
globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time1 %v ,time2 %v", storeDetail.OpenTime1, storeDetail.CloseTime1)
if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {
time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())
time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now())
if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 { if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 0 {
if savedOrderInfo.storeDetail.OpenTime2 != 0 && savedOrderInfo.storeDetail.CloseTime2 != 0 { if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 {
time3 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.OpenTime2, time.Now()) time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())
time4 := jxutils.JxOperationTime2TimeByDate(savedOrderInfo.storeDetail.CloseTime2, time.Now()) time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now())
if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 { if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 {
err = fmt.Errorf("不在门店营业时间范围内！") err = fmt.Errorf("不在门店营业时间范围内！")
} }
@@ -836,7 +844,6 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
} }
} }
} }
}
if err == nil { if err == nil {
if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil { if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil {

29
business/jxstore/tempop/tempop.go
View File

@@ -1727,6 +1727,35 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
} }
dao.WrapAddIDCULDEntity(storeMap, "jxadmin") dao.WrapAddIDCULDEntity(storeMap, "jxadmin")
err = dao.CreateEntity(db, storeMap) err = dao.CreateEntity(db, storeMap)
if shopDetailResult, err := api.JdShop2API.ShopDetail(utils.Str2Int(vendorStoreID)); err == nil {
err = api.JdShop2API.UpdateBasic(&jdshopapi.UpdateBasicParam{
StoreID: utils.Str2Int(vendorStoreID),
StoreName: shopDetailResult.StoreName,
CategoryID2: 62,
Coordinate: shopDetailResult.Coordinate,
BussinessBeginTime: shopDetailResult.BussinessBeginTime,
BussinessEndTime: shopDetailResult.BussinessEndTime,
ImgURL: shopDetailResult.ImgURL,
StorePhone: shopDetailResult.StorePhone,
AddName: shopDetailResult.AddName,
AddCode1: shopDetailResult.AddCode1,
AddCode2: shopDetailResult.AddCode2,
AddCode3: shopDetailResult.AddCode3,
CategoryID1: 34,
QualificationRequests: []*jdshopapi.QualificationRequests{
&jdshopapi.QualificationRequests{
QualificationID: 41,
QualificationName: "营业执照",
QualificationNo: "11111",
QualificationURL: "jfs/t1/148622/37/14846/10266/5fb4e3e2Ef2f61870/a7cfba9c1513d95e.png",
StartTime: "2020-11-04 00:00:00",
EndingTime: "2020-11-06 23:59:59",
Time: []string{"2020-11-04 00:00:00", "2020-11-06 23:59:59"},
},
},
})
}
break break
} }
return err return err