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:
邹宗楠
2024-02-19 18:04:39 +08:00
parent dc25d0cdc1
commit 467c08707a
6 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/store.go
View File

@@ -377,7 +377,7 @@ type Store struct {
PayeeAccountNo string `orm:"size(255)" json:"payeeAccountNo"` // 收款账号 PayeeAccountNo string `orm:"size(255)" json:"payeeAccountNo"` // 收款账号
PayeeBankBranchName string `orm:"size(255)" json:"payeeBankBranchName"` // 开户支行 PayeeBankBranchName string `orm:"size(255)" json:"payeeBankBranchName"` // 开户支行
PayeeBankCode string `orm:"size(8)" json:"payeeBankCode"` // 开户行代码 PayeeBankCode string `orm:"size(8)" json:"payeeBankCode"` // 开户行代码
PayPercentage int `json:"payPercentage"` PayPercentage int `json:"payPercentage"` // 扣点模式,小于50为扣点,其他为报价
OldPayPercentage int `json:"oldPayPercentage"` OldPayPercentage int `json:"oldPayPercentage"`
StoreFrontPic string `orm:"size(255)" json:"storeFrontPic"` //门面照 StoreFrontPic string `orm:"size(255)" json:"storeFrontPic"` //门面照

13
business/partner/delivery/delivery.go
View File

@@ -21,6 +21,19 @@ const (
) )
func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) { func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) {
//storeDetail, err := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode)
//if storeDetail.PayPercentage < 50 {
// order.EarningType = model.EarningTypePoints
//} else {
// order.EarningType = model.EarningTypeQuote
//}
//if err == nil && storeDetail != nil && storeDetail.PayPercentage < 50 {
//
//}
// 扣点模式订单不需要限额
if order.EarningType == model.EarningTypePoints {
return nil
}
if maxDeliveryFee <= model.DefMaxDeliveryFee { if maxDeliveryFee <= model.DefMaxDeliveryFee {
maxDeliveryFee = model.DefMaxDeliveryFee maxDeliveryFee = model.DefMaxDeliveryFee
} }

3
business/partner/delivery/fn/waybill.go
View File

@@ -102,6 +102,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
} }
if maxDeliveryFee == model.NO { if maxDeliveryFee == model.NO {
// 扣点模式订单不需要限额
if order.EarningType != model.EarningTypePoints {
// 获取配送费 // 获取配送费
fee, err := c.GetWaybillFee(order) fee, err := c.GetWaybillFee(order)
if err != nil { if err != nil {
@@ -111,6 +113,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, fmt.Errorf("蜂鸟超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) return nil, fmt.Errorf("蜂鸟超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
} }
} }
}
// 蜂鸟入参结构体 // 蜂鸟入参结构体
parameter := &fnpsapi.CreateOrderReqParam{ parameter := &fnpsapi.CreateOrderReqParam{

2
business/partner/delivery/mtps/waybill.go
View File

@@ -332,6 +332,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
} }
if maxDeliveryFee == model.NO { if maxDeliveryFee == model.NO {
if order.EarningType != model.EarningTypePoints {
fee, err := c.GetWaybillFee(order) fee, err := c.GetWaybillFee(order)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -340,6 +341,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
} }
} }
}
// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出 // 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出
lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) lngFloat, latFloat, _ := jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType)

2
business/partner/delivery/sfps/waybill.go
View File

@@ -90,6 +90,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
} }
if maxDeliveryFee == model.NO { if maxDeliveryFee == model.NO {
if order.EarningType != model.EarningTypePoints {
fee, err := d.GetWaybillFee(order) fee, err := d.GetWaybillFee(order)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -98,6 +99,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
} }
} }
}
store, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "") store, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "")
if err != nil { if err != nil {

3
business/partner/delivery/uupt/waybill.go
View File

@@ -140,6 +140,7 @@ func (d DeliveryHandler) IsErrStoreExist(err error) bool {
func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
if maxDeliveryFee == model.NO { if maxDeliveryFee == model.NO {
if order.EarningType != model.EarningTypePoints {
fee, err := d.GetWaybillFee(order) fee, err := d.GetWaybillFee(order)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -147,7 +148,7 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
if fee.DeliveryFee >= model.DefMaxDeliveryFee { if fee.DeliveryFee >= model.DefMaxDeliveryFee {
return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee))
} }
}
} }
//获取门店老板详情 //获取门店老板详情
storeOwner, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "") storeOwner, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "")