|
@@ -185,7 +185,7 @@ func (c *GoodsController) GetOrdersByRecord() {
|
185
|
185
|
strconv.Itoa(good.Number),
|
186
|
186
|
good.Price,
|
187
|
187
|
})
|
188
|
|
- allnum = allnum + good.Number
|
|
188
|
+
|
189
|
189
|
price, err := strconv.ParseFloat(good.Price, 64)
|
190
|
190
|
if err != nil {
|
191
|
191
|
c.ResponseError(errors.New("金额类型不正确!"))
|
|
@@ -195,7 +195,10 @@ func (c *GoodsController) GetOrdersByRecord() {
|
195
|
195
|
// c.ResponseError(errors.New("金额类型不正确!"))
|
196
|
196
|
// }
|
197
|
197
|
charge := price * float64(good.Number)
|
198
|
|
- amount = amount + charge
|
|
198
|
+ if order.MakeStatus != goods.MAKESTATUS_CANCEL {
|
|
199
|
+ amount = amount + charge
|
|
200
|
+ allnum = allnum + good.Number
|
|
201
|
+ }
|
199
|
202
|
|
200
|
203
|
excel.SetCell(row, strconv.FormatFloat(charge, 'f', -1, 64))
|
201
|
204
|
|