订单修改

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

@@ -102,7 +102,7 @@ func AddPower(s_m_openid, userId string, r *http.Request) {
 starttime,endtime:权益开始结束时间
 types:订单类型  1: 仅延长周期  2: 开通权益
 */
-func Order(userid, starttime, endtime string, types, dayNum int, remark string) bool {
+func Order(userid, starttime, endtime string, types, dayNum int, remark, phone string) bool {
 	_, buyset, isvip := JyVipSubStruct.GetVipDetail(userid)
 	filter := VipSimpleMsg{
 		Area:       nil,
@@ -153,6 +153,7 @@ func Order(userid, starttime, endtime string, types, dayNum int, remark string)
 		insertMap["distribution_channel"] = SaleChannel051 // 销售渠道
 	} else if regOrBindReg.MatchString(remark) {
 		insertMap["distribution_channel"] = SaleChannel054
+		insertMap["user_phone"] = phone
 	}
 	insertMap["audit_status"] = OrderPassed // 订单审核状态
 

src/jfw/modules/subscribepay/src/rpcfollow/share.go

@@ -18,7 +18,7 @@ import (
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
-//用户分享完成后，分享者和被分享者订单处理
+// 用户分享完成后，分享者和被分享者订单处理
 func (s *JyPayRpc) ShareFissionNew(p *frpc.JYShareUserIdsRes, r *frpc.JYShareResp) error {
 	if len(p.ShareUserInfo) > 0 {
 		errArr := []interface{}{}
@@ -28,12 +28,13 @@ func (s *JyPayRpc) ShareFissionNew(p *frpc.JYShareUserIdsRes, r *frpc.JYShareRes
 			if err != nil {
 				continue
 			}
-			data := util.Compatible.Select(userId, `{"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1,"o_vipjy":1,"i_shareCount":1,"s_m_openid":1}`)
+			data := util.Compatible.Select(userId, `{"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1,"o_vipjy":1,"i_shareCount":1,"s_m_openid":1,"s_phone":1, "s_m_phone":1}`)
 			if data != nil && len(*data) > 0 {
 				now := time.Now()
 				vip_status := qu.IntAll((*data)["i_vip_status"])
 				nowDay := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 59, now.Location()).Unix() //当前晚上23:59:59
 				endtime := qu.Int64All(qu.If(qu.Int64All((*data)["l_vip_endtime"]) < nowDay, nowDay, qu.Int64All((*data)["l_vip_endtime"])))
+				phone := qu.If(qu.ObjToString((*data)["s_phone"]) != "", qu.ObjToString((*data)["s_phone"]), qu.ObjToString((*data)["s_m_phone"]))
 				//更新user表
 				setMap := map[string]interface{}{}
 				var updateMap = map[string]interface{}{}
@@ -90,7 +91,7 @@ func (s *JyPayRpc) ShareFissionNew(p *frpc.JYShareUserIdsRes, r *frpc.JYShareRes
 				st, et := "", ""
 				st = time.Unix(endtime, 0).Format(Date_Full_Layout)
 				et = endT.Format(Date_Full_Layout)
-				if !entity.Order(userId, st, et, types, ps.TimeExpand, ps.Remark) {
+				if !entity.Order(userId, st, et, types, ps.TimeExpand, ps.Remark, qu.ObjToString(phone)) {
 					r.Error_code = -2
 					errArr = append(errArr, map[string]interface{}{
 						"code":   -2,
@@ -115,7 +116,7 @@ func (s *JyPayRpc) ShareFissionNew(p *frpc.JYShareUserIdsRes, r *frpc.JYShareRes
 	return nil
 }
 
-//获取用户权益信息
+// 获取用户权益信息
 func (s *JyPayRpc) GetUserPowerInfo(p *frpc.JYShareUserIdsRes, r *frpc.JYShareResp, session *httpsession.Session) error {
 	if len(p.ShareUserInfo) > 0 {
 		ps := p.ShareUserInfo[0]