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:
richboo111
2023-08-16 13:57:18 +08:00
parent 7f7aa132c6
commit 16f445bd60
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
business/jxstore/cms/store.go
View File

@@ -132,19 +132,19 @@ type VendorStoreExcel struct {
//门店信息 //门店信息
type StoreInfo struct { type StoreInfo struct {
StoreID int `json:"storeID"` //门店ID StoreID int `json:"storeID"` //门店ID
StoreName string `json:"storeName"` //门店名字 StoreName string `json:"storeName"` //门店名字
OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有 OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有
CloseTime1 int16 `json:"closeTime1"` // 营业时间 1 CloseTime1 int16 `json:"closeTime1"` // 营业时间 1
OpenTime2 int16 `json:"openTime2"` // 营业时间2 OpenTime2 int16 `json:"openTime2"` // 营业时间2
CloseTime2 int16 `json:"closeTime2"` CloseTime2 int16 `json:"closeTime2"`
Status int `json:"status"` //门店是否营业 Status int `json:"status"` //门店是否营业
Distance int `json:"distance"` //店铺与定位 直线距离 Distance int `json:"distance"` //店铺与定位 直线距离
Address string `json:"address"` //门店地址 Address string `json:"address"` //门店地址
BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID
BrandName string `json:"brandName"` //品牌名字 BrandName string `json:"brandName"` //品牌名字
BrandLogo string `json:"brandLogo"` //品牌logo BrandLogo string `json:"brandLogo"` //品牌logo
//WeeklyScore int `json:"weeklyScore"` //店铺每周评分 StoreWeeklyScore int `json:"storeWeeklyScore"` //店铺每周评分
} }
//门店减免策略 //门店减免策略
@@ -5925,6 +5925,9 @@ func GetHomePageByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDis
if err != nil { if err != nil {
return nil, "获取门店品牌信息失败", err return nil, "获取门店品牌信息失败", err
} }
//获取门店每周评分
//storeScore, err := misc.GetWeeklyStoreScore(v.ID, 0)
storeInfo := StoreInfo{ storeInfo := StoreInfo{
StoreID: v.ID, StoreID: v.ID,
StoreName: v.Name, StoreName: v.Name,

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

@@ -208,14 +208,18 @@ func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
deductionFee, err := api.SfPsAPI.PreCancelOrder(bill.VendorWaybillID) deductionFee, err := api.SfPsAPI.PreCancelOrder(bill.VendorWaybillID)
if deductionFee == 0 || err != nil { if deductionFee == 0 || err != nil {
money = 0 money = 0
} else {
money = utils.Float64TwoInt64(deductionFee)
} }
money = utils.Float64TwoInt64(deductionFee) globals.SugarLogger.Debugf("CancelWaybill money=%d", money)
if err = api.SfPsAPI.CancelOrder(bill.VendorWaybillID); err != nil { if err = api.SfPsAPI.CancelOrder(bill.VendorWaybillID); err != nil {
return err return err
} }
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled
bill.Remark = cancelReason bill.Remark = cancelReason
bill.DesiredFee = money //取消成功才赋值违约金 bill.DesiredFee = money //取消成功才赋值违约金
globals.SugarLogger.Debugf("CancelWaybill bill=%s", utils.Format4Output(bill, false))
partner.CurOrderManager.OnWaybillStatusChanged(bill) partner.CurOrderManager.OnWaybillStatusChanged(bill)
return nil return nil
} }