no message

controllers/activity.go

@@ -567,6 +567,8 @@ func (this *ActivityCoAntroller) Detail() {
 				resp.GoodsList = services.GetUserGoodsCardList() //日卡月卡商品信息
 			} else {
 				resp.GoodsList = services.GetGoodsInfoByActivity(activityInfo) //单场活动信息
+				fmt.Println("activityId", activityId)
+				_, resp.PayTimeCountdown = services.GetHaverEquallyOrderByUser10MinByActivty(uid, activityId) //截止支付时间倒计时
 			}
 			for _, v := range resp.GoodsList {
 				resp.PopupPriceMsg += v.PopupPriceMsg //价格弹窗信息

controllers/article.go

@@ -139,7 +139,6 @@ func (this *ArticleController) Detail() {
 		br.ErrMsg = "校验用户权限失败，Err:" + err.Error()
 		return
 	}
-
 	if havePower {
 		hasPermission = 1
 		go services.ArticleHistory(articleId, user)

controllers/order.go

@@ -2,11 +2,13 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_mfyx/models"
 	"hongze/hongze_mfyx/models/order"
 	"hongze/hongze_mfyx/services"
 	"hongze/hongze_mfyx/utils"
+	"strings"
 	"time"
 )
 
@@ -79,15 +81,16 @@ func (this *OrderController) AddByArticle() {
 	item.CompanyId = user.CompanyId
 	item.CompanyName = user.CompanyName
 	item.RealName = user.RealName
-	item.SellerName = services.GetSellerName(user) // 销售姓名
+	item.SellerName, item.SellerId = services.GetSellerName(user) // 销售姓名
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
 	item.RegisterPlatform = utils.REGISTER_PLATFORM
-
+	item.OrderType = 1
 	//如果十分钟之内有相同的订单就修改，没有就新增
 	if oldOrderCode == "" {
 		err = order.AddCygxOrder(item)
 	} else {
+		item.OrderCode = oldOrderCode
 		err = order.UpdateCygxOrder(item, oldOrderCode)
 	}
 	if err != nil {
@@ -103,6 +106,7 @@ func (this *OrderController) AddByArticle() {
 	}
 	resp := new(order.WxJsapiApiResp)
 	resp.Detail = JsapiApiResp
+	resp.OrderCode = item.OrderCode
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
@@ -149,18 +153,37 @@ func (this *OrderController) AddByActivity() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	var title string
-	oldOrderCode := services.GetHaverEquallyOrderByUser10Min(uid, goodsId) //获取用户十分钟之内是否有相同的订单信息
-	articleDetail, err := models.GetAddActivityInfoById(sourceId)
+	activityDetail, err := models.GetAddActivityInfoById(sourceId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
-	title = articleDetail.ActivityName
+	var title string
+	var oldOrderCode string
+	//var _ int
 	item := new(order.CygxOrder)
+	if (!activityDetail.IsResearchPoints && activityDetail.IsLimitPeople == 0) || activityDetail.YidongActivityId != "" { //易董的活动 或者（不扣点且不限制人数）走月卡日卡逻辑
+		oldOrderCode = services.GetHaverEquallyOrderByUser10Min(uid, goodsId) //获取用户十分钟之内是否有相同的订单信息
+		item.OrderType = 1
+	} else {
+		oldOrderCode, _ = services.GetHaverEquallyOrderByUser10MinByActivty(uid, sourceId)
+		item.OrderType = 2
+	}
+
+	title = activityDetail.ActivityName
 	item.OrderCode = utils.GetOrdernum()
-	item.GoodsName = goodsDetail.GoodsName
+	if activityDetail.ActivityTypeName == "买方线下交流" {
+		item.GoodsName = "买方交流"
+	}
+	if activityDetail.ActivityTypeName == "专家电话会" || activityDetail.ActivityTypeName == "专家线下沙龙" {
+		item.GoodsName = "专家调研"
+	}
+	if activityDetail.ActivityTypeName == "公司调研电话会" {
+		item.GoodsName = "买方交流"
+	}
+	fmt.Println("item.GoodsName", item.GoodsName)
+	//return
 	item.GoodsId = goodsId
 	item.GoodsMoney = goodsDetail.Price
 	item.OrderMoney = goodsDetail.CurrentPrice
@@ -173,7 +196,7 @@ func (this *OrderController) AddByActivity() {
 	item.CompanyId = user.CompanyId
 	item.CompanyName = user.CompanyName
 	item.RealName = user.RealName
-	item.SellerName = services.GetSellerName(user) // 销售姓名
+	item.SellerName, item.SellerId = services.GetSellerName(user) // 销售姓名
 	item.CreateTime = time.Now()
 	item.ModifyTime = time.Now()
 	item.RegisterPlatform = utils.REGISTER_PLATFORM
@@ -182,14 +205,24 @@ func (this *OrderController) AddByActivity() {
 	if oldOrderCode == "" {
 		err = order.AddCygxOrder(item)
 	} else {
+		item.OrderCode = oldOrderCode
 		err = order.UpdateCygxOrder(item, oldOrderCode)
 	}
-
+	JsapiApiResp, err := services.ExampleJsapiApiServicePrepay(item, user.UnionId)
+	if err != nil {
+		br.Msg = "创建订单信息失败"
+		br.ErrMsg = "创建订单信息失败,ExampleJsapiApiServicePrepayErr:" + err.Error()
+		return
+	}
+	resp := new(order.WxJsapiApiResp)
+	resp.Detail = JsapiApiResp
+	resp.OrderCode = item.OrderCode
 	if err != nil {
 		br.Msg = "创建订单信息失败"
 		br.ErrMsg = "创建订单信息失败,Err:" + err.Error()
 		return
 	}
+	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -291,3 +324,48 @@ func (this *OrderController) UserOrderList() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// @Title 订单支付详情
+// @Description 订单支付详情接口
+// @Param   OrderCode   query   string  false       "订单号"
+// @Success 200 {object} models.SpecialListResp
+// @router /orderPay/detail [get]
+func (this *OrderController) OrderDetail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	resp := new(order.PayEdOrderDetailResp)
+	orderCode := this.GetString("OrderCode")
+	orderDetail, err := order.GetCygxOrderDetailByOrderCode(orderCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败, Err:" + err.Error()
+		return
+	}
+
+	if orderDetail.OrderType == 1 && orderDetail.OrderStatus == 2 {
+		cardDetail, err := order.GetCygxOrderUserCardDetailByOrderCode(orderCode)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败, Err:" + err.Error()
+			return
+		}
+		resp.EndDate = strings.Replace(cardDetail.EndDate.Format(utils.FormatDateTime), "00:00:00", "", -1)
+	}
+	resp.OrderCode = orderDetail.OrderCode
+	resp.OrderType = orderDetail.OrderType
+	resp.OrderStatus = orderDetail.OrderStatus
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

controllers/wechat.go

@@ -465,13 +465,4 @@ func (this *WechatCommonController) WxpayNotify() {
 	br.Data = itemNotify
 	br.Ret = 200
 	br.Success = true
-
 }
-
-//// 使用gin的外部接口
-//func (orderApi *OrderApi) NotifyOrder(c *gin.Context) {
-//	body,_ := ioutil.ReadAll(c.Request.Body)
-//	b,s := orderService.DecodeNotify(body)
-//	log.Println(b,s)
-//	response.OkWithMessage("收到", c)
-//}

models/order/order.go

@@ -8,7 +8,8 @@ import (
 )
 
 type WxJsapiApiResp struct {
-	Detail PrepayWithRequestPaymentResponse
+	Detail    PrepayWithRequestPaymentResponse
+	OrderCode string `comment:"订单编号"`
 }
 
 // PrepayWithRequestPaymentResponse 预下单ID，并包含了调起支付的请求参数
@@ -54,9 +55,11 @@ type CygxOrder struct {
 	CompanyName      string    `comment:"公司名称"`
 	RealName         string    `comment:"用户实际名称"`
 	SellerName       string    `comment:"所属销售"`
+	SellerId         int       `comment:"所属销售Id"`
 	CreateTime       time.Time `comment:"创建时间"`
 	ModifyTime       time.Time `comment:"修改时间"`
 	RegisterPlatform int       `comment:"来源 1小程序，2：网页"`
+	OrderType        int       `comment:"订单类型，1:畅读卡订单，2：单场付费订单"`
 }
 
 type CygxOrderResp struct {
@@ -129,6 +132,13 @@ type UserOrderListResp struct {
 	List   []*OrderListResp
 }
 
+type PayEdOrderDetailResp struct {
+	OrderCode   string `comment:"订单编号"`
+	OrderType   int    `comment:"订单类型，1:畅读卡订单，2：单场付费订单"`
+	EndDate     string `comment:"结束日期"`
+	OrderStatus int    `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:已退款"`
+}
+
 // 添加
 func AddCygxOrder(item *CygxOrder) (err error) {
 	o, err := orm.NewOrm().Begin()

models/order/order_user_card.go

@@ -82,7 +82,9 @@ func AddCygxOrderUserCard(item *CygxOrderUserCard, itemOrder *CygxOrder) (err er
 	updateParams["PayTime"] = itemOrder.PayTime
 	updateParams["PayMoney"] = itemOrder.PayMoney
 	updateParams["OrderStatus"] = itemOrder.OrderStatus
+	updateParams["OutTradeCode"] = itemOrder.OutTradeCode
 	updateParams["ModifyTime"] = item.ModifyTime
+	updateParams["PaymentType"] = 1
 	ptrStructOrTableName := "cygx_order"
 	whereParam := map[string]interface{}{"order_code": itemOrder.OrderCode}
 	qs := o.QueryTable(ptrStructOrTableName)
@@ -133,3 +135,19 @@ func AddCygxOrderUserCard(item *CygxOrderUserCard, itemOrder *CygxOrder) (err er
 	}
 	return
 }
+
+// 根据订单编号获取用户持卡详情
+func GetCygxOrderUserCardDetailByOrderCode(orderCode string) (item *CygxOrderUserCard, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_order_user_card WHERE order_code = ? `
+	err = o.Raw(sql, orderCode).QueryRow(&item)
+	return
+}
+
+// 获取数量
+func GetCygxOrderUserCardCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sqlCount := ` SELECT COUNT(1) AS  count  FROM cygx_order_user_card WHERE   1= 1  ` + condition
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}

models/seller.go

@@ -80,6 +80,7 @@ func GetSelleridWhichGroup(companyId, productId int) (adminId string, err error)
 func GetRaiSellerByCompanyId(companyId int) (item *AdminItem, err error) {
 	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
+     		b.admin_id,
 			b.real_name,
 			b.mobile 
 		FROM

routers/commentsRouter.go

@@ -322,6 +322,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:OrderController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "OrderDetail",
+            Router: `/orderPay/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:OrderController"] = append(beego.GlobalControllerRouter["hongze/hongze_mfyx/controllers:OrderController"],
         beego.ControllerComments{
             Method: "UserOrderList",

services/article.go

@@ -581,11 +581,19 @@ func GetArticleDetailUserPower(user *models.WxUserItem, articleInfo *models.Arti
 	companyId := user.CompanyId
 	//判断用户是否开通了个人研选权限
 	mfyxUserPermissionTotal := GetMfyxUserPermissionTotal(userId)
+
 	if mfyxUserPermissionTotal == 1 {
 		havePower = true
 		return
 	}
 
+	//用户是否持有有效卡片
+	userCardTotal := GetCygxOrderUserCardTotal(user.Mobile)
+	if userCardTotal == 1 {
+		havePower = true
+		return
+	}
+
 	//是否是权益客户
 	raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
 	if e != nil {

services/order.go

@@ -95,6 +95,38 @@ func GetHaverEquallyOrderByUser10Min(userId, goodsId int) (orderCode string) {
 	return
 }
 
+// 获取用户十分钟之内是否有相同的订单信息
+func GetHaverEquallyOrderByUser10MinByActivty(userId, sourceId int) (orderCode string, seconds int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg(fmt.Sprint("获取用户十分钟之内是否有相同的订单信息失败 GetHaverEquallyOrderByUser10Min, err：", err.Error()), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	endTime := time.Now().Add(-10 * time.Minute)
+	condition = ` AND source = 'activity' AND  user_id = ? AND  source_id = ? AND create_time > ?  ORDER BY order_id DESC  `
+	pars = append(pars, userId, sourceId, endTime)
+	orderList, e := order.GetCygxOrderList(condition, pars, 0, 1)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCygxOrderList, Err: " + e.Error())
+		return
+	}
+	if len(orderList) == 0 {
+		return
+	} else {
+		for _, v := range orderList {
+			orderCode = v.OrderCode
+			duration := time.Now().Sub(v.CreateTime)
+			// 将时间差转换为秒数
+			seconds = 600 - int(duration.Seconds())
+		}
+	}
+	return
+}
+
 // 处理订单回调
 func HandleOrderHandle(itemCallback *WechatPayCallback) {
 	var err error
@@ -110,10 +142,18 @@ func HandleOrderHandle(itemCallback *WechatPayCallback) {
 		err = errors.New("GetCygxOrderDetailByOrderCode, Err: " + e.Error())
 		return
 	}
+	//修改过状态的不再二次处理
+	if orderDetail.OrderStatus == 2 {
+		return
+	}
 	itemOrder := new(order.CygxOrder)
+	itemOrder.OrderCode = itemCallback.OutTradeNo
 	itemOrder.PayTime = itemCallback.SuccessTime
-	itemOrder.PayMoney = float64(itemCallback.Amount.PayerTotal / 100) // 金额分转换处理
+	//fmt.Println(itemCallback.Amount.PayerTotal / 100)
+	itemOrder.PayMoney = float64(float64(itemCallback.Amount.PayerTotal) / 100) // 金额分转换处理
 	itemOrder.OrderStatus = 2
+	itemOrder.OutTradeCode = itemCallback.TransactionID
+	fmt.Println("itemOrder.PayMoney", itemOrder.PayMoney)
 	//文章处理逻辑
 	if orderDetail.Source == utils.CYGX_OBJ_ARTICLE {
 
@@ -140,7 +180,7 @@ func HandleOrderHandle(itemCallback *WechatPayCallback) {
 			itemUserCard.EndDate = itemUserCard.StartDate.AddDate(0, 1, 0)
 			itemUserCard.CardType = "月卡"
 		}
-		e = order.AddCygxOrderUserCard(itemUserCard, orderDetail)
+		e = order.AddCygxOrderUserCard(itemUserCard, itemOrder)
 		if e != nil {
 			err = errors.New("AddCygxOrderUserCard, Err: " + e.Error())
 			return

services/user_permission.go

@@ -195,7 +195,7 @@ func GetUserDetailPermissionCode(userId, companyId int) (permission int, err err
 }
 
 // 获取权益销售姓名
-func GetSellerName(user *models.WxUserItem) (sellerName string) {
+func GetSellerName(user *models.WxUserItem) (sellerName string, sellerId int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -224,6 +224,7 @@ func GetSellerName(user *models.WxUserItem) (sellerName string) {
 		return
 	}
 	sellerName = sealldetail.RealName
+	sellerId = sealldetail.AdminId
 	return
 
 }

services/user_yanxuan_permission.go

@@ -4,7 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_mfyx/models"
+	"hongze/hongze_mfyx/models/order"
 	"hongze/hongze_mfyx/utils"
+	"time"
 )
 
 // 判断用户是否开通了个人研选权限
@@ -43,7 +45,6 @@ func GetUserRaiPermissionYanXuanInfo(user *models.WxUserItem) (hasPermission int
 		hasPermission = 3
 	}
 
-	return
 	//判断用户是否开通了个人研选权限
 	mfyxUserPermissionTotal := GetMfyxUserPermissionTotal(user.UserId)
 	if mfyxUserPermissionTotal == 1 {
@@ -71,3 +72,25 @@ func GetUserRaiPermissionYanXuanInfo(user *models.WxUserItem) (hasPermission int
 	}
 	return
 }
+
+// 判断用户是否持有阅读卡
+func GetCygxOrderUserCardTotal(mobile string) (total int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg(fmt.Sprint("判断用户是否开通了个人研选权限失败 GetCygxOrderUserCardTotal mobile", mobile, "，err：", err.Error()), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition += ` AND mobile  =   ?  AND is_suspend  = 0  AND  start_date < ? AND  end_date > ? `
+	pars = append(pars, mobile, time.Now(), time.Now())
+
+	total, e := order.GetCygxOrderUserCardCount(condition, pars)
+	if e != nil {
+		err = errors.New("GetCygxUserYanxuanPermissionCountByUserId, Err: " + e.Error())
+		return
+	}
+	return
+}