Merge branch 'ht_3.3_payment' into debug

common/contants/sys_config_enum.go

@@ -13,18 +13,22 @@ const (
 const (
 	// configCode
 
-	HTCPELoginUrl     = "HtCpeLoginUrl"
-	ChartLibUrlPrefix = "ChartLibUrlPrefix"
-	ShowMediaView     = "ShowMediaView"
-	PaymentWay        = "PaymentWay"
+	HTCPELoginUrl       = "HtCpeLoginUrl"
+	ChartLibUrlPrefix   = "ChartLibUrlPrefix"
+	ShowMediaView       = "ShowMediaView"
+	PaymentWay          = "PaymentWay"
+	HTCPEOpenAccountUrl = "HTCPEOpenAccountUrl"
+	HTCPEIdUpdateUrl    = "HTCPEIdUpdateUrl"
 )
 
 // SysConfigMap 用于存储错误码和错误信息的映射
 var SysConfigMap = map[string]*Config{
-	HTCPELoginUrl:     {ConfigId: 1000, ConfigType: ConfigTypeStr},
-	ShowMediaView:     {ConfigId: 1001, ConfigType: ConfigTypeInt},
-	ChartLibUrlPrefix: {ConfigId: 1002, ConfigType: ConfigTypeStr},
-	PaymentWay:        {ConfigId: 1003, ConfigType: ConfigTypeStr},
+	HTCPELoginUrl:       {ConfigId: 1000, ConfigType: ConfigTypeStr},
+	ShowMediaView:       {ConfigId: 1001, ConfigType: ConfigTypeInt},
+	ChartLibUrlPrefix:   {ConfigId: 1002, ConfigType: ConfigTypeStr},
+	PaymentWay:          {ConfigId: 1003, ConfigType: ConfigTypeStr},
+	HTCPEOpenAccountUrl: {ConfigId: 1004, ConfigType: ConfigTypeStr},
+	HTCPEIdUpdateUrl:    {ConfigId: 1005, ConfigType: ConfigTypeStr},
 }
 
 func GetConfig(code string) *Config {

service/facade/ht_trade_service.go

@@ -12,9 +12,10 @@ import (
 )
 
 const (
-	channelWeChat    = "7"
-	timeoutSeconds   = "900"
-	BeforeOrderClose = 1 * time.Second
+	channelWeChat      = "7"
+	timeoutSeconds     = "900"
+	BeforeOrderClose   = 1 * time.Second
+	DefaultDescription = "期海通行"
 )
 
 var (
@@ -44,6 +45,10 @@ func PayOrder(userId, templateUserId int, productOrder order.ProductOrderDTO) (p
 		logger.Error("创建支付订单失败:%v", err)
 		return
 	}
+	description := productOrder.ProductDescription
+	if description == "" {
+		description = DefaultDescription
+	}
 	payOrderDTO.TradeOrderNo = tradeOrderNo
 	payOrderDTO.AppId = htConfig.GetPaymentAppId()
 	payOrderDTO.Url = htConfig.GetPaymentApiUrl()
@@ -51,7 +56,7 @@ func PayOrder(userId, templateUserId int, productOrder order.ProductOrderDTO) (p
 	payOrderDTO.PaymentToken = token
 	payOrderDTO.ProductOrderNo = productOrder.OrderID
 	payOrderDTO.ProductTitle = productOrder.ProductName
-	payOrderDTO.ProductDescription = productOrder.ProductDescription
+	payOrderDTO.ProductDescription = description
 	//微信用户的ID
 	payOrderDTO.BuyerId = templateUserId
 	payOrderDTO.PayType = "1,2"