feat:xiugai

src/jfw/modules/subscribepay/src/entity/equityCode.go

@@ -579,7 +579,7 @@ func (e *EquityCode) ExchangeRecords() (*ExchangeRecords, error) {
 }
 
 //
-func (e *EquityCode) Submit(codes []string, productName, industryCode string, buyNum, number, timeType int) int {
+func (e *EquityCode) Submit(codes []string, disChannel, productName, industryCode string, buyNum, number, timeType int) int {
 	_id, comAccountId, positionId, userId := e.CreateUser("权益码兑换创建用户", codes[0])
 	if _id == "" || comAccountId <= 0 || positionId <= 0 {
 		return 0
@@ -668,7 +668,7 @@ func (e *EquityCode) Submit(codes []string, productName, industryCode string, bu
 		}
 		filter := fmt.Sprintf(`{"xcx_account_id":%d,"baseUserId":%d,"area_count":%d,"buyItemCode":["%s"],"industryCode":"%s","fromMiniCode":"%s","cycleCount":%d,"cycleUnit":%d,"originalAmount":0}`, comAccountId, userId, buyNum, strings.Join(codes, `","`), industryCode, codes[0], number, cycleUnit)
 		util.ActivityMysql.InsertBatchByTx(tx, "jianyu.dataexport_order", []string{"order_code", "pay_money", "order_money", "pay_time", "order_status", "create_time", "filter", "original_price", "product_type", "user_phone", "user_id", "vip_starttime", "vip_endtime", "discount_price", "sale_time", "order_channel", "distribution_channel", "audit_status"}, []interface{}{
-			orderCode, 0, 0, nowFormat, 1, nowFormat, filter, 0, productName, e.Phone, positionId, FormatDate(&orderStartTime, Date_Full_Layout), FormatDate(&orderEndTime, Date_Full_Layout), 0, nowFormat, "xdqd05", "x045", 3})
+			orderCode, 0, 0, nowFormat, 1, nowFormat, filter, 0, productName, e.Phone, positionId, FormatDate(&orderStartTime, Date_Full_Layout), FormatDate(&orderEndTime, Date_Full_Layout), 0, nowFormat, "xdqd05", disChannel, 3})
 		return true
 	}) {
 		return 1

src/jfw/modules/subscribepay/src/service/equityCode.go

@@ -108,9 +108,11 @@ func (e *EquityCode) Submit() {
 				return -1 //短信验证码错误
 			}
 			equityCode := e.GetString("equityCode")
-			datas := util.ActivityMysql.SelectBySql(`SELECT a.id,a.userId,a.equityId,a.startTime,a.endTime,a.state,a.number,a.timeType,b.foreignCode,b.productName,c.province,c.name FROM jyactivities.equity_record a
+			datas := util.ActivityMysql.SelectBySql(`SELECT a.id,a.userId,a.equityId,a.startTime,a.endTime,a.state,a.number,a.timeType,b.foreignCode,b.productName,c.province,c.name,e.name as eName FROM jyactivities.equity_record a
 				INNER JOIN jyactivities.product b ON (a.equityCode=? AND a.parentCode=b.productCode)
-				inner join jyactivities.gift c on (a.giftCode=c.giftCode)`, equityCode)
+				inner join jyactivities.gift c on (a.giftCode=c.giftCode)
+				INNER JOIN jyactivities.equity d ON (a.equityId=d.id)
+				INNER JOIN jyactivities.enterprise e ON (d.entid=e.id)`, equityCode)
 			if datas == nil || len(*datas) == 0 {
 				log.Println(phone, equityCode, "兑换码不存在")
 				return -2 //兑换码不存在
@@ -157,7 +159,13 @@ func (e *EquityCode) Submit() {
 			}
 			industryCode := qutil.ObjToString((*mps)[0]["bCode"])
 			industry := qutil.ObjToString((*mps)[0]["bName"])
-			res := entity.GetNewEquityCode(equityCode, "", phone, "", "", e.Request, e.Session()).Submit(foreignCodes, qutil.ObjToString((*datas)[0]["productName"]), industryCode, qutil.IntAll((*datas)[0]["province"]), qutil.IntAll((*datas)[0]["number"]), qutil.IntAll((*datas)[0]["timeType"]))
+			//
+			disChannel := "x045"
+			items := util.ActivityMysql.SelectBySql(`select item_code from jianyu.dict_item where parent_code='x04' and item_name=?`, qutil.ObjToString((*datas)[0]["eName"]))
+			if items != nil && len(*items) > 0 {
+				disChannel = qutil.ObjToString((*items)[0]["item_code"])
+			}
+			res := entity.GetNewEquityCode(equityCode, "", phone, "", "", e.Request, e.Session()).Submit(foreignCodes, disChannel, qutil.ObjToString((*datas)[0]["productName"]), industryCode, qutil.IntAll((*datas)[0]["province"]), qutil.IntAll((*datas)[0]["number"]), qutil.IntAll((*datas)[0]["timeType"]))
 			if res == 1 {
 				result["name"] = giftName
 				list := []map[string]interface{}{}