提交

service/orderService.go

@@ -112,70 +112,68 @@ func (s OrderService) UpdateOrder(in *jyOrder.Request) (int64, string) {
 	if err0 != nil {
 		log.Panicln("事务开启失败：", err0)
 	}
-	order := &entity.UpdateOrder{}
-	order.Pay_money = in.PayMoney
-	order.Order_money = in.OrderMoney
-	order.User_nickname = in.UserNickname
-	order.Pay_time = util.ConversionDateTime(in.PayTime)
-	order.Order_status = in.OrderStatus
-	order.Create_time = util.ConversionDateTime(in.CreateTime)
-	order.User_openid = in.UserOpenid
-	order.Service_status = in.ServiceStatus
-	order.Filter = in.Filter
-	order.Prepay_id = in.PrepayId
-	order.Code_url = in.CodeUrl
-	order.Out_trade_no = in.OutTradeNo
-	order.Filter_keys = in.FilterKeys
-	order.Filter_publishtime = util.ConversionDateTime(in.FilterPublishtime)
-	order.Data_count = in.DataCount
-	order.User_mail = in.UserMail
-	order.Data_spec = in.DataSpec
-	order.Original_price = in.OriginalPrice
-	order.Order_code = in.OrderCode
-	order.Prepay_time = util.ConversionDateTime(in.PrepayTime)
-	order.Product_type = in.ProductType
-	order.Filter_id = in.FilterId
-	order.Pay_way = in.PayWay
-	order.User_phone = in.UserPhone
-	order.Applybill_status = in.ApplybillStatus
-	order.Download_url = in.DownloadUrl
-	order.Applybill_type = in.ApplybillType
-	order.Applybill_taxnum = in.ApplybillTaxnum
-	order.Applybill_company = in.ApplybillCompany
-	order.User_id = in.UserId
-	order.Vip_starttime = util.ConversionDateTime(in.VipStarttime)
-	order.Vip_endtime = util.ConversionDateTime(in.VipEndtime)
-	order.Vip_type = in.VipType
-	order.Course_status = in.CourseStatus
-	order.Dis_word = in.DisWord
-	order.Discount_price = in.DiscountPrice
-	order.D_relation_id = in.DRelationId
-	order.Return_status = in.ReturnStatus
-	order.Refund_status = in.RefundStatus
-	order.Is_backstage_order = in.IsBackstageOrder
-	order.Salesperson = in.Salesperson
-	order.Company_name = in.CompanyName
-	order.BillingMode = in.BillingMode
-	order.Sale_time = util.ConversionDateTime(in.SaleTime)
+	order := map[string]interface{}{}
+	order["pay_money"] = in.PayMoney
+	order["order_money"] = in.OrderMoney
+	order["user_nickname"] = in.UserNickname
+	order["order_status"] = in.OrderStatus
+	order["create_time"] = util.If(in.CreateTime == "", nil, in.CreateTime)
+	order["user_openid"] = in.UserOpenid
+	order["service_status"] = in.ServiceStatus
+	order["filter"] = in.Filter
+	order["prepay_id"] = in.PrepayId
+	order["code_url"] = in.CodeUrl
+	order["out_trade_no"] = in.OutTradeNo
+	order["filter_keys"] = in.FilterKeys
+	order["filter_publishtime"] = util.If(in.FilterPublishtime == "", nil, in.FilterPublishtime)
+	order["data_count"] = in.DataCount
+	order["user_mail"] = in.UserMail
+	order["data_spec"] = in.DataSpec
+	order["original_price"] = in.OriginalPrice
+	order["product_type"] = in.ProductType
+	order["filter_id"] = in.FilterId
+	order["pay_way"] = in.PayWay
+	order["user_phone"] = in.UserPhone
+	order["applybill_status"] = in.ApplybillStatus
+	order["download_url"] = in.DownloadUrl
+	order["applybill_type"] = in.ApplybillType
+	order["applybill_taxnum"] = in.ApplybillTaxnum
+	order["applybill_company"] = in.ApplybillCompany
+	order["user_id"] = in.UserId
+	order["vip_starttime"] = util.If(in.VipStarttime == "", nil, in.VipStarttime)
+	order["vip_endtime"] = util.If(in.VipEndtime == "", nil, in.VipEndtime)
+	order["vip_type"] = in.VipType
+	order["course_status"] = in.CourseStatus
+	order["dis_word"] = in.DisWord
+	order["discount_price"] = in.DiscountPrice
+	order["d_relation_id"] = in.DRelationId
+	order["return_status"] = in.ReturnStatus
+	order["refund_status"] = in.RefundStatus
+	order["is_backstage_order"] = in.IsBackstageOrder
+	order["salesperson"] = in.Salesperson
+	order["company_name"] = in.CompanyName
+	order["billingMode"] = in.BillingMode
+	order["sale_time"] = util.If(in.SaleTime == "", nil, in.SaleTime)
 	if in.EntryTime != "" {
-		order.Entry_time = util.ConversionDateTime(in.EntryTime)
+		order["entry_time"] = util.If(in.EntryTime == "", nil, in.EntryTime)
 	}
-	order.Commission = in.Commission
-	order.ProceduresMoney = in.ProceduresMoney
-	order.DistributionChannel = in.SalesChannel
-	order.OrderChannel = in.OrderChannel
-	order.SigningSubject = in.PaybackCompany
-	order.SalespersonId = in.SalespersonId
-	order.CreatePerson = in.CreatePerson
-	order.LastUpdatePerson = in.LastUpdatePerson
-	order.LastUpdateTime = in.LastUpdateTime
+	order["commission"] = in.Commission
+	order["procedures_money"] = in.ProceduresMoney
+	order["distribution_channel"] = in.SalesChannel
+	order["order_channel"] = in.OrderChannel
+	order["signing_subject"] = in.PaybackCompany
+	order["salesperson_id"] = in.SalespersonId
+	order["create_person"] = in.CreatePerson
+	order["last_update_time"] = util.If(in.LastUpdateTime == "", nil, in.LastUpdateTime)
+	order["last_update_person"] = in.LastUpdatePerson
 	numb, err := orm.Table("dataexport_order").Where(map[string]interface{}{
 		"order_code": in.OrderCode,
 	}).Update(order)
 	log.Println(numb, err)
 	if err != nil {
 		log.Panicln("订单修改失败：", err)
-		_ := orm.Rollback()
+
+		orm.Rollback()
 		return entity.ErrorCode, "订单修改失败"
 	}
 	orm.Commit()

util/common.go

@@ -10,3 +10,11 @@ func ConversionDateTime(conver string) time.Time {
 	patroTime, _ := time.ParseInLocation(timeLayoutStr, conver, time.Local)
 	return patroTime
 }
+
+func If(b bool, to, fo interface{}) interface{} {
+	if b {
+		return to
+	} else {
+		return fo
+	}
+}