tj

src/jfw/front/dataExport.go

@@ -270,9 +270,13 @@ func (d *DataExport) DeleteOrder() error {
 			"user_id": userId.(string),
 		}
 		flag := false
-		order := public.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time", "")
+		order := public.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
 		if order != nil {
-			flag = pay.CloseDataExportOrder(util.ObjToString((*order)["pay_way"]), util.ObjToString((*order)["out_trade_no"]), util.ObjToString((*order)["prepay_time"]))
+			if util.IntAll((*order)["order_status"]) == 0 { //未支付状态下 删除订单需要先关闭订单
+				flag = pay.CloseDataExportOrder(util.ObjToString((*order)["pay_way"]), util.ObjToString((*order)["out_trade_no"]), util.ObjToString((*order)["prepay_time"]))
+			} else {
+				flag = true
+			}
 		}
 		if flag {
 			flag = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})