Kaynağa Gözat

feat : 附件下载包购买/中台接口

zhangxinlei1996 3 yıl önce
ebeveyn
işleme
93580035de

+ 133 - 3
src/jfw/modules/subscribepay/src/entity/commonApi.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"log"
 	"net/url"
+	qu "qfw/util"
+	"strings"
 )
 
 //充值
@@ -17,9 +19,11 @@ type PayStruct struct {
 	Spec         string                 //单位
 	EndTime      string                 //截止日期
 	Remarks      map[string]interface{} //备注
+	AppId        string                 //appId默认10000
+	VipTime      int64                  //超级订阅截止日期
 }
 
-func PurchasePay(userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}) *PayStruct {
+func InitPurchase(userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}, vipEndTime int64) *PayStruct {
 	return &PayStruct{
 		AccountId:    userId,
 		Name:         product,      //资源名称
@@ -28,6 +32,8 @@ func PurchasePay(userId, product, resourceType, num, spec, endTime string, remar
 		Spec:         spec,         //单位
 		EndTime:      endTime,      //截止日期
 		Remarks:      remarks,      //备注
+		AppId:        config.CouponConfig.AppId,
+		VipTime:      vipEndTime,
 	}
 }
 
@@ -46,13 +52,137 @@ func (this *PayStruct) PurchaseUserBalance() (bool, error) {
 		"spec":         []string{this.Spec}, //规格*
 		"endTime":      []string{this.EndTime},
 		"remarks":      []string{string(remarkBytes)},
+		"appId":        []string{this.AppId},
+		"vipTime":      []string{fmt.Sprint("%v", this.VipTime)},
 	}
 	rmap, err := commonPost(config.JyApiConfig.ApiList.BuyBalance, param)
-	log.Println("purchase user balance ", rmap, err)
+	log.Println("BuyBalance post err: ", rmap, err)
 	if err != nil {
 		return false, err
 	}
 	return true, nil
 }
 
-//TODO 消费
+type FindBalanceStruct struct {
+	AccountId    string //账户标识
+	ResourceType string //产品类型
+}
+
+// @Summary 余额接口【数据流量包、附件下载包。。】
+// @Param  &FindBalanceStruct
+// @return map error
+func (this *FindBalanceStruct) FindBalance() (map[string]interface{}, error) {
+	param := url.Values{
+		"accountId":    []string{this.AccountId},
+		"resourceType": []string{this.ResourceType},
+	}
+	rmap, err := commonPost(config.JyApiConfig.ApiList.FindBalance, param)
+	if err != nil {
+		log.Println("FindBalance post err:", err)
+		return rmap, err
+	}
+	return rmap, err
+}
+
+//使用
+type UseBalanceStruct struct {
+	AccountId        string                 //账户标识
+	Name             string                 //资源名称
+	ResourceType     string                 //资源类型
+	Number           int                    //扣除数量
+	RuleId           string                 //规则标识
+	UserId           string                 //用户标识
+	AppId            string                 //默认10000
+	Remarks          map[string]interface{} //备注
+	DuplicateRemoval string                 //是否去重0不去1去重【数据流量包用到】
+	InfoId           []string               //数据Id,多个以逗号隔开【数据流量包用到】
+}
+
+//
+func InitUseBalance(userId, product, resourceType, ruleId, duplicateRemoval string, infoId []string, remarks map[string]interface{}, num int) *UseBalanceStruct {
+	return &UseBalanceStruct{
+		AccountId:        userId,
+		Name:             product,
+		ResourceType:     resourceType,
+		Number:           num,
+		RuleId:           ruleId,
+		UserId:           userId,
+		AppId:            config.CouponConfig.AppId,
+		Remarks:          remarks,          //备注
+		DuplicateRemoval: duplicateRemoval, //是否去重0不去1去重【数据流量包用到】
+		InfoId:           infoId,
+	}
+}
+
+// @Summary 使用接口【数据流量包、附件下载包。。】
+// @Param  &UseBalanceStruct
+// @return map error
+func (this *UseBalanceStruct) UseBalance() (map[string]interface{}, error) {
+	remarkBytes, err := json.Marshal(this.Remarks)
+	if err != nil {
+		return nil, fmt.Errorf("remark pase error")
+	}
+	resMap, err := commonPost(config.JyApiConfig.ApiList.UseBalance, url.Values{
+		"accountId":        []string{this.UserId},                    //账户标识
+		"name":             []string{this.Name},                      //资源名称
+		"resourceType":     []string{this.ResourceType},              //资源类型
+		"number":           []string{fmt.Sprintf("%d", this.Number)}, //扣除数量
+		"ruleId":           []string{this.RuleId},                    //规则标识
+		"userId":           []string{this.UserId},                    //用户标识
+		"remarks":          []string{string(remarkBytes)},            //备注 查询条件、下载地址、导出时间、导出条数
+		"infoId":           []string{strings.Join(this.InfoId, ",")}, //数据Id,多个以逗号隔开
+		"duplicateRemoval": []string{this.DuplicateRemoval},          //是否去重0不去1去重
+	})
+	if err != nil {
+		log.Println("UseBalance post err:", err)
+		return resMap, err
+	}
+	return resMap, err
+}
+
+//流水
+type FindRecordStruct struct {
+	AccountId    string //账户标识
+	UserId       string //用户标识
+	Name         string //资源名称
+	PageSize     int    //每页多少条
+	Page         int    //当前页
+	State        int    // 0 查消耗记录 1 查充值记录
+	ResourceType string //资源类型
+	QueryTime    string //查询时间 格式2022-01
+
+}
+
+//定义结构体
+func InitFindRecord(userId, resourceType, queryTime string, pageSize, pageNum, state int) *FindRecordStruct {
+	return &FindRecordStruct{
+		AccountId:    userId,
+		UserId:       userId,
+		PageSize:     pageSize,
+		Page:         pageNum,
+		State:        state, //0 查消耗记录 1 查充值记录
+		ResourceType: resourceType,
+		QueryTime:    queryTime,
+	}
+}
+
+// @Summary 流水接口【数据流量包、附件下载包。。】
+// @Param  &FindRecordStruct
+// @return list列表 , int数量 , error
+func (this *FindRecordStruct) FindBalance() ([]interface{}, int, error) {
+	resMap, err := commonPost(config.JyApiConfig.ApiList.FindRecord, url.Values{
+		"accountId":    []string{this.UserId},                      //账户标识
+		"userId":       []string{this.UserId},                      //用户标识
+		"pageSize":     []string{fmt.Sprintf("%d", this.PageSize)}, //每页多少条
+		"page":         []string{fmt.Sprintf("%d", this.Page)},     //当前页
+		"state":        []string{fmt.Sprintf("%d", this.State)},    // 0 查消耗记录 1 查充值记录
+		"resourceType": []string{this.ResourceType},
+		"queryTime":    []string{this.QueryTime}, //格式 2022-01
+	})
+	if err != nil {
+		return nil, -1, err
+	}
+	total := qu.IntAll(resMap["count"])
+	list, _ := resMap["data"].([]interface{})
+	return list, total, err
+}

+ 8 - 2
src/jfw/modules/subscribepay/src/entity/resourcePackStruct.go

@@ -49,8 +49,14 @@ func (this *resoucePackStruct) PayCallBack(param *CallBackParam) bool {
 				return false
 			}
 			go PayCancel(userId, ATTACHMENT, "")
-			okk, err := PurchasePay(userId, ATTACHMENT, ATTACHMENT, strconv.Itoa(qu.IntAll(filterM["num"])), "个",
-				qu.ObjToString(filterM["validTime"]), filterM).PurchaseUserBalance()
+			udata, errs := util.MQFW.FindOneByField("user", userId, `{"l_vip_endtime":1}`)
+			vipendtime := int64(0)
+			if udata != nil && errs {
+				vipendtime = qu.Int64All((*udata)["l_vip_endtime"])
+			}
+			//userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}, vipEndTime int64
+			okk, err := InitPurchase(userId, ATTACHMENT, ATTACHMENT, strconv.Itoa(qu.IntAll(filterM["num"])), "个",
+				qu.ObjToString(filterM["validTime"]), filterM, vipendtime).PurchaseUserBalance()
 			if !okk {
 				log.Printf("用户%sPurchaseUserBalance出错:%v", userId, (*orderData)["order_code"], err)
 				return false

+ 7 - 0
src/jfw/modules/subscribepay/src/pay/aliPay.go

@@ -35,6 +35,7 @@ type aliPayStruct struct {
 	Subject_integral       string          //剑鱼币支付小标题
 	Subject_dataPack       string          //数据包支付小标题
 	Subject_areaPack       string          //省份流量包支付小标题
+	Subject_filePack       string          //附件下载包支付小标题
 }
 
 var Alipay *aliPayStruct
@@ -68,6 +69,7 @@ func init() {
 		Subject_integral:       qutil.ObjToString(config.AliPayConf["Subject_integral"]),
 		Subject_dataPack:       qutil.ObjToString(config.AliPayConf["Subject_dataPack"]),
 		Subject_areaPack:       qutil.ObjToString(config.AliPayConf["Subject_areaPack"]),
+		Subject_filePack:       qutil.ObjToString(config.AliPayConf["Subject_filePack"]),
 	}
 }
 
@@ -110,6 +112,9 @@ const (
 
 	ALI_AREAPACK_APP    = "ALIA" //省份流量包-app支付
 	ALI_AREAPACK_NATIVE = "alia" //省份流量包-pc支付
+
+	ALI_FILEPACK_APP    = "ALIF" //附件下载包包 -app支付
+	ALI_FILEPACK_NATIVE = "alif" //附件下载包 -pc支付
 )
 
 func (w *aliPayStruct) GetTradeno(tradenoSign string) (string, string) {
@@ -138,6 +143,8 @@ func (w *aliPayStruct) GetTradeno(tradenoSign string) (string, string) {
 		subject = w.Subject_dataPack
 	} else if tradenoSign == ALI_AREAPACK_APP || tradenoSign == ALI_AREAPACK_NATIVE {
 		subject = w.Subject_areaPack
+	} else if tradenoSign == ALI_FILEPACK_APP || tradenoSign == ALI_FILEPACK_NATIVE {
+		subject = w.Subject_filePack
 	}
 	lenRandom := 6 - len([]rune(tradenoSign)) //控制长度
 	tradeno = fmt.Sprintf("%s_%d%s%s", tradenoSign, time.Now().UnixNano(), qutil.GetRandom(lenRandom), qutil.GetLetterRandom(6))

+ 11 - 1
src/jfw/modules/subscribepay/src/pay/util.go

@@ -123,7 +123,14 @@ var (
 		"ali_app": ALI_AREAPACK_APP,
 		"ali_pc":  ALI_AREAPACK_NATIVE,
 	}
-
+	//附件下载包
+	filePackMap = map[string]string{
+		"wx_js":   WX_FILEPACK_JSAPI,
+		"wx_app":  WX_FILEPACK_APP,
+		"wx_pc":   WX_FILEPACK_NATIVE,
+		"ali_app": ALI_FILEPACK_APP,
+		"ali_pc":  ALI_FILEPACK_NATIVE,
+	}
 	PayWayAndSign = map[string]map[string]string{
 		"subvip":         vipMap,
 		"entniche":       entnicheMap,
@@ -136,6 +143,7 @@ var (
 		"bidfile":        bifileMap,
 		"integral":       integralMap,
 		"areaPack":       areaPackMap,
+		"filePack":       filePackMap,
 		"VIP订阅":          vipMap,
 		"企业商机管理":         entnicheMap,
 		"历史数据":           dataexportMap,
@@ -149,6 +157,7 @@ var (
 		"剑鱼币":            integralMap,
 		"数据流量包":          dataPackMap,
 		"省份订阅包":          areaPackMap,
+		"附件下载包":          filePackMap,
 	}
 	varOrderCode *orderCode
 
@@ -163,6 +172,7 @@ var (
 		"integral":       "剑鱼币",
 		"dataPack":       "数据流量包",
 		"areaPack":       "省份订阅包",
+		"filePack":       "附件下载包",
 	}
 )
 

+ 11 - 3
src/jfw/modules/subscribepay/src/pay/wxPay.go

@@ -55,6 +55,10 @@ const (
 	WX_AREAPACK_JSAPI  = "WJA" //省份订阅包 微信js支付
 	WX_AREAPACK_APP    = "WAA" //省份订阅包 app微信支付
 	WX_AREAPACK_NATIVE = "WPA" //省份订阅包 微信pc支付
+
+	WX_FILEPACK_JSAPI  = "WJF" //附件下载包 微信js支付
+	WX_FILEPACK_APP    = "WAF" //附件下载包 app微信支付
+	WX_FILEPACK_NATIVE = "WPF" //附件下载包 微信pc支付
 )
 
 var WxStruct *WeixinStruct
@@ -80,6 +84,7 @@ type WeixinStruct struct {
 	Integral_msg       string
 	DataPack_msg       string
 	AreaPack_msg       string
+	FilePack_msg       string
 }
 
 func init() {
@@ -106,6 +111,7 @@ func init() {
 		Integral_msg:       util.ObjToString(payConfig["integral_msg"]),
 		DataPack_msg:       util.ObjToString(payConfig["dataPack_msg"]),
 		AreaPack_msg:       util.ObjToString(payConfig["areaPack_msg"]),
+		FilePack_msg:       util.ObjToString(payConfig["filePack_msg"]),
 	}
 }
 
@@ -150,16 +156,18 @@ func (w *WeixinStruct) CreatePrepayOrder(tradeno, ip, openid, detailmsg string,
 		attachmsg, bodymsg, detailmsg = w.DataPack_msg, w.DataPack_msg, w.DataPack_msg
 	} else if tradeno == WX_AREAPACK_APP || tradeno == WX_AREAPACK_JSAPI || tradeno == WX_AREAPACK_NATIVE {
 		attachmsg, bodymsg, detailmsg = w.AreaPack_msg, w.AreaPack_msg, w.AreaPack_msg
+	} else if tradeno == WX_FILEPACK_APP || tradeno == WX_FILEPACK_JSAPI || tradeno == WX_FILEPACK_NATIVE {
+		attachmsg, bodymsg, detailmsg = w.FilePack_msg, w.FilePack_msg, w.FilePack_msg
 	}
 	//支付类型分类
 
 	tradeType, appid := "", w.Appid
-	if tradeno == WX_REWARD_JSAPI || tradeno == WX_DATAEXPORT_JSAPI || tradeno == WX_DATAREPORT_JSAPI || tradeno == WX_SUBVIP_JSAPI || tradeno == WX_COURSE_JSAPI || tradeno == WX_COURSEONLINE_JSAPI || tradeno == WX_MEMBER_JSAPI || tradeno == WX_AIFORECASTPACK_JSAPI || tradeno == WX_BIDFILE_JSAPI || tradeno == WX_INTEGRAL_JSAPI || tradeno == WX_DATAPACK_JSAIP || tradeno == WX_AREAPACK_JSAPI { //微信js支付
+	if tradeno == WX_REWARD_JSAPI || tradeno == WX_DATAEXPORT_JSAPI || tradeno == WX_DATAREPORT_JSAPI || tradeno == WX_SUBVIP_JSAPI || tradeno == WX_COURSE_JSAPI || tradeno == WX_COURSEONLINE_JSAPI || tradeno == WX_MEMBER_JSAPI || tradeno == WX_AIFORECASTPACK_JSAPI || tradeno == WX_BIDFILE_JSAPI || tradeno == WX_INTEGRAL_JSAPI || tradeno == WX_DATAPACK_JSAIP || tradeno == WX_AREAPACK_JSAPI || tradeno == WX_FILEPACK_JSAPI { //微信js支付
 		tradeType = "JSAPI"
-	} else if tradeno == WX_DATAEXPORT_APP || tradeno == WX_DATAREPORT_APP || tradeno == WX_SUBVIP_APP || tradeno == WX_COURSE_APP || tradeno == WX_ENTNICHE_APP || tradeno == WX_COURSEONLINE_APP || tradeno == WX_MEMBER_APP || tradeno == WX_AIFORECASTPACK_APP || tradeno == WX_BIDFILE_APP || tradeno == WX_INTEGRAL_APP || tradeno == WX_DATAPACK_APP || tradeno == WX_AREAPACK_APP { //app支付
+	} else if tradeno == WX_DATAEXPORT_APP || tradeno == WX_DATAREPORT_APP || tradeno == WX_SUBVIP_APP || tradeno == WX_COURSE_APP || tradeno == WX_ENTNICHE_APP || tradeno == WX_COURSEONLINE_APP || tradeno == WX_MEMBER_APP || tradeno == WX_AIFORECASTPACK_APP || tradeno == WX_BIDFILE_APP || tradeno == WX_INTEGRAL_APP || tradeno == WX_DATAPACK_APP || tradeno == WX_AREAPACK_APP || tradeno == WX_FILEPACK_APP { //app支付
 		tradeType = "APP"
 		appid = w.Appid_app
-	} else if tradeno == WX_DATAEXPORT_NATIVE || tradeno == WX_COURSE_NATIVE || tradeno == WX_COURSEONLINE_NATIVE || tradeno == WX_DATAREPORT_NATIVE || tradeno == WX_ENTNICHE_NATIVE || tradeno == WX_SUBVIP_NATIVE || tradeno == WX_MEMBER_NATIVE || tradeno == WX_AIFORECASTPACK_NATIVE || tradeno == WX_BIDFILE_NATIVE || tradeno == WX_INTEGRAL_NATIVE || tradeno == WX_DATAPACK_NATIVE || tradeno == WX_AREAPACK_NATIVE { //扫码支付
+	} else if tradeno == WX_DATAEXPORT_NATIVE || tradeno == WX_COURSE_NATIVE || tradeno == WX_COURSEONLINE_NATIVE || tradeno == WX_DATAREPORT_NATIVE || tradeno == WX_ENTNICHE_NATIVE || tradeno == WX_SUBVIP_NATIVE || tradeno == WX_MEMBER_NATIVE || tradeno == WX_AIFORECASTPACK_NATIVE || tradeno == WX_BIDFILE_NATIVE || tradeno == WX_INTEGRAL_NATIVE || tradeno == WX_DATAPACK_NATIVE || tradeno == WX_AREAPACK_NATIVE || tradeno == WX_FILEPACK_NATIVE { //扫码支付
 		tradeType = "NATIVE"
 	}
 	tradeno = w.GetTradeno(tradeno)

+ 3 - 1
src/jfw/modules/subscribepay/src/pay_config.json

@@ -19,7 +19,8 @@
 			"bidfile_msg":"剑鱼标讯-招标文件解读",
 			"integral_msg":"剑鱼标讯-剑鱼币",
             "dataPack_msg": "剑鱼标讯-数据包",
-            "areaPack_msg":"剑鱼标讯-省份订阅包"
+            "areaPack_msg":"剑鱼标讯-省份订阅包",
+            "filePack_msg":"剑鱼标讯-附件下载包"
         },
         "openidSwitch": {
             "oIMvJvrVXG89597EFmYiSiznbyyY": "oHwE_wEQlEBvjZJOyZeNnQcgKQMo",
@@ -49,6 +50,7 @@
 		"Subject_integral":"剑鱼标讯-剑鱼币",
         "Subject_dataPack": "剑鱼标讯-数据包",
         "Subject_areaPack":"剑鱼标讯-省份订阅包",
+        "Subject_filePack":"剑鱼标讯-附件下载包",
         "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
         "callbackPublicKey":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqFZfev75+sa7O0f29qwuWeqWRQ+p59c8hz2s4aeh5Ohc08P1ls5e8UmPhaN9ZTkGwabOKN658pOhmVoa16ldKFZQ5j1hLTDS6yfKcvVs/hf1mQvsbUjtZgCfMQx5NNf1R4MsTvAqbl2l6DXMu7gHjAhKNR0QQBELv7HmYuWPE35ELQqBH0eVcvWSNV3/3zOansftY5NIT749B+Bv1uirE8PNMp20sWWqx8fMNi2EZksnWNUmnVldBqUwMJIxcXolBH/RGX5ZjBlBenoIB3PVQ8/+SPz9Hip7+QNH8utSnUlrh2AsJVtdNKIQk74Eevkn+Q+WyUVGoY0ca9DzGwh4hQIDAQAB"
     },

+ 6 - 4
src/jfw/modules/subscribepay/src/service/resourcePack.go

@@ -28,13 +28,15 @@ const (
 )
 
 func (this *ResourcePack) Tes() {
+	r := entity.JyresoucePack.LastDate(time.Now())
+	log.Println(r)
 	this.ServeJson("nihao")
 }
 
 type OrderResult struct {
-	Status     int    `json:"status"`     //返回状态 0失败 1成功
-	Order_code string `json:"order_code"` //订单编号
-	Msg        string `json:"msg"`        //消息
+	Status    int    `json:"status"`     //返回状态 0失败 1成功
+	OrderCode string `json:"order_code"` //订单编号
+	Msg       string `json:"msg"`        //消息
 }
 
 // @Summary 创建订单api
@@ -126,7 +128,7 @@ func (this *ResourcePack) CreateOrder() {
 			}
 		}(userId, filter.UserLotteryId, orderCode, i_discountId)
 	}
-	this.ServeJson(orderid)
+	this.ServeJson(OrderResult{OrderCode: orderCode, Status: 1})
 	return
 
 }