时间处理

api/internal/types/types.go

@@ -2,10 +2,10 @@
 package types
 
 type Request struct {
-	Pay_money           int64  `form:"pay_money"`
-	Order_money         int64  `form:"order_money"`
+	Pay_money           int64  `form:"pay_money,optional"`
+	Order_money         int64  `form:"order_money,optional"`
 	User_nickname       int64  `form:"user_nickname,optional"`
-	Pay_time            string `form:"pay_time"`
+	Pay_time            string `form:"pay_time,optional"`
 	Order_status        int64  `form:"order_status"`
 	Create_time         string `form:"create_time"`
 	User_openid         string `form:"user_openid,optional"`
@@ -33,9 +33,9 @@ type Request struct {
 	Applybill_taxnum    string `form:"applybill_taxnum,optional"`
 	Remind_status       int64  `form:"remind_status,optional"`
 	Applybill_company   string `form:"applybill_company,optional"`
-	User_id             string `form:"user_id"`
-	Vip_starttime       string `form:"vip_starttime"`
-	Vip_endtime         string `form:"vip_endtime"`
+	User_id             string `form:"user_id,optional"`
+	Vip_starttime       string `form:"vip_starttime,optional"`
+	Vip_endtime         string `form:"vip_endtime,optional"`
 	Vip_type            int64  `form:"vip_type,optional"`
 	Course_status       int64  `form:"course_status,optional"`
 	Apply_refund_name   string `form:"apply_refund_name,optional"`
@@ -46,10 +46,10 @@ type Request struct {
 	Dis_word            string `form:"dis_word,optional"`
 	Discount_price      int64  `form:"discount_price,optional"`
 	D_relation_id       string `form:"d_relation_id,optional"`
-	Return_status       int64  `form:"return_status"`
-	Refund_status       int64  `form:"refund_status"`
-	Is_backstage_order  int64  `form:"is_backstage_order"`
-	Salesperson         string `form:"salesperson"`
+	Return_status       int64  `form:"return_status,optional"`
+	Refund_status       int64  `form:"refund_status,optional"`
+	Is_backstage_order  int64  `form:"is_backstage_order,optional"`
+	Salesperson         string `form:"salesperson,optional"`
 	Company_name        string `form:"company_name,optional"`
 	BillingMode         int64  `form:"billingMode,optional"`
 }

api/jyOrder.api

@@ -9,10 +9,10 @@ info(
 
 type request {
 	// TODO: add members here and delete this comment
-	Pay_money           int64  `form:"pay_money"`
-	Order_money         int64  `form:"order_money"`
+	Pay_money           int64  `form:"pay_money,optional"`
+	Order_money         int64  `form:"order_money,optional"`
 	User_nickname       int64  `form:"user_nickname,optional"`
-	Pay_time            string `form:"pay_time"`
+	Pay_time            string `form:"pay_time,optional"`
 	Order_status        int64  `form:"order_status"`
 	Create_time         string `form:"create_time"`
 	User_openid         string `form:"user_openid,optional"`
@@ -40,9 +40,9 @@ type request {
 	Applybill_taxnum    string `form:"applybill_taxnum,optional"`
 	Remind_status       int64  `form:"remind_status,optional"`
 	Applybill_company   string `form:"applybill_company,optional"`
-	User_id             string `form:"user_id"`
-	Vip_starttime       string `form:"vip_starttime"`
-	Vip_endtime         string `form:"vip_endtime"`
+	User_id             string `form:"user_id,optional"`
+	Vip_starttime       string `form:"vip_starttime,optional"`
+	Vip_endtime         string `form:"vip_endtime,optional"`
 	Vip_type            int64  `form:"vip_type,optional"`
 	Course_status       int64  `form:"course_status,optional"`
 	Apply_refund_name   string `form:"apply_refund_name,optional"`
@@ -53,10 +53,10 @@ type request {
 	Dis_word            string `form:"dis_word,optional"`
 	Discount_price      int64  `form:"discount_price,optional"`
 	D_relation_id       string `form:"d_relation_id,optional"`
-	Return_status       int64  `form:"return_status"`
-	Refund_status       int64  `form:"refund_status"`
-	Is_backstage_order  int64  `form:"is_backstage_order"`
-	Salesperson         string `form:"salesperson"`
+	Return_status       int64  `form:"return_status,optional"`
+	Refund_status       int64  `form:"refund_status,optional"`
+	Is_backstage_order  int64  `form:"is_backstage_order,optional"`
+	Salesperson         string `form:"salesperson,optional"`
 	Company_name        string `form:"company_name,optional"`
 	BillingMode         int64  `form:"billingMode,optional"`
 }

entity/order.go

@@ -2,6 +2,7 @@ package entity
 
 import (
 	"github.com/go-xorm/xorm"
+	"time"
 )
 
 //定义orm引擎
@@ -15,56 +16,56 @@ const (
 
 //订单
 type Order struct {
-	Id                 int64  `xorm:"pk autoincr id" form:"id" json:"id"`
-	Pay_money          int64  `xorm:"pay_money" form:"pay_money" json:"pay_money"`
-	Order_money        int64  `xorm:"order_money" form:"order_money" json:"order_money"`
-	Pay_time           string `xorm:"pay_time" form:"pay_time" json:"pay_time"`
-	Order_status       int64  `xorm:"order_status" form:"order_status" json:"order_status"`
-	Create_time        string `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 string `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        string `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      string `xorm:"vip_starttime" form:"vip_starttime" json:"vip_starttime"`
-	Vip_endtime        string `xorm:"vip_endtime" form:"vip_endtime" json:"vip_endtime"`
-	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"`
+	Id                 int64     `xorm:"pk autoincr id" form:"id" json:"id"`
+	Pay_money          int64     `xorm:"pay_money" form:"pay_money" json:"pay_money"`
+	Order_money        int64     `xorm:"order_money" form:"order_money" json:"order_money"`
+	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"`
+	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"`
 	/*Payment_type       int64  `xorm:"payment_type" form:"payment_type" json:"payment_type"`
 	Source_order_id    int64  `xorm:"source_order_id" form:"source_order_id" json:"source_order_id"`*/
 }
 
 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"`
-	Relation_id int64  `xorm:"relation_id" form:"relation_id" json:"relation_id"`
-	Operator    string `xorm:"operator" form:"operator" json:"operator"`
-	Sale_time   string `xorm:"sale_time" form:"sale_time" json:"sale_time"`
+	Id          int64     `xorm:"pk autoincr id" form:"id" json:"id"`
+	Order_id    int64     `xorm:"order_id" form:"order_id" json:"order_id"`
+	Relation_id int64     `xorm:"relation_id" form:"relation_id" json:"relation_id"`
+	Operator    string    `xorm:"operator" form:"operator" json:"operator"`
+	Sale_time   time.Time `xorm:"sale_time" form:"sale_time" json:"sale_time"`
 }

service/orderService.go

@@ -3,6 +3,7 @@ package service
 import (
 	"app.yhyue.com/moapp/jyOrder/entity"
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
+	"app.yhyue.com/moapp/jyOrder/util"
 	"log"
 )
 
@@ -18,9 +19,9 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	order := &entity.Order{}
 	order.Pay_money = in.PayMoney
 	order.Order_money = in.OrderMoney
-	order.Pay_time = in.PayTime
+	order.Pay_time = util.ConversionDateTime(in.PayTime)
 	order.Order_status = in.OrderStatus
-	order.Create_time = in.CreateTime
+	order.Create_time = util.ConversionDateTime(in.CreateTime)
 	order.User_openid = in.UserOpenid
 	order.Service_status = in.ServiceStatus
 	order.Filter = in.Filter
@@ -28,13 +29,13 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	order.Code_url = in.CodeUrl
 	order.Out_trade_no = in.OutTradeNo
 	order.Filter_keys = in.FilterKeys
-	order.Filter_publishtime = in.FilterPublishtime
+	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 = in.PrepayTime
+	order.Prepay_time = util.ConversionDateTime(in.PrepayTime)
 	order.Product_type = in.ProductType
 	order.Filter_id = in.FilterId
 	order.Pay_way = in.PayWay
@@ -45,8 +46,8 @@ func (s OrderService) CreateOrder(in *jyOrder.Request) (int64, string, int64) {
 	order.Applybill_taxnum = in.ApplybillTaxnum
 	order.Applybill_company = in.ApplybillCompany
 	order.User_id = in.UserId
-	order.Vip_starttime = in.VipStarttime
-	order.Vip_endtime = in.VipEndtime
+	order.Vip_starttime = util.ConversionDateTime(in.VipStarttime)
+	order.Vip_endtime = util.ConversionDateTime(in.VipEndtime)
 	order.Course_status = in.CourseStatus
 	order.Dis_word = in.DisWord
 	order.Discount_price = in.DiscountPrice
@@ -80,7 +81,7 @@ func (s OrderService) CreateOrderDetailed(in *jyOrder.RequestDetailed) (int64, s
 	orderDetailed.Order_id = in.OrderId
 	orderDetailed.Relation_id = in.RelationId
 	orderDetailed.Operator = in.Operator
-	orderDetailed.Sale_time = in.SaleTime
+	orderDetailed.Sale_time = util.ConversionDateTime(in.SaleTime)
 	numb, err := orm.Table("dataexport_order_detailed").Insert(orderDetailed)
 	if err != nil || numb == int64(0) {
 		log.Panicln("创建订单明细失败：", err)

util/common.go

@@ -0,0 +1,12 @@
+package util
+
+import "time"
+
+const TimeFormat = "2006-01-02 15:04:05"
+
+func ConversionDateTime(conver string) time.Time {
+	//日期转化为时间
+	var timeLayoutStr = TimeFormat
+	patroTime, _ := time.ParseInLocation(timeLayoutStr, conver, time.Local)
+	return patroTime
+}