Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -6205,6 +6205,12 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_ways := c.GetString("pay_ways")
 
+	cash_pay := c.GetString("cash_pay")
+	band_card_pay := c.GetString("band_card_pay")
+	wechat_pay := c.GetString("wechat_pay")
+	ali_pay := c.GetString("ali_pay")
+	jifen_pay := c.GetString("jifen_pay")
+
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 	discount_price, _ := c.GetFloat("discount_price")
@@ -6529,6 +6535,11 @@ func (c *HisApiController) GetUploadInfo() {
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
 			Decimal:               decimal,
 			OthDesc:               oth_desc,
+			CashPay:               cash_pay,
+			WechatPay:             wechat_pay,
+			AliPay:                ali_pay,
+			JifenPay:              jifen_pay,
+			BandCardPay:           band_card_pay,
 		}
 		err = service.CreateOrderTX(order, tx)
 		if err != nil {

models/his_charge_models.go

@@ -172,6 +172,13 @@ type HisChargeSettleOrder struct {
 	SettleStartTime     int64   `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime       int64   `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+
+	CashPay     string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay   string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay      string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay    string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+	OthDesc     string `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
 }
 
 func (HisChargeSettleOrder) TableName() string {

models/his_models.go

@@ -1044,6 +1044,12 @@ type HisOrder struct {
 	OthDesc               string  `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
 	PayWays               string  `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
+	CashPay     string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay   string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay      string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay    string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`