解决冲突

service/orderService.go

@@ -22,6 +22,9 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	}
 	order := map[string]interface{}{}
 	order["pay_money"] = in.PayMoney
+	order["buy_subject"] = in.BuySubject
+	order["ent_id"] = in.EntId
+	order["buy_count"] = in.BuyCount
 	order["order_money"] = in.OrderMoney
 	order["user_nickname"] = in.UserNickname
 	order["order_status"] = in.OrderStatus
@@ -120,6 +123,9 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	}
 	order := map[string]interface{}{}
 	order["pay_money"] = in.PayMoney
+	order["buy_subject"] = in.BuySubject
+	order["ent_id"] = in.EntId
+	order["buy_count"] = in.BuyCount
 	order["order_money"] = in.OrderMoney
 	order["user_nickname"] = in.UserNickname
 	order["order_status"] = in.OrderStatus