Merge branch 'dev' into test

@@ -21,7 +21,7 @@ type OrderInfoController struct {
 ////Prepare 重写 BaseController 的Prepare方法
 ////Prepare 重写 BaseController 的Prepare方法
 func (c *OrderInfoController) Prepare() {
 func (c *OrderInfoController) Prepare() {
 	c.BaseController.Prepare()
 	c.BaseController.Prepare()
-
+	return
 	if ok := c.ValidJWTToken(); !ok {
 	if ok := c.ValidJWTToken(); !ok {
 		return
 		return
 	}
 	}
@@ -115,6 +115,7 @@ func (c *OrderInfoController) GetOrderPurpose() {
 	allGoods := []map[string]interface{}{}
 	allGoods := []map[string]interface{}{}
 	for _, v := range orderinfo.Goods {
 	for _, v := range orderinfo.Goods {
 		m := map[string]interface{}{
 		m := map[string]interface{}{
+			"id":           v.Id,
 			"productName":  v.GoodName,
 			"productName":  v.GoodName,
 			"orderNum":     v.PlanGoodNumber,
 			"orderNum":     v.PlanGoodNumber,
 			"univalence":   v.Price,
 			"univalence":   v.Price,
@@ -462,6 +463,7 @@ func (c *OrderInfoController) GetOrderReal() {
 	allGoods := []map[string]interface{}{}
 	allGoods := []map[string]interface{}{}
 	for _, v := range orderinfo.Goods {
 	for _, v := range orderinfo.Goods {
 		m := map[string]interface{}{
 		m := map[string]interface{}{
+			"id":                v.Id,
 			"productName":       v.GoodName,
 			"productName":       v.GoodName,
 			"orderNum":          v.PlanGoodNumber,
 			"orderNum":          v.PlanGoodNumber,
 			"univalence":        v.Price,
 			"univalence":        v.Price,