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:
邹宗楠
2023-05-23 15:04:55 +08:00
parent 77e7b21917
commit bb57eacecc
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -559,11 +559,6 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
} }
} }
} }
//if !model.IsWaybillPlatformOwn(bill) {
// if storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, ""); err2 == nil {
// s.updateBrandAccount(storeDetail, bill)
// }
//}
} }
flag2Clear := model.WaybillVendorID2Mask(bill.WaybillVendorID) flag2Clear := model.WaybillVendorID2Mask(bill.WaybillVendorID)
if order.DeliveryFlag&flag2Clear != 0 { if order.DeliveryFlag&flag2Clear != 0 {

4
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -99,8 +99,8 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
CourierMobile: courierMobile, CourierMobile: courierMobile,
Status: model.OrderStatusNew, Status: model.OrderStatusNew,
VendorStatus: utils.Int2Str(model.OrderStatusNew), VendorStatus: utils.Int2Str(model.OrderStatusNew),
ActualFee: 500, ActualFee: 0,
DesiredFee: order.ActualPayPrice, DesiredFee: 0,
TipFee: 0, TipFee: 0,
DuplicatedCount: 0, DuplicatedCount: 0,
DeliveryFlag: 0, DeliveryFlag: 0,

11
business/model/order.go
View File

@@ -1,6 +1,8 @@
package model package model
import ( import (
"fmt"
"git.rosy.net.cn/baseapi/utils"
"time" "time"
) )
@@ -145,8 +147,8 @@ type GoodsOrder struct {
OrderFinishedAt time.Time `orm:"type(datetime)" json:"orderFinishedAt"` OrderFinishedAt time.Time `orm:"type(datetime)" json:"orderFinishedAt"`
StatusTime time.Time `orm:"type(datetime)" json:"statusTime"` // last status time StatusTime time.Time `orm:"type(datetime)" json:"statusTime"` // last status time
PickDeadline time.Time `orm:"type(datetime);null" json:"pickDeadline"` PickDeadline time.Time `orm:"type(datetime);null" json:"pickDeadline"`
DeliveryFeeFrom *time.Time `orm:"type(datetime);null" json:"deliveryFeeFrom,omitempty"` // 三方配置费计算的开始基准时间 DeliveryFeeFrom *time.Time `orm:"type(datetime);null" json:"deliveryFeeFrom,omitempty"` // 三方配置费计算的开始基准时间
ModelTimeInfo `json:"-"` // 1 ModelTimeInfo `json:"-"` // 1
Flag int `json:"flag"` // 非运单调整相关的其它状态 Flag int `json:"flag"` // 非运单调整相关的其它状态
InvoiceTitle string `orm:"size(64)" json:"invoiceTitle"` // 发票抬头 InvoiceTitle string `orm:"size(64)" json:"invoiceTitle"` // 发票抬头
InvoiceTaxerID string `orm:"size(32);column(invoice_taxer_id)" json:"invoiceTaxerID"` // 发票纳税人识别码 InvoiceTaxerID string `orm:"size(32);column(invoice_taxer_id)" json:"invoiceTaxerID"` // 发票纳税人识别码
@@ -324,6 +326,11 @@ func Waybill2Status(bill *Waybill) (retVal *OrderStatus) {
StatusTime: bill.StatusTime, StatusTime: bill.StatusTime,
Remark: bill.Remark, Remark: bill.Remark,
} }
if retVal.Remark == "" {
retVal.Remark = fmt.Sprintf("运费: %s", utils.Float64ToStr(float64(bill.DesiredFee)/float64(100)))
} else {
retVal.Remark += fmt.Sprintf(",运费: %s", utils.Float64ToStr(float64(bill.DesiredFee)/float64(100)))
}
return retVal return retVal
} }