提交

entity/order.go

@@ -73,6 +73,63 @@ type Order struct {
 	LastUpdatePerson    string    `xorm:"last_update_person" form:"last_update_person" json:"last_update_person"`
 }
 
+//订单
+type UpdateOrder struct {
+	Pay_money           int64     `xorm:"pay_money" form:"pay_money" json:"pay_money"`
+	Order_money         int64     `xorm:"order_money" form:"order_money" json:"order_money"`
+	User_nickname       string    `xorm:"user_nickname" form:"user_nickname" json:"user_nickname"`
+	Pay_time            time.Time `xorm:"pay_time" form:"pay_time" json:"pay_time"`
+	Order_status        int64     `xorm:"order_status" form:"order_status" json:"order_status"`
+	Create_time         time.Time `xorm:"create_time" form:"create_time" json:"create_time"`
+	User_openid         string    `xorm:"user_openid" form:"user_openid" json:"user_openid"`
+	Service_status      int64     `xorm:"service_status" form:"service_status" json:"service_status"`
+	Filter              string    `xorm:"filter" form:"filter" json:"filter"`
+	Prepay_id           string    `xorm:"prepay_id" form:"prepay_id" json:"prepay_id"`
+	Code_url            string    `xorm:"code_url" form:"code_url" json:"code_url"`
+	Out_trade_no        string    `xorm:"out_trade_no" form:"out_trade_no" json:"out_trade_no"`
+	Filter_keys         string    `xorm:"filter_keys" form:"filter_keys" json:"filter_keys"`
+	Filter_publishtime  time.Time `xorm:"filter_publishtime" form:"filter_publishtime" json:"filter_publishtime"`
+	Data_count          int64     `xorm:"data_count" form:"data_count" json:"data_count"`
+	User_mail           string    `xorm:"user_mail" form:"user_mail" json:"user_mail"`
+	Data_spec           string    `xorm:"data_spec" form:"data_spec" json:"data_spec"`
+	Original_price      int64     `xorm:"original_price" form:"original_price" json:"original_price"`
+	Order_code          string    `xorm:"order_code" form:"order_code" json:"order_code"`
+	Prepay_time         time.Time `xorm:"prepay_time" form:"prepay_time" json:"prepay_time"`
+	Product_type        string    `xorm:"product_type" form:"product_type" json:"product_type"`
+	Filter_id           string    `xorm:"filter_id" form:"filter_id" json:"filter_id"`
+	Pay_way             string    `xorm:"pay_way" form:"pay_way" json:"pay_way"`
+	User_phone          string    `xorm:"user_phone" form:"user_phone" json:"user_phone"`
+	Applybill_status    int64     `xorm:"applybill_status" form:"applybill_status" json:"applybill_status"`
+	Download_url        string    `xorm:"download_url" form:"download_url" json:"download_url"`
+	Applybill_type      int64     `xorm:"applybill_type" form:"applybill_type" json:"applybill_type"`
+	Applybill_taxnum    string    `xorm:"applybill_taxnum" form:"applybill_taxnum" json:"applybill_taxnum"`
+	Applybill_company   string    `xorm:"applybill_company" form:"applybill_company" json:"applybill_company"`
+	User_id             string    `xorm:"user_id" form:"user_id" json:"user_id"`
+	Vip_starttime       time.Time `xorm:"vip_starttime" form:"vip_starttime" json:"vip_starttime"`
+	Vip_endtime         time.Time `xorm:"vip_endtime" form:"vip_endtime" json:"vip_endtime"`
+	Vip_type            int64     `xorm:"vip_type" form:"vip_type" json:"vip_type"`
+	Course_status       int64     `xorm:"course_status" form:"course_status" json:"course_status"`
+	Dis_word            string    `xorm:"dis_word" form:"dis_word" json:"dis_word"`
+	Discount_price      int64     `xorm:"discount_price" form:"discount_price" json:"discount_price"`
+	D_relation_id       string    `xorm:"d_relation_id" form:"d_relation_id" json:"d_relation_id"`
+	Return_status       int64     `xorm:"return_status" form:"return_status" json:"return_status"`
+	Refund_status       int64     `xorm:"refund_status" form:"refund_status" json:"refund_status"`
+	Is_backstage_order  int64     `xorm:"is_backstage_order" form:"is_backstage_order" json:"is_backstage_order"`
+	Salesperson         string    `xorm:"salesperson" form:"salesperson" json:"salesperson"`
+	Company_name        string    `xorm:"company_name" form:"company_name" json:"company_name"`
+	BillingMode         int64     `xorm:"billingMode" form:"billingMode" json:"billingMode"`
+	Sale_time           time.Time `xorm:"sale_time" form:"sale_time" json:"sale_time"`                                  //销售时间
+	Entry_time          time.Time `xorm:"entry_time" form:"entry_time" json:"entry_time"`                               //录入时间
+	Commission          int64     `xorm:"commission" form:"commission" json:"commission"`                               //佣金
+	ProceduresMoney     int64     `xorm:"procedures_money" form:"procedures_money" json:"procedures_money"`             //手续费
+	DistributionChannel string    `xorm:"distribution_channel" form:"distribution_channel" json:"distribution_channel"` //销售渠道
+	OrderChannel        string    `xorm:"order_channel" form:"order_channel" json:"order_channel"`                      //下单渠道
+	SigningSubject      string    `xorm:"signing_subject" form:"signing_subject" json:"signing_subject"`                //回款公司
+	SalespersonId       int64     `xorm:"salesperson_id" form:"salesperson_id" json:"salesperson_id"`                   //回款公司
+	CreatePerson        string    `xorm:"create_person" form:"create_person" json:"create_person"`                      //回款公司
+	LastUpdateTime      string    `xorm:"last_update_time" form:"last_update_time" json:"last_update_time"`
+	LastUpdatePerson    string    `xorm:"last_update_person" form:"last_update_person" json:"last_update_person"`
+}
 type OrderDetailed struct {
 	Id          int64     `xorm:"pk autoincr id" form:"id" json:"id"`
 	Order_id    int64     `xorm:"order_id" form:"order_id" json:"order_id"`

rpc/jyorder.go

@@ -42,9 +42,10 @@ func init() {
 	var err error
 	log.Println(config.ConfigJson.DataSource)
 	entity.Engine, err = xorm.NewEngine("mysql", config.ConfigJson.DataSource)
+	entity.Engine.ShowSQL(true)
 	//entity.Engine.ShowSQL(true)
 	if err != nil {
 		log.Fatal("数据库连接失败:", err)
 	}
-	fmt.Println(config.ConfigJson.DataSource+"链接成功")
-}
+	fmt.Println(config.ConfigJson.DataSource + "链接成功")
+}

service/orderService.go

@@ -79,7 +79,7 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 		orm.Rollback()
 		return entity.ErrorCode, "创建订单失败", entity.ErrorCode
 	}
-	orm.Commit()
+	_ = orm.Commit()
 	log.Println("order.Id:", order.Id)
 	return entity.SuccessCode, "创建订单成功", order.Id
 }
@@ -99,10 +99,10 @@ func (s OrderService) CreateOrderDetailed(in *jyOrder.RequestDetailed) (int64, s
 	numb, err := orm.Table("dataexport_order_detailed").Insert(orderDetailed)
 	if err != nil || numb == int64(0) {
 		log.Panicln("创建订单明细失败：", err)
-		orm.Rollback()
+		_ = orm.Rollback()
 		return entity.ErrorCode, "创建订单明细失败", entity.ErrorCode
 	}
-	orm.Commit()
+	_ = orm.Commit()
 	return entity.SuccessCode, "创建订单明细成功", orderDetailed.Id
 }
 func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
@@ -112,7 +112,7 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	if err0 != nil {
 		log.Panicln("事务开启失败：", err0)
 	}
-	order := &entity.Order{}
+	order := &entity.UpdateOrder{}
 	order.Pay_money = in.PayMoney
 	order.Order_money = in.OrderMoney
 	order.User_nickname = in.UserNickname
@@ -175,7 +175,7 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	log.Println(numb, err)
 	if err != nil {
 		log.Panicln("订单修改失败：", err)
-		orm.Rollback()
+		_ := orm.Rollback()
 		return entity.ErrorCode, "订单修改失败"
 	}
 	orm.Commit()