|
|
@@ -843,7 +843,7 @@ func (self *OrderController) Operate() {
|
|
|
if operate == order_model.OPERATE_CONFIRM && o.Status == order_model.STATUS_DISPATCH {
|
|
|
o.Status = order_model.STATUS_COMPLETE
|
|
|
o.ReceiveTime = time.Now()
|
|
|
- } else if operate == order_model.OPERATE_CANCEL && o.Status == order_model.STATUS_UNPAY {
|
|
|
+ } else if operate == order_model.OPERATE_CANCEL && (o.Status == order_model.STATUS_UNPAY || o.Status == order_model.STATUS_PROCESSING) {
|
|
|
o.Status = order_model.STATUS_CLOSED
|
|
|
}
|
|
|
|
|
|
@@ -940,7 +940,7 @@ func (self *OrderController) httpRequest(wxId, total int64, orderId, transaction
|
|
|
|
|
|
if refund != nil {
|
|
|
// 构造请求 URL
|
|
|
- reqURL := fmt.Sprintf("%s?id=%d", url, refund.Id)
|
|
|
+ reqURL := fmt.Sprintf("%sid=%d", url, refund.Id)
|
|
|
|
|
|
// 发送 GET 请求
|
|
|
resp, err := http.Get(reqURL)
|
