1

business/jxstore/cms/store.go

@@ -144,7 +144,7 @@ type StoreInfo struct {
 	BrandID          int    `orm:"column(brand_id)" json:"brandID"` //品牌ID
 	BrandName        string `json:"brandName"`                      //品牌名字
 	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 {
 			return nil, "获取门店品牌信息失败", err
 		}
+		//获取门店每周评分
+		//storeScore, err := misc.GetWeeklyStoreScore(v.ID, 0)
+
 		storeInfo := StoreInfo{
 			StoreID:    v.ID,
 			StoreName:  v.Name,

business/partner/delivery/sfps/waybill.go

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