Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/model/order.go

@@ -1,6 +1,8 @@
 package model
 
 import (
+	"fmt"
+	"git.rosy.net.cn/baseapi/utils"
 	"time"
 )
 
@@ -324,6 +326,11 @@ func Waybill2Status(bill *Waybill) (retVal *OrderStatus) {
 		StatusTime:       bill.StatusTime,
 		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
 }