订单合并前

This commit is contained in:
苏尹岚
2020-09-01 17:29:20 +08:00
parent d69a91a02a
commit 05b6df6700

View File

@@ -1590,14 +1590,14 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// fmt.Println("deleteList2", deleteList)
// cms.DeletedDuplicateWaitAuditData(ctx, dao.GetDB())
type tmp struct {
JdID string `json:"jdID"`
S float64 `json:"s"`
JdID string `json:"jdID"`
S int `json:"s"`
}
type SpecialtyStoreSkus struct {
StoreID int `json:"门店ID"`
StoreName string `json:"门店名"`
City string `json:"城市"`
Area float64 `json:"面积"`
StoreID int `json:"门店ID"`
StoreName string `json:"门店名"`
City string `json:"城市"`
Area int `json:"面积"`
}
var (
ss []*tmp
@@ -1622,7 +1622,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
strs := strings.Split(station.DeliveryRange, ";")
ss = append(ss, &tmp{
JdID: v.VendorStoreID,
S: math.Round(jxutils.ComputeSignedArea(strs[:len(strs)-1])),
S: utils.Float64TwoInt(math.Ceil((jxutils.ComputeSignedArea(strs[:len(strs)-1])))),
})
}
}