Merge remote-tracking branch 'origin/mark' into su

2020-01-07 18:26:12 +08:00
parent 28c75def4e 7183d58554
commit 8429a1e68a
5 changed files with 23 additions and 7 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -170,7 +170,8 @@ func BuyerCancelOrder(ctx *jxcontext.Context, orderID int64, reason string) (can
 				canceled = true
 			}
 		} else {
-			err = changeOrderStatus(utils.Int64ToStr(orderID), model.OrderStatusApplyCancel, fmt.Sprintf("用户%s主动取消", ctx.GetUserName()))
+			err = fmt.Errorf("暂不支持自行取消订单，请联系商家取消")
+			// err = changeOrderStatus(utils.Int64ToStr(orderID), model.OrderStatusApplyCancel, fmt.Sprintf("用户%s主动取消", ctx.GetUserName()))
 		}
 	}
 	return canceled, err