Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into yx_1.1

controllers/company_apply.go

@@ -2089,6 +2089,7 @@ func (this *CompanyApplyController) ApplyContract() {
 		//mapChartPermissionId := make(map[int]int)
 		mapChartPermissionName := make(map[string]string) // 行业主客观防止重复写入Items用的
 		filterPermissionName := []string{}
+		mapPermissionNameUpgrade := make(map[string]bool) //升级权限重复
 		if totalForever == 0 {
 			filterPermissionName = []string{"专家", "路演服务"} // 需要过滤不展示的行业
 		} else {
@@ -2160,13 +2161,14 @@ func (this *CompanyApplyController) ApplyContract() {
 
 			plist.Items = append(plist.Items, n)
 
-			if totalForever == 0 {
+			if totalForever == 0 && !mapPermissionNameUpgrade[n.PermissionName] {
 				t := new(company.PermissionLookItem)
 				t.ChartPermissionId = n.ChartPermissionId + utils.PERMISSION_ID_UPGRADE
 				t.PermissionName = n.PermissionName + "(升级)"
 				t.PermissionType = n.PermissionType
 				t.Checked = n.Checked
 				plist.Items = append(plist.Items, t)
+				mapPermissionNameUpgrade[n.PermissionName] = true
 			}
 		}
 		//}

controllers/cygx/activity.go

@@ -1443,10 +1443,29 @@ func (this *ActivityCoAntroller) ChartPermissionListAct() {
 		br.Ret = 408
 		return
 	}
-	//数据库新加行业分类，与之前的项目权限部分冲突太多，故采用自定义而不去数据库查找
-	resp := new(cygx.ChartPermissionRepMoreList)
-	// 查研观向7.4-策略后面新增一个宏观
-	resp.List = cygxService.GetActChartPermissionList()
+
+	resp := new(cygx.ChartPermissionResp)
+	list, err := cygx.GetChartPermissionAll()
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+		return
+	}
+
+	for _, v := range list {
+		if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN || v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
+			continue
+		}
+		resp.List = append(resp.List, v)
+	}
+
+	// 查研观向7.4-新增一个宏观
+	macro := &cygx.ChartPermission{
+		ChartPermissionId: 1,
+		PermissionName:    "宏观",
+	}
+	resp.List = append(resp.List, macro)
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/cygx/activity_special_trip.go

@@ -153,8 +153,9 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
 			itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 			itemBill.AdminId = AdminUser.AdminId
 
-			if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
-				//如果是策略、固收行业，把代扣行业信息放入流水表，取消报名的时候，返点使用
+			//if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
+			if utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
+				//如果是策略、固收、周期行业，把代扣行业信息放入流水表，取消报名的时候，返点使用
 				maxChartPermissionId, maxChartPermissionName, err := cygxService.GetSpecialBillMaxChartPermissionId(infoUser)
 				if err != nil {
 					br.Msg = "操作失败"
@@ -568,7 +569,8 @@ func (this *ActivitySpecialTripCoAntroller) TripCancel() {
 	itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 	itemBill.AdminId = sysUser.AdminId
 
-	if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
+	//if activityInfo.ChartPermissionName == utils.CE_LUE_NAME || activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
+	if utils.InArrayByStr(utils.ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER, activityInfo.ChartPermissionName) {
 		//如果是策略、固收行业，把代扣行业信息放入流水表，取消报名的时候，返点使用
 		lastTripBill, err := cygx.GetCygxActivitySpecialTripBillLastDetialByActivityId(activityInfo.ActivityId, userId)
 		if err != nil {

controllers/cygx/industrial_management.go

@@ -188,7 +188,7 @@ func (this *IndustrialManagementController) ChartPermissionFirstProduct() {
 	}
 	//医药消费科技制造策略
 	for _, v := range list {
-		if v.PermissionName == utils.YI_YAO_NAME || v.PermissionName == utils.XIAO_FEI_NAME || v.PermissionName == utils.KE_JI_NAME || v.PermissionName == utils.ZHI_ZAO_NAME || v.PermissionName == utils.CE_LUE_NAME || v.PermissionName == utils.GU_SHOU_NAME {
+		if v.PermissionName == utils.YI_YAO_NAME || v.PermissionName == utils.XIAO_FEI_NAME || v.PermissionName == utils.KE_JI_NAME || v.PermissionName == utils.ZHI_ZAO_NAME || v.PermissionName == utils.CE_LUE_NAME || v.PermissionName == utils.GU_SHOU_NAME || v.PermissionName == utils.ZHOU_QI_NAME {
 			resp.List = append(resp.List, v)
 		}
 	}
@@ -215,9 +215,9 @@ func (this *IndustrialManagementController) ChartPermissionListActivitySpecial()
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	//医药、消费、科技、制造、策略，固收
+	//医药、消费、科技、制造、策略，固收,周期
 	for _, v := range list {
-		if v.PermissionName == utils.YI_YAO_NAME || v.PermissionName == utils.XIAO_FEI_NAME || v.PermissionName == utils.KE_JI_NAME || v.PermissionName == utils.ZHI_ZAO_NAME || v.PermissionName == utils.CE_LUE_NAME || v.PermissionName == utils.GU_SHOU_NAME {
+		if v.PermissionName == utils.YI_YAO_NAME || v.PermissionName == utils.XIAO_FEI_NAME || v.PermissionName == utils.KE_JI_NAME || v.PermissionName == utils.ZHI_ZAO_NAME || v.PermissionName == utils.CE_LUE_NAME || v.PermissionName == utils.GU_SHOU_NAME || v.PermissionName == utils.ZHOU_QI_NAME {
 			resp.List = append(resp.List, v)
 		}
 	}

controllers/cygx/order.go

@@ -0,0 +1,592 @@
+package cygx
+
+import (
+	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/cygx"
+	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/utils"
+	"strconv"
+	"time"
+)
+
+// 产品内测
+type OrderController struct {
+	controllers.BaseAuthController
+}
+
+// @Title 列表
+// @Description 列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   StartDate   query   string  false       "开始时间 ，列如2021-03-06 "
+// @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
+// @Param   AdminId   query   string  false       "销售ID "
+// @Param   ShareId   query   string  false       "推荐人ID "
+// @Param   PaymentType   query   string  false       "支付渠道  取值范围：1微信小程序，2微信扫码支付，3微信H5支付。 "
+// @Param   OrderType   query   int  false       "订单类型 1：畅读卡订单，2：单场付费订单"
+// @Param   OrderStatus   query   int  false       "订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"
+// @Param   PaymentProject   query   string  false       "付款项目"
+// @Param   UserCardType   query   string  false       "会员卡类型 ，日卡、月卡"
+// @Param   OrderCode   query   string  false       "订单编号"
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
+// @router /order/list [get]
+func (this *OrderController) OrderList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	resp := new(cygx.UserOrderListResp)
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	orderType, _ := this.GetInt("OrderType", 1)
+	orderStatus, _ := this.GetInt("OrderStatus", -1)
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	adminId := this.GetString("AdminId")
+	shareId := this.GetString("ShareId")
+	paymentType, _ := this.GetInt("PaymentType")
+	orderCode := this.GetString("OrderCode")
+	keyWord := this.GetString("KeyWord")
+	paymentProject := this.GetString("PaymentProject")
+	userCardType := this.GetString("UserCardType")
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	var condition string
+	var pars []interface{}
+	if orderType > 0 { //订单类型 1：畅读卡订单，2：单场付费订单
+		condition += `  AND order_type =   ? `
+		pars = append(pars, orderType)
+	}
+
+	if startDate != "" && endDate != "" { //时间范围
+		condition += ` 	AND create_time  BETWEEN ?   AND  ? `
+		pars = append(pars, startDate+" 00:00:01", endDate+" 23:59:59")
+	}
+
+	if adminId != "" { //所属销售筛选
+		condition += ` 	AND seller_id IN (` + adminId + `) `
+	}
+
+	if shareId != "" { //推荐人ID
+		condition += ` 	AND share_id IN (` + shareId + `) `
+	}
+
+	if paymentType > 0 { // 支付渠道
+		var tradeType string
+		switch paymentType {
+		case 1:
+			tradeType = "JSAPI"
+		case 2:
+			tradeType = "NATIVE"
+		case 3:
+			tradeType = "MWEB"
+		}
+		condition += ` 	AND trade_type  = ?  `
+		pars = append(pars, tradeType)
+	}
+
+	if orderStatus > -1 { //订单状态
+		condition += ` 	AND order_status  = ?  `
+		pars = append(pars, orderStatus)
+	}
+
+	if orderCode != "" { //订单编号
+		orderCode = "%" + orderCode + "%"
+		condition += ` 	AND order_code LIKE ? `
+		pars = append(pars, orderCode)
+	}
+
+	if paymentProject != "" { //付款项目
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, paymentProject)
+	}
+
+	if userCardType != "" { //日卡月卡， 前端不好区分这里用了两个字段
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, userCardType)
+	}
+
+	if keyWord != "" { //用户姓名，手机号
+		keyWord = "%" + keyWord + "%"
+		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
+		pars = append(pars, keyWord, keyWord)
+	}
+
+	total, err := cygx.GetCygxOrderCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	condition += "	ORDER BY order_id  DESC "
+	list, err := cygx.GetCygxOrderList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	var mobiles []string
+	for _, v := range list {
+		mobiles = append(mobiles, v.Mobile)
+	}
+	inviteNameMap := cygxService.GetCygxUserBusinessCardMap(mobiles) // 根据手机号获取邀请人
+
+	for _, v := range list {
+		item := new(cygx.OrderListResp)
+		item.OrderCode = v.OrderCode
+		item.OrderMoney = v.OrderMoney
+		item.SourceId = v.SourceId
+		item.Source = v.Source
+		item.SourceTitle = v.SourceTitle
+		switch v.Source {
+		case utils.CYGX_OBJ_ARTICLE: //文章详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_YANXUANSPECIAL: //专栏详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
+		}
+		item.OrderStatus = v.OrderStatus
+
+		switch item.OrderStatus {
+		case 0:
+			item.OrderStatusText = "已取消"
+		case 1:
+			item.OrderStatusText = "待支付"
+		case 2:
+			item.OrderStatusText = "已支付"
+		case 3:
+			item.OrderStatusText = "退款成功"
+		case 4:
+			item.OrderStatusText = "退款处理中"
+		case 5:
+			item.OrderStatusText = "退款异常"
+		case 6:
+			item.OrderStatusText = "退款关闭"
+		}
+
+		//TradeType        string    `comment:"交易类型，枚举值：JSAPI：公众号支付 、 NATIVE：扫码支付 、 App：App支付 、 MICROPAY：付款码支付 、 MWEB：H5支付 、 FACEPAY：刷脸支付"`
+		switch v.TradeType {
+		case "JSAPI":
+			item.PaymentTypeText = "小程序"
+		case "NATIVE":
+			item.PaymentTypeText = "PC"
+		case "MWEB":
+			item.PaymentTypeText = "H5"
+		}
+
+		item.UserId = v.UserId
+		item.RealName = v.RealName
+		item.Mobile = v.Mobile
+		item.Email = v.Email
+		item.CompanyId = v.CompanyId
+		item.CompanyName = v.CompanyName
+		item.SellerName = v.SellerName
+		if v.ShareName != "" {
+			item.InviteName = v.ShareName
+		} else {
+			item.InviteName = inviteNameMap[v.Mobile]
+		}
+		item.PaymentProject = v.GoodsName
+		if v.OrderStatus != 0 && v.OrderStatus != 1 {
+			item.PayTime = v.PayTime.Format(utils.FormatDateTime)
+		}
+		if orderType == 1 && v.OrderStatus != 0 && v.OrderStatus != 1 {
+			if v.GoodsId == 1 {
+				item.StartDate = v.StartDate.Format(utils.FormatDateTime)
+				item.EndDate = v.EndDate.Format(utils.FormatDateTime)
+			} else {
+				item.StartDate = v.StartDate.Format(utils.FormatDate)
+				item.EndDate = v.EndDate.Format(utils.FormatDate)
+			}
+		}
+		item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
+		resp.List = append(resp.List, item)
+	}
+	if len(resp.List) == 0 {
+		resp.List = make([]*cygx.OrderListResp, 0)
+	}
+
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// @Title 退款
+// @Description 退款接口
+// @Param	request	body cygx.UserRemarAddReq true "type json string"
+// @Success 200 操作成功
+// @router /order/refund [post]
+func (this *UserController) OrderRefund() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req cygx.CygxOrderRefundReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	orderCode := req.OrderCode
+	remark := req.Remark
+
+	if remark == "" {
+		br.Msg = "请填写退款原因"
+		return
+	}
+	orderDetail, err := cygx.GetCygxOrderDetailByOrderCode(orderCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败, Err:" + err.Error()
+		return
+	}
+	if orderDetail.OrderStatus != 2 {
+		br.Msg = "订单状态异常！"
+		br.ErrMsg = "订单状态异常，orderCode:" + orderCode
+		return
+	}
+	//订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭
+	statusCode, err := cygxService.RefundsApiService(orderDetail)
+	var orderStatus int
+	if statusCode == 200 && err == nil {
+		orderStatus = 4
+	} else {
+		orderStatus = 5
+	}
+	item := new(cygx.CygxOrderRefund)
+	item.OrderCode = orderCode
+	item.RefundMoney = orderDetail.OrderMoney
+	item.RefundWay = 1
+	item.Remark = remark
+	item.CreateTime = time.Now()
+	item.RefundTime = time.Now()
+	item.AdminId = sysUser.AdminId
+	item.AdminName = sysUser.RealName
+	err = cygx.AddCygxOrderRefund(item, orderStatus)
+	if err != nil {
+		br.Msg = "新增失败."
+		br.ErrMsg = "新增失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "已提交退款，请到退款记录页面查看"
+}
+
+// @Title 退款记录列表
+// @Description 退款记录列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   StartDate   query   string  false       "开始时间 ，列如2021-03-06 "
+// @Param   EndDate   query   string  false       "结束时间，列如2021-03-06 "
+// @Param   AdminId   query   string  false       "销售ID "
+// @Param   ShareId   query   string  false       "推荐人ID "
+// @Param   PaymentType   query   string  false       "支付渠道  取值范围：1微信小程序，2微信扫码支付，3微信H5支付。 "
+// @Param   OrderType   query   int  false       "订单类型 1：畅读卡订单，2：单场付费订单"
+// @Param   OrderStatus   query   int  false       "订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"
+// @Param   PaymentProject   query   string  false       "付款项目"
+// @Param   UserCardType   query   string  false       "会员卡类型 ，日卡、月卡"
+// @Param   OrderCode   query   string  false       "订单编号"
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
+// @router /order/refund/list [get]
+func (this *OrderController) OrderRefundList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	resp := new(cygx.UserOrderListResp)
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+	orderType, _ := this.GetInt("OrderType", 1)
+	orderStatus, _ := this.GetInt("OrderStatus", -1)
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
+	adminId := this.GetString("AdminId")
+	shareId := this.GetString("ShareId")
+	paymentType, _ := this.GetInt("PaymentType")
+	orderCode := this.GetString("OrderCode")
+	keyWord := this.GetString("KeyWord")
+	paymentProject := this.GetString("PaymentProject")
+	userCardType := this.GetString("UserCardType")
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+	var condition string
+	var pars []interface{}
+	condition += `  AND order_status  IN  (3,4,5,6) `
+	if orderType > 0 { //订单类型 1：畅读卡订单，2：单场付费订单
+		condition += `  AND order_type =   ? `
+		pars = append(pars, orderType)
+	}
+
+	if startDate != "" && endDate != "" { //时间范围
+		condition += ` 	AND create_time  BETWEEN ?   AND  ? `
+		pars = append(pars, startDate+" 00:00:01", endDate+" 23:59:59")
+	}
+
+	if adminId != "" { //所属销售筛选
+		condition += ` 	AND seller_id IN (` + adminId + `) `
+	}
+
+	if shareId != "" { //推荐人ID
+		condition += ` 	AND share_id IN (` + shareId + `) `
+	}
+
+	if paymentType > 0 { // 支付渠道
+		var tradeType string
+		switch paymentType {
+		case 1:
+			tradeType = "JSAPI"
+		case 2:
+			tradeType = "NATIVE"
+		case 3:
+			tradeType = "MWEB"
+		}
+		condition += ` 	AND trade_type  = ?  `
+		pars = append(pars, tradeType)
+	}
+
+	if orderStatus > -1 { //订单状态
+		condition += ` 	AND order_status  = ?  `
+		pars = append(pars, orderStatus)
+	}
+
+	if orderCode != "" { //订单编号
+		orderCode = "%" + orderCode + "%"
+		condition += ` 	AND order_code LIKE ? `
+		pars = append(pars, orderCode)
+	}
+
+	if paymentProject != "" { //付款项目
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, paymentProject)
+	}
+
+	if userCardType != "" { //日卡月卡， 前端不好区分这里用了两个字段
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, userCardType)
+	}
+
+	if keyWord != "" { //用户姓名，手机号
+		keyWord = "%" + keyWord + "%"
+		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
+		pars = append(pars, keyWord, keyWord)
+	}
+
+	total, err := cygx.GetCygxOrderCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	condition += "	ORDER BY order_id  DESC "
+	list, err := cygx.GetCygxOrderList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	var mobiles []string
+	for _, v := range list {
+		mobiles = append(mobiles, v.Mobile)
+	}
+	inviteNameMap := cygxService.GetCygxUserBusinessCardMap(mobiles) // 根据手机号获取邀请人
+	for _, v := range list {
+		item := new(cygx.OrderListResp)
+		item.OrderCode = v.OrderCode
+		item.OrderMoney = v.OrderMoney
+		item.SourceId = v.SourceId
+		item.Source = v.Source
+		item.SourceTitle = v.SourceTitle
+		switch v.Source {
+		case utils.CYGX_OBJ_ARTICLE: //文章详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case utils.CYGX_OBJ_YANXUANSPECIAL: //专栏详情
+			item.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
+		}
+		//OrderStatus      int       `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"`
+		item.OrderStatus = v.OrderStatus
+		switch item.OrderStatus {
+		case 3:
+			item.OrderStatusText = "退款成功"
+		case 4:
+			item.OrderStatusText = "退款处理中"
+		case 5:
+			item.OrderStatusText = "退款异常"
+		case 6:
+			item.OrderStatusText = "退款关闭"
+		}
+
+		//TradeType        string    `comment:"交易类型，枚举值：JSAPI：公众号支付 、 NATIVE：扫码支付 、 App：App支付 、 MICROPAY：付款码支付 、 MWEB：H5支付 、 FACEPAY：刷脸支付"`
+		switch v.TradeType {
+		case "JSAPI":
+			item.PaymentTypeText = "小程序"
+		case "NATIVE":
+			item.PaymentTypeText = "PC"
+		case "MWEB":
+			item.PaymentTypeText = "H5"
+		}
+
+		item.UserId = v.UserId
+		item.RealName = v.RealName
+		item.Mobile = v.Mobile
+		item.Email = v.Email
+		item.CompanyId = v.CompanyId
+		item.CompanyName = v.CompanyName
+		item.SellerName = v.SellerName
+		if v.ShareName != "" {
+			item.InviteName = v.ShareName
+		} else {
+			item.InviteName = inviteNameMap[v.Mobile]
+		}
+
+		item.PaymentProject = v.GoodsName
+		switch v.GoodsId {
+		case 1:
+			item.PaymentProject = "日卡"
+		case 2:
+			item.PaymentProject = "月卡"
+		}
+
+		item.RefundTime = v.RefundTime.Format(utils.FormatDateTime)
+		item.RefundRemark = v.RefundRemark
+
+		//if v.OrderStatus == 2 {
+		item.PayTime = v.PayTime.Format(utils.FormatDateTime)
+		//}
+		if orderType == 1 {
+			if v.GoodsId == 1 {
+				item.StartDate = v.StartDate.Format(utils.FormatDateTime)
+				item.EndDate = v.EndDate.Format(utils.FormatDateTime)
+			} else {
+				item.StartDate = v.StartDate.Format(utils.FormatDate)
+				item.EndDate = v.EndDate.Format(utils.FormatDate)
+			}
+		}
+		item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
+		resp.List = append(resp.List, item)
+	}
+	if len(resp.List) == 0 {
+		resp.List = make([]*cygx.OrderListResp, 0)
+	}
+
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// @Title 退款撤销
+// @Description 退款撤销接口
+// @Param	request	body cygx.UserRemarAddReq true "type json string"
+// @Success 200 操作成功
+// @router /order/refund_revoke [post]
+func (this *UserController) OrderRefundRevoke() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req cygx.CygxOrderRefundReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	orderCode := req.OrderCode
+	orderDetail, err := cygx.GetCygxOrderDetailByOrderCode(orderCode)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败, Err:" + err.Error()
+		return
+	}
+	if orderDetail.OrderStatus != 4 {
+		br.Msg = "订单状态异常！"
+		br.ErrMsg = "订单状态异常，orderCode:" + orderCode
+		return
+	}
+
+	item := new(cygx.CygxOrderAction)
+	item.Action = "关闭退款"
+	item.OrderStatus = 6
+	item.OrderStatusText = "关闭退款"
+	item.OrderCode = orderDetail.OrderCode
+	item.UserId = orderDetail.UserId
+	item.RealName = orderDetail.RealName
+	item.Mobile = orderDetail.Mobile
+	item.Email = orderDetail.Email
+	item.CompanyId = orderDetail.CompanyId
+	item.CompanyName = orderDetail.CompanyName
+	item.SellerName = orderDetail.SellerName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.AdminId = sysUser.AdminId
+	item.AdminName = sysUser.RealName
+
+	err = cygx.AddCygxOrderRefundRevoke(item)
+	if err != nil {
+		br.Msg = "新增失败."
+		br.ErrMsg = "新增失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/cygx/yanxuan_special.go

@@ -539,10 +539,10 @@ func (this *YanxuanSpecialController) Enable() {
 		go cygxService.SendWxMsgSpecialFollow(req.Id)
 		go services.SendWxCategoryMsgSpecialFollow(req.Id)
 	}
-	go cygxService.SendWxMsgSpecialAuthor(req.Id, req.Status) // 研选专栏审核完成时，给提交人发送模板消息
+	go cygxService.SendWxMsgSpecialAuthor(req.Id, req.Status)      // 研选专栏审核完成时，给提交人发送模板消息
 	go services.SendWxCategoryMsgSpecialAuthor(req.Id, req.Status) // 研选专栏审核完成时，给提交人发送模板消息
-	go cygxService.UpdateYanxuanSpecialResourceData(req.Id)   //  写入首页最新  cygx_resource_data 表
-	go elastic.EsAddYanxuanSpecial(req.Id)                    //  写入es 综合搜索
+	go cygxService.UpdateYanxuanSpecialResourceData(req.Id)        //  写入首页最新  cygx_resource_data 表
+	go elastic.EsAddYanxuanSpecial(req.Id)                         //  写入es 综合搜索
 	br.Msg = "审批成功"
 	br.Ret = 200
 	br.Success = true
@@ -801,25 +801,46 @@ func (this *YanxuanSpecialController) ShowButton() {
 	}
 
 	resp := new(cygx.CygxYanxuanSpecialShowButton)
-	configCode := utils.TPL_MSG_NEI_RONG_ZU
-	cnfNeiRong, err := cygx.GetConfigByCode(configCode)
+	//configCode := utils.TPL_MSG_NEI_RONG_ZU
+	//cnfNeiRong, err := cygx.GetConfigByCode(configCode)
+	//if err != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取失败，Err:" + err.Error()
+	//	return
+	//}
+	////汪洋王芳手机号
+	//configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
+	//cnfWang, err := cygx.GetConfigByCode(configCode)
+	//if err != nil {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取失败，Err:" + err.Error()
+	//	return
+	//}
+
+	//文章管理专栏是否可见
+	cnfArticle, err := cygx.GetConfigByCode(utils.YANXUAN_SPECIAL_ARTICLE_BUTTON_MOBILE)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	//汪洋王芳手机号
-	configCode = utils.TPL_MSG_WANG_FANG_WANG_YANG
-	cnfWang, err := cygx.GetConfigByCode(configCode)
+	articleMobileSlice := strings.Split(cnfArticle.ConfigValue, ",")
+	if utils.InArrayByStr(articleMobileSlice, sysUser.Mobile) || sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN {
+		resp.IsShowYanXuanSpecial = true
+	}
+
+	//作者管理专栏是否可见
+	cnfAuthor, err := cygx.GetConfigByCode(utils.YANXUAN_SPECIAL_AUTHOR_BUTTON_MOBILE)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	//作者管理栏，只有内容组、汪洋、王芳、超管可见
-	if strings.Contains(cnfNeiRong.ConfigValue, sysUser.Mobile) || strings.Contains(cnfWang.ConfigValue, sysUser.Mobile) || sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN {
+	authorMobileSlice := strings.Split(cnfAuthor.ConfigValue, ",")
+	if utils.InArrayByStr(authorMobileSlice, sysUser.Mobile) || sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN {
 		resp.IsShowSpecialAuthor = true
 	}
+
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

controllers/day_new.go

@@ -378,7 +378,7 @@ func (this *DayNewController) AddReport() {
 		}
 	}
 
-	maxStage, err := models.GetEnglishReportStage(dayNewDefault.ClassifyIdFirst, dayNewDefault.ClassifyIdSecond)
+	maxStage, err := models.GetEnglishReportStage(dayNewDefault.ClassifyIdSecond, dayNewDefault.ClassifyIdThird)
 	if err != nil {
 		br.Msg = "期数获取失败！"
 		br.ErrMsg = "期数获取失败，Err:" + err.Error()
@@ -386,11 +386,11 @@ func (this *DayNewController) AddReport() {
 	}
 
 	item := new(models.EnglishReport)
-	item.AddType = 1 //新增方式：1:新增报告，2:继承报告
-	item.ClassifyIdFirst = dayNewDefault.ClassifyIdFirst
-	item.ClassifyNameFirst = dayNewDefault.ClassifyNameFirst
-	item.ClassifyIdSecond = dayNewDefault.ClassifyIdSecond
-	item.ClassifyNameSecond = dayNewDefault.ClassifyNameSecond
+	item.AddType = 1                                      // 新增方式：1:新增报告，2:继承报告
+	item.ClassifyIdFirst = dayNewDefault.ClassifyIdSecond // 报告表中的id_first实际为二级ID
+	item.ClassifyNameFirst = dayNewDefault.ClassifyNameSecond
+	item.ClassifyIdSecond = dayNewDefault.ClassifyIdThird // 报告表中的id_second实际为三级ID
+	item.ClassifyNameSecond = dayNewDefault.ClassifyNameThird
 	item.Title = dayNewDefault.Title
 	item.Abstract = dayNewDefault.Abstract
 	item.Author = dayNewDefault.Author
@@ -433,9 +433,9 @@ func (this *DayNewController) AddReport() {
 	br.Msg = "生成成功"
 }
 
-// List
-// @Title 每日资讯列表
-// @Description 每日资讯列表
+// ReportDefault
+// @Title 转报告默认设置
+// @Description 转报告默认设置
 // @Success 200 {object} models.WeworkMsgListResp
 // @router /day_new/report_default [get]
 func (this *DayNewController) ReportDefault() {
@@ -464,6 +464,8 @@ func (this *DayNewController) ReportDefault() {
 		ClassifyNameFirst:  dayNewDefault.ClassifyNameFirst,
 		ClassifyIdSecond:   dayNewDefault.ClassifyIdSecond,
 		ClassifyNameSecond: dayNewDefault.ClassifyNameSecond,
+		ClassifyIdThird:    dayNewDefault.ClassifyIdThird,
+		ClassifyNameThird:  dayNewDefault.ClassifyNameThird,
 		Title:              dayNewDefault.Title,
 		Abstract:           dayNewDefault.Abstract,
 		Author:             dayNewDefault.Author,
@@ -477,9 +479,10 @@ func (this *DayNewController) ReportDefault() {
 	br.Data = defaultReport
 }
 
-// @Title 新增英文报告接口
-// @Description 新增英文报告接口
-// @Param	request	body day_new.AddEnglishReportReq true "type json string"
+// ReportDefaultSave
+// @Title 保存-转报告默认设置
+// @Description 保存-转报告默认设置
+// @Param	request	body day_new.EnglishReportDefaultSaveReq true "type json string"
 // @Success 200 {object}
 // @router /day_new/report_default/save [post]
 func (this *DayNewController) ReportDefaultSave() {
@@ -533,6 +536,8 @@ func (this *DayNewController) ReportDefaultSave() {
 	item.ClassifyNameFirst = req.ClassifyNameFirst
 	item.ClassifyIdSecond = req.ClassifyIdSecond
 	item.ClassifyNameSecond = req.ClassifyNameSecond
+	item.ClassifyIdThird = req.ClassifyIdThird
+	item.ClassifyNameThird = req.ClassifyNameThird
 	item.Title = req.Title
 	item.Abstract = req.Abstract
 	item.Author = req.Author
@@ -557,7 +562,7 @@ func (this *DayNewController) ReportDefaultSave() {
 		}
 	} else {
 		item.Id = exist.Id
-		ups := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "Title", "Abstract", "Author", "Frequency", "Overview", "ModifyTime"}
+		ups := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "Title", "Abstract", "Author", "Frequency", "Overview", "ModifyTime", "ClassifyIdThird", "ClassifyNameThird"}
 		err = item.Update(ups)
 		if err != nil {
 			br.Msg = "保存失败"

controllers/english_report/english_classify.go

@@ -2,17 +2,11 @@ package english_report
 
 import (
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/utils"
 	"sort"
 )
 
-// EnglishClassifyController 英文分类
-//type EnglishClassifyController struct {
-//	controllers.BaseAuthController
-//}
-
 // ListClassify
 // @Title 获取分类列表
 // @Description 获取分类列表
@@ -28,46 +22,24 @@ func (this *EnglishReportController) ListClassify() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
-	keyWord := this.GetString("KeyWord")
 
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
+	keyWord := this.GetString("KeyWord")
+	reqEnabled, _ := this.GetInt("Enabled", -1)
+	enabled := -1
+	if reqEnabled == 1 {
+		enabled = reqEnabled
 	}
-
-	startSize = utils.StartIndex(currentIndex, pageSize)
-
-	page := paging.GetPaging(currentIndex, pageSize, 0)
 	resp := new(models.EnglishClassifyListResp)
 
 	// 处理一级分类分页的情况
-	rootList, err := models.GetEnglishClassifyRootId(startSize, pageSize, keyWord)
+	rootList, err := models.GetEnglishClassifyRootId(keyWord, enabled)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
-	var ids []int
-	var rootIds []int
-	rootMap := make(map[int]struct{}, 0)
-	for _, v := range rootList {
-		rootIds = append(rootIds, v.Id)
-		rootMap[v.Id] = struct{}{}
-	}
-	total, err := models.GetEnglishClassifyListCount(keyWord)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if total == 0 {
+	if len(rootList) == 0 {
 		resp.List = make([]*models.EnglishClassifyList, 0)
-		resp.Paging = page
 
 		br.Data = resp
 		br.Ret = 200
@@ -75,10 +47,16 @@ func (this *EnglishReportController) ListClassify() {
 		br.Msg = "获取成功"
 		return
 	}
-	page = paging.GetPaging(currentIndex, pageSize, total)
+	var ids []int
+	var rootIds []int
+	rootMap := make(map[int]struct{}, 0)
+	for _, v := range rootList {
+		rootIds = append(rootIds, v.Id)
+		rootMap[v.Id] = struct{}{}
+	}
 
 	//获取相关的分类ID
-	idList, err := models.GetEnglishClassifyListByRootId(rootIds, keyWord)
+	idList, err := models.GetEnglishClassifyListByRootId(rootIds, keyWord, enabled)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -100,7 +78,7 @@ func (this *EnglishReportController) ListClassify() {
 			}
 			if _, ok := childIdMap[v.Id]; !ok {
 				ids = append(ids, v.Id)
-				childIdMap[v.ParentId] = struct{}{}
+				childIdMap[v.Id] = struct{}{}
 			}
 		}
 		tmpList, err := models.GetEnglishClassifyChildByIds(ids)
@@ -172,350 +150,9 @@ func (this *EnglishReportController) ListClassify() {
 	sort.Sort(sortList)
 
 	resp.List = sortList
-	resp.Paging = page
 
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
 }
-
-//// @Title 新增分类
-//// @Description 新增分类接口
-//// @Param   ClassifyName   int  true       "分类名称"
-//// @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
-//// @Param   Sort   query   string  false       "排序"
-//// @Success 200 新增成功
-//// @router /classify/add [get]
-//func (this *EnglishReportController) AddClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyName := this.GetString("ClassifyName")
-//	parentId, _ := this.GetInt("ParentId")
-//	classifyType, _ := this.GetInt("ClassifyType", 0)
-//	sort, _ := this.GetInt("Sort")
-//
-//	item := &models.EnglishClassify{
-//		ClassifyName: classifyName,
-//		Sort:         sort,
-//		ParentId:     parentId,
-//		CreateTime:   time.Now(),
-//		ModifyTime:   time.Now(),
-//		ClassifyType: classifyType,
-//		IsShow:       1,
-//	}
-//	counts, err := models.GetEnglishClassifyCountsByName(classifyName, parentId, classifyType)
-//	if err != nil {
-//		br.Msg = "查询失败"
-//		br.ErrMsg = "查询失败,Err:" + err.Error()
-//		return
-//	}
-//	if counts > 0 {
-//		br.Msg = "该名称已存在"
-//		br.ErrMsg = "该名称已存在!"
-//		return
-//	}
-//	_, err = models.AddEnglishClassify(item)
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "保存失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "新增成功"
-//}
-//
-//// @Title 编辑分类
-//// @Description 编辑分类接口
-//// @Param   ClassifyId   int  true       "分类Id"
-//// @Param   ClassifyName   string  true       "分类名称"
-//// @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
-//// @Param   Sort   query   string  false       "排序"
-//// @Success 200 保存成功
-//// @router /classify/edit [get]
-//func (this *EnglishReportController) EditClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyId, _ := this.GetInt("ClassifyId")
-//	classifyName := this.GetString("ClassifyName")
-//	parentId, _ := this.GetInt("ParentId")
-//	sort, _ := this.GetInt("Sort")
-//
-//	if parentId == classifyId {
-//		br.Msg = "上级分类不能选择自己"
-//		return
-//	}
-//	if classifyId <= 0 {
-//		br.Msg = "参数错误"
-//		return
-//	}
-//	if classifyName == "" {
-//		br.Msg = "分类名称不可为空"
-//		return
-//	}
-//
-//	oldItem, err := models.GetEnglishReportClassifyById(classifyId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//	parent, err := models.GetEnglishReportClassifyById(parentId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	if oldItem.ParentId == 0 && parentId > 0 {
-//		// 一级分类变更为二级分类，禁止
-//		br.Msg = "一级分类不允许更改为二级分类"
-//		return
-//	}
-//
-//	//判断是否已存在同个名称的分类
-//	existItem, e := models.GetEnglishClassifyByClassifyNameParentId(classifyName, parentId, oldItem.ClassifyType)
-//	if e != nil {
-//		if e.Error() != utils.ErrNoRow() {
-//			br.Msg = "查询已存在的分类出错"
-//			br.ErrMsg = "查询已存在的分类出错, Err:" + e.Error()
-//			return
-//		}
-//	}
-//	if e == nil && existItem.Id != oldItem.Id {
-//		br.Msg = "分类名称:" + classifyName + "已存在"
-//		return
-//	}
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	//oldParentId := item.ParentId
-//	item := &models.EnglishClassify{
-//		Id:           oldItem.Id,
-//		ClassifyName: classifyName,
-//		Sort:         sort,
-//		ParentId:     parentId,
-//		ModifyTime:   time.Now(),
-//		ClassifyType: oldItem.ClassifyType,
-//		IsShow:       1,
-//	}
-//	if oldItem.ClassifyType == 1 {
-//		err = services.UpdateEnglishVideoClassifyId(oldItem, item, parent, classifyId)
-//		if err != nil {
-//			br.Msg = err.Error()
-//			return
-//		}
-//	} else {
-//		// 更新研报里的分类名称
-//		err = services.UpdateEnglishReportClassifyId(oldItem, item, parent, classifyId)
-//		if err != nil {
-//			br.Msg = err.Error()
-//			return
-//		}
-//	}
-//
-//	err = models.ModifyEnglishClassify(item)
-//	if err != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "保存失败,Err:" + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "保存成功"
-//}
-//
-//// @Title 删除分类列表
-//// @Description 删除分类列表
-//// @Param   ClassifyId   int  true       "分类名称"
-//// @Param   ParentId   query   int  true   "父级Id"
-//// @Success 200 保存成功
-//// @router /classify/delete [get]
-//func (this *EnglishReportController) DelClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	classifyId, _ := this.GetInt("ClassifyId")
-//	//parentId, _ := this.GetInt("ParentId")
-//
-//	classifyInfo, err := models.GetEnglishReportClassifyById(classifyId)
-//	if err != nil {
-//		if err.Error() == utils.ErrNoRow() {
-//			br.Msg = "当前分类不存在"
-//			br.ErrMsg = "当前分类不存在"
-//			return
-//		}
-//		br.Msg = "获取分类信息失败"
-//		br.ErrMsg = "获取分类信息失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	count, err := models.GetEnglishClassifyChildCounts(classifyId)
-//	if err != nil && err.Error() != utils.ErrNoRow() {
-//		br.Msg = "获取信息失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	if count > 0 {
-//		br.Msg = "请先删除该分类下关联分类"
-//		br.Ret = 403
-//		return
-//	}
-//
-//	if classifyInfo.ClassifyType == 0 {
-//		reportCount, e := models.GetEnglishReportCounts(classifyId, classifyInfo.ParentId)
-//		if e != nil && e.Error() != utils.ErrNoRow() {
-//			br.Msg = "获取信息失败"
-//			br.ErrMsg = "获取失败，Err:" + e.Error()
-//			return
-//		}
-//
-//		if reportCount > 0 {
-//			br.Msg = "该分类有关联报告，不允许删除"
-//			br.Ret = 403
-//			return
-//		}
-//	} else {
-//		videoCount, e := models.GetEnglishVideoCounts(classifyId, classifyInfo.ParentId)
-//		if e != nil && e.Error() != utils.ErrNoRow() {
-//			br.Msg = "获取信息失败"
-//			br.ErrMsg = "获取失败，Err:" + e.Error()
-//			return
-//		}
-//
-//		if videoCount > 0 {
-//			br.Msg = "该分类有关联的路演视频，不允许删除"
-//			br.Ret = 403
-//			return
-//		}
-//	}
-//
-//	if err = models.DeleteEnglishClassify(classifyId); err != nil {
-//		br.Msg = "删除失败"
-//		br.ErrMsg = "删除报告失败, Err: " + err.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "删除成功"
-//}
-//
-//// @Title 获取一级分类列表
-//// @Description 获取一级分类列表
-//// @Param   PageSize   query   int  true       "每页数据条数"
-//// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
-//// @Param   CompanyType   query   string  false       "产品类型，枚举值：'ficc','权益';不传默认返回全部"
-//// @Success 200 {object} models.EnglishClassifyListResp
-//// @router /classify/first/list [get]
-//func (this *EnglishReportController) FistListClassify() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	pageSize, _ := this.GetInt("PageSize")
-//	currentIndex, _ := this.GetInt("CurrentIndex")
-//	classifyType, _ := this.GetInt("ClassifyType", 0)
-//
-//	var startSize int
-//	if pageSize <= 0 {
-//		pageSize = utils.PageSize20
-//	}
-//	if currentIndex <= 0 {
-//		currentIndex = 1
-//	}
-//
-//	startSize = utils.StartIndex(currentIndex, pageSize)
-//	list, err := models.GetEnglishFirstClassifyList(classifyType, startSize, pageSize)
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//	total, err := models.GetEnglishFirstClassifyListCount(classifyType)
-//	if err != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "获取失败，Err:" + err.Error()
-//		return
-//	}
-//
-//	page := paging.GetPaging(currentIndex, pageSize, total)
-//	resp := new(models.EnglishClassifyListResp)
-//	resp.List = list
-//	resp.Paging = page
-//
-//	br.Data = resp
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "获取成功"
-//}
-//
-//// PermissionEdit
-//// @Title 编辑品种权限
-//// @Description 编辑品种权限
-//// @Param	request	body models.EnPermissionAddReq true "type json string"
-//// @Success 200 Ret=200 操作成功
-//// @router /permission/edit [post]
-//func (this *EnglishClassifyController) PermissionEdit() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		if br.ErrMsg == "" {
-//			br.IsSendEmail = false
-//		}
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//	sysUser := this.SysUser
-//	if sysUser == nil {
-//		br.Msg = "请登录"
-//		br.ErrMsg = "请登录，SysUser Is Empty"
-//		br.Ret = 408
-//		return
-//	}
-//	var req models.EnClassifyPermissionEditReq
-//	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-//		br.Msg = "参数解析异常！"
-//		br.ErrMsg = "参数解析失败，Err:" + e.Error()
-//		return
-//	}
-//	if req.ClassifyId <= 0 {
-//		br.Msg = "参数有误"
-//		return
-//	}
-//
-//	// 更新品种权限
-//	nowTime := time.Now().Local()
-//	permissions := make([]*models.EnClassifyPermission, 0)
-//	for _, p := range req.EnPermissions {
-//		v := new(models.EnClassifyPermission)
-//		v.EnPermissionId = p
-//		v.EnClassifyId = req.ClassifyId
-//		v.CreateTime = nowTime
-//		permissions = append(permissions, v)
-//	}
-//	if e := models.ClearAndCreateEnClassifyPermissions(req.ClassifyId, permissions); e != nil {
-//		br.Msg = "保存失败"
-//		br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
-//		return
-//	}
-//
-//	br.Ret = 200
-//	br.Success = true
-//	br.Msg = "操作成功"
-//}

controllers/eta_business/eta_business.go

@@ -1222,3 +1222,293 @@ func (this *EtaBusinessController) OperateRecordList() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// EditSign
+// @Title 编辑签约
+// @Description 编辑签约
+// @Param	request	body eta_business.EtaBusinessEditSignReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /edit_sign [post]
+func (this *EtaBusinessController) EditSign() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req eta_business.EtaBusinessEditSignReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+	if req.EtaBusinessContractId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误, 商家签约ID为空"
+		return
+	}
+	if req.SigningTime == "" {
+		br.Msg = "签约时间不可为空"
+		return
+	}
+	if req.ExpiredTime == "" {
+		br.Msg = "到期时间不可为空"
+		return
+	}
+	signTime, e := time.ParseInLocation(utils.FormatDate, req.SigningTime, time.Local)
+	if e != nil {
+		br.Msg = "签约时间格式有误"
+		br.ErrMsg = "签约时间格式有误, Err: " + e.Error()
+		return
+	}
+	expiredTime, e := time.ParseInLocation(utils.FormatDate, req.ExpiredTime, time.Local)
+	if e != nil {
+		br.Msg = "到期时间格式有误"
+		br.ErrMsg = "到期时间格式有误, Err: " + e.Error()
+		return
+	}
+	if !expiredTime.After(signTime) {
+		br.Msg = "到期时间不得早于签约时间"
+		return
+	}
+
+	// 权限校验
+	ok, e := etaBusinessService.CheckEtaBusinessOperateAuth(sysUser.RoleTypeCode)
+	if e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作权限校验失败, ErrMsg: " + e.Error()
+		return
+	}
+	if !ok {
+		br.Msg = "无权操作"
+		return
+	}
+
+	contractOb := new(eta_business.EtaBusinessContract)
+	contract, e := contractOb.GetItemById(req.EtaBusinessContractId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "签约信息不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取商家签约信息失败, Err: " + e.Error()
+		return
+	}
+	businessOb := new(eta_business.EtaBusiness)
+	business, e := businessOb.GetItemById(contract.EtaBusinessId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "商家不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取商家信息失败, Err: " + e.Error()
+		return
+	}
+
+	// 续约不可早于当前生效合约的到期时间
+	if business.ContractId > 0 && business.ContractId != req.EtaBusinessContractId {
+		{
+			ob := new(eta_business.EtaBusinessContract)
+			item, e := ob.GetItemById(business.ContractId)
+			if e != nil {
+				br.Msg = "操作失败"
+				br.ErrMsg = "获取商家当前合同失败, Err: " + e.Error()
+				return
+			}
+			if !signTime.After(item.ExpiredTime) {
+				br.Msg = "签约时间不可早于当前合同的到期时间"
+				return
+			}
+		}
+	}
+
+	// 获取历史签约, 签约日期不可交叠
+	cond := fmt.Sprintf(` AND %s = ?`, eta_business.EtaBusinessContractColumns.EtaBusinessId)
+	pars := make([]interface{}, 0)
+	pars = append(pars, contract.EtaBusinessId)
+	contracts, e := contractOb.GetItemsByCondition(cond, pars, []string{}, "signing_time ASC")
+	if e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取商家签约列表失败, Err: " + e.Error()
+		return
+	}
+
+	// 校验签约时间是否重叠
+	isFirst := true      // 是否为首次签约
+	changeFirst := false // 是否需要更新首次签约合同
+	if len(contracts) > 0 {
+		isFirst = false
+		for k, c := range contracts {
+			if c.EtaBusinessContractId == req.EtaBusinessContractId {
+				continue
+			}
+			pass := false
+			if expiredTime.Before(c.SigningTime) {
+				pass = true
+			}
+			if signTime.After(c.ExpiredTime) {
+				pass = true
+			}
+			if !pass {
+				br.Msg = "签约时间在存续期内, 请检查"
+				return
+			}
+			// 若该合同签约时间早于第一份合同(业务上未限制所以可能会出现这种情况, contracts已排序), 则更新为首次签约合同
+			if k == 0 && signTime.Before(c.SigningTime) {
+				changeFirst = true
+				isFirst = true
+			}
+		}
+	}
+
+	// 新增签约
+	contract.SigningTime = signTime
+	contract.ExpiredTime = expiredTime
+	contract.ModifyTime = time.Now().Local()
+	if isFirst {
+		contract.IsFirst = 1
+	}
+	updateCols := []string{"SigningTime", "ExpiredTime", "ModifyTime"}
+	if e = contract.UpdateMaybeUpdateFirst(contract, changeFirst, updateCols); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "编辑签约失败, Err: " + e.Error()
+		return
+	}
+
+	// 签约后续操作
+	go func() {
+		_ = etaBusinessService.UpdateEtaBusinessAfterSigning(business.EtaBusinessId)
+	}()
+
+	// 续约操作日志
+	if !isFirst {
+		go func() {
+			recordOb := new(eta_business.EtaBusinessOperationRecord)
+			recordOb.EtaBusinessId = business.EtaBusinessId
+			recordOb.SellerId = business.SellerId
+			recordOb.SysUserId = sysUser.AdminId
+			recordOb.SysRealName = sysUser.RealName
+			recordOb.OperationType = eta_business.EtaBusinessOperationTypeEditContract
+			recordOb.OperationRemark = fmt.Sprintf("%s编辑续约", sysUser.RealName)
+			recordOb.CreateTime = time.Now().Local()
+			_ = recordOb.Create()
+		}()
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}
+
+// RemoveSign
+// @Title 删除签约
+// @Description 删除签约
+// @Param	request	body eta_business.EtaBusinessRemoveSignReq true "type json string"
+// @Success 200 Ret=200 操作成功
+// @router /remove_sign [post]
+func (this *EtaBusinessController) RemoveSign() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req eta_business.EtaBusinessRemoveSignReq
+	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + e.Error()
+		return
+	}
+	if req.EtaBusinessContractId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误, 商家签约ID为空"
+		return
+	}
+
+	// 权限校验
+	ok, e := etaBusinessService.CheckEtaBusinessOperateAuth(sysUser.RoleTypeCode)
+	if e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作权限校验失败, ErrMsg: " + e.Error()
+		return
+	}
+	if !ok {
+		br.Msg = "无权操作"
+		return
+	}
+
+	// 获取商家信息
+	contractOb := new(eta_business.EtaBusinessContract)
+	contract, e := contractOb.GetItemById(req.EtaBusinessContractId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "签约信息不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取商家签约信息失败, Err: " + e.Error()
+		return
+	}
+
+	// 获取商家信息
+	businessOb := new(eta_business.EtaBusiness)
+	business, e := businessOb.GetItemById(contract.EtaBusinessId)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "商家不存在, 请检查"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取商家信息失败, Err: " + e.Error()
+		return
+	}
+
+	// 删除签约
+	if e = contract.Del(); e != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "删除签约失败, Err: " + e.Error()
+		return
+	}
+
+	// 签约后续操作
+	go func() {
+		_ = etaBusinessService.UpdateEtaBusinessAfterSigning(business.EtaBusinessId)
+	}()
+
+	// 操作日志
+	go func() {
+		recordOb := new(eta_business.EtaBusinessOperationRecord)
+		recordOb.EtaBusinessId = business.EtaBusinessId
+		recordOb.SellerId = business.SellerId
+		recordOb.SysUserId = sysUser.AdminId
+		recordOb.SysRealName = sysUser.RealName
+		recordOb.OperationType = eta_business.EtaBusinessOperationTypeRemoveContract
+		recordOb.OperationRemark = fmt.Sprintf("%s删除签约", sysUser.RealName)
+		recordOb.CreateTime = time.Now().Local()
+		_ = recordOb.Create()
+	}()
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

controllers/yb/road_video.go

@@ -527,7 +527,7 @@ func (r *RoadVideoController) SimpleReportList() {
 		cond += ` AND title LIKE ?`
 		pars = append(pars, kw)
 	}
-	fieldArr := []string{"id", "title", "publish_time"}
+	fieldArr := []string{"id", "classify_id_second", "title", "publish_time"}
 	orderRule := ` ORDER BY publish_time DESC, id DESC`
 	reports, e := models.GetReportByCondition(cond, pars, fieldArr, orderRule, true, 0, 5)
 	if e != nil {
@@ -536,12 +536,36 @@ func (r *RoadVideoController) SimpleReportList() {
 		return
 	}
 
+	// 查询报告权限
+	classifyPermissions := make(map[int][]int, 0)
+	{
+		classifyIds := make([]int, 0)
+		for _, v := range reports {
+			if utils.InArrayByInt(classifyIds, v.ClassifyIdSecond) {
+				continue
+			}
+			classifyIds = append(classifyIds, v.ClassifyIdSecond)
+		}
+		if len(classifyIds) > 0 {
+			classifyIdsPermissions, e := models.GetPermissionsByClassifyIds(classifyIds)
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取分类权限失败, Err: " + e.Error()
+				return
+			}
+			for _, v := range classifyIdsPermissions {
+				classifyPermissions[v.ClassifyId] = append(classifyPermissions[v.ClassifyId], v.ChartPermissionId)
+			}
+		}
+	}
+
 	type SimpleReportListResp struct {
 		ReportId       int
 		Title          string
 		PublishTime    string
 		BindVideo      int
 		BindVideoTitle string
+		PermissionIds  []int
 	}
 	respList := make([]*SimpleReportListResp, 0)
 	if len(reports) > 0 {
@@ -570,6 +594,7 @@ func (r *RoadVideoController) SimpleReportList() {
 				PublishTime:    reports[i].PublishTime.Format(utils.FormatDateTime),
 				BindVideo:      bindMap[reports[i].Id],
 				BindVideoTitle: bindTitleMap[reports[i].Id],
+				PermissionIds:  classifyPermissions[reports[i].ClassifyIdSecond],
 			})
 		}
 	}

controllers/yb_research_signup_statistics.go

@@ -65,6 +65,12 @@ func (this *BannerController) StatisticsItem() {
 		br.ErrMsg = "GetYbResearchSignupStatisticsItemsById，Err:" + err.Error()
 		return
 	}
+	if len(list) == 0 {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		return
+	}
 	resp.List = list
 	for _, v := range list {
 		resp.Total += v.Count

go.mod

@@ -97,6 +97,7 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.3.2 // indirect
+	github.com/wechatpay-apiv3/wechatpay-go v0.2.18 // indirect
 	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
 	golang.org/x/crypto v0.5.0 // indirect

go.sum

@@ -13,6 +13,7 @@ github.com/SebastiaanKlippert/go-wkhtmltopdf v1.7.2 h1:LORAatv6KuKheYq8HXehiwx3f
 github.com/SebastiaanKlippert/go-wkhtmltopdf v1.7.2/go.mod h1:TY8r0gmwEL1c5Lbd66NgQCkL4ZjGDJCMVqvbbFvUx20=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -391,6 +392,8 @@ github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXc
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -398,7 +401,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
@@ -416,6 +421,8 @@ github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
 github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM=
 github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.18 h1:vj5tvSmnEIz3ZsnFNNUzg+3Z46xgNMJbrO4aD4wP15w=
+github.com/wechatpay-apiv3/wechatpay-go v0.2.18/go.mod h1:A254AUBVB6R+EqQFo3yTgeh7HtyqRRtN2w9hQSOrd4Q=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 h1:6932x8ltq1w4utjmfMPVj09jdMlkY0aiA6+Skbtl3/c=
 github.com/xuri/efp v0.0.0-20220603152613-6918739fd470/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=

models/company/company_approval.go

@@ -523,18 +523,19 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 			err = to.Commit()
 		}
 	}()
+
 	startDate = time.Now().Format(utils.FormatDate)
-	endDate = time.Now().AddDate(0, 3, 0).Format(utils.FormatDate)
+	endDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
 
-	sellerItem, err := system.GetSysAdminById(applyUserId)
-	if err != nil {
-		return
-	}
+	//sellerItem, err := system.GetSysAdminById(applyUserId)
+	//if err != nil {
+	//	return
+	//}
 
 	//更新用户产品状态
 	sql := `UPDATE company_product SET status='永续',is_suspend=0,approve_status='已审批',freeze_start_date=null,freeze_end_date=null,
-            start_date=?,end_date=?,seller_id=?,seller_name=?,group_id=?,department_id=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-	_, err = to.Raw(sql, startDate, endDate, sellerItem.AdminId, sellerItem.RealName, sellerItem.GroupId, sellerItem.DepartmentId, companyId, productId).Exec()
+            start_date=?,end_date=?,modify_time=NOW(),try_stage=1 WHERE company_id=?  `
+	_, err = to.Raw(sql, startDate, endDate, companyId).Exec()
 	if err != nil {
 		return
 	}
@@ -578,6 +579,13 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 			return
 		}
 	}
+
+	sql = `UPDATE company_report_permission SET  status='永续',start_date=?,end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
+	_, err = to.Raw(sql, startDate, endDate, companyId).Exec()
+	if err != nil {
+		return
+	}
+
 	//获取需要试用的权限
 	delayPermissionItems, tmpErr := GetDelayPermissionItems(companyId, companyApprovalId)
 	if tmpErr != nil {
@@ -594,7 +602,7 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 			LastUpdatedTime:    time.Now(),
 			ChartPermissionId:  v.ChartPermissionId,
 			StartDate:          v.StartDate,
-			EndDate:            v.EndDate,
+			EndDate:            endDate,
 			ProductId:          productId,
 			ProductName:        productName,
 			//CompanyContractId:         companyContractId,

models/company/company_product.go

@@ -674,3 +674,11 @@ func GetCompanyProductRaiForeverCount(companyId int) (count int, err error) {
 	err = o.Raw(sqlCount, companyId).QueryRow(&count)
 	return
 }
+
+// 根据共享销售id查被共享的公司销售id
+func GetCompanyProductSellerIdByShareSellerId(shareSellerId int) (sellerId int, err error) {
+	sqlCount := ` SELECT seller_id FROM company_product WHERE share_seller_id = ? AND product_id = 2 `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, shareSellerId).QueryRow(&sellerId)
+	return
+}

models/cygx/cygx_yanxuan_special.go

@@ -188,7 +188,8 @@ func GetCygxYanxuanSpecialCount(condition string, pars []interface{}) (count int
 }
 
 type CygxYanxuanSpecialShowButton struct {
-	IsShowSpecialAuthor bool // 作者管理的按钮是否
+	IsShowYanXuanSpecial bool // 研选专栏文章管理按钮是否展示
+	IsShowSpecialAuthor  bool // 作者管理的按钮是否展示
 }
 
 func GetYanxuanSpecialBySpecialId(specialId int) (item *CygxYanxuanSpecialItem, err error) {

models/cygx/orde.go

@@ -0,0 +1,138 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
+)
+
+type CygxOrder struct {
+	OrderId          int       `orm:"column(order_id);pk";comment:"订单id"`
+	OrderCode        string    `comment:"订单编号"`
+	OutTradeCode     string    `comment:"外部交易号"`
+	PaymentType      int       `comment:"支付类型。支付类型。取值范围：1微信小程序，2微信扫码支付，3微信H5支付。"`
+	GoodsName        string    `comment:"商品名称"`
+	GoodsId          int       `comment:"商品ID"`
+	BuyerInvoice     string    `comment:"买家发票信息"`
+	GoodsMoney       float64   `comment:"商品总价"`
+	OrderMoney       float64   `comment:"订单总价"`
+	Point            int       `comment:"订单消耗积分"`
+	PointMoney       float64   `comment:"订单消耗积分抵多少钱"`
+	PayMoney         float64   `comment:"订单实付金额"`
+	RefundMoney      float64   `comment:"订单退款金额"`
+	RefundTime       time.Time `description:"退款时间"`
+	RefundRemark     string    `description:"退款原因说明"`
+	OrderStatus      int       `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"`
+	PayTime          time.Time `comment:"订单付款时间"`
+	SourceId         int       `comment:"来源ID"`
+	Source           string    `comment:"来源\n报告 ：article\n活动 ：activity"`
+	SourceTitle      string    `comment:"来源名称，活动或者报告标题"`
+	UserId           int       `comment:"用户ID"`
+	Mobile           string    `comment:"手机号"`
+	Email            string    `comment:"邮箱"`
+	CompanyId        int       `comment:"公司ID"`
+	CompanyName      string    `comment:"公司名称"`
+	RealName         string    `comment:"用户实际名称"`
+	SellerName       string    `comment:"所属销售"`
+	CreateTime       time.Time `comment:"创建时间"`
+	ModifyTime       time.Time `comment:"修改时间"`
+	RegisterPlatform int       `comment:"来源 1小程序，2：网页"`
+}
+
+type CygxOrderResp struct {
+	OrderId          int       `orm:"column(order_id);pk";comment:"订单id"`
+	OrderCode        string    `comment:"订单编号"`
+	OutTradeNo       string    `comment:"【商户订单号】 商户系统内部订单号"`
+	OutTradeCode     string    `comment:"外部交易号"`
+	PaymentType      int       `comment:"支付类型。取值范围：1微信支付，2支付宝支付。"`
+	TradeType        string    `comment:"交易类型，枚举值：JSAPI：公众号支付 、 NATIVE：扫码支付 、 App：App支付 、 MICROPAY：付款码支付 、 MWEB：H5支付 、 FACEPAY：刷脸支付"`
+	GoodsName        string    `comment:"商品名称"`
+	GoodsId          int       `comment:"商品ID"`
+	BuyerInvoice     string    `comment:"买家发票信息"`
+	GoodsMoney       float64   `comment:"商品总价"`
+	OrderMoney       float64   `comment:"订单总价"`
+	Point            int       `comment:"订单消耗积分"`
+	PointMoney       float64   `comment:"订单消耗积分抵多少钱"`
+	PayMoney         float64   `comment:"订单实付金额"`
+	RefundMoney      float64   `comment:"订单退款金额"`
+	RefundTime       time.Time `comment:"退款时间"`
+	RefundRemark     string    `comment:"退款原因说明"`
+	OrderStatus      int       `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"`
+	PayTime          time.Time `comment:"订单付款时间"`
+	SourceId         int       `comment:"来源ID"`
+	Source           string    `comment:"来源\n报告 ：article\n活动 ：activity"`
+	SourceTitle      string    `comment:"来源名称，活动或者报告标题"`
+	UserId           int       `comment:"用户ID"`
+	Mobile           string    `comment:"手机号"`
+	Email            string    `comment:"邮箱"`
+	CompanyId        int       `comment:"公司ID"`
+	CompanyName      string    `comment:"公司名称"`
+	RealName         string    `comment:"用户实际名称"`
+	SellerName       string    `comment:"所属销售"`
+	StartDate        time.Time `comment:"开始日期"`
+	EndDate          time.Time `comment:"结束日期"`
+	CreateTime       time.Time `comment:"创建时间"`
+	ModifyTime       time.Time `comment:"修改时间"`
+	RegisterPlatform int       `comment:"来源 1小程序，2：网页"`
+	ShareId          int       `comment:"分享人ID"`
+	ShareName        string    `comment:"分享人姓名"`
+}
+
+func GetCygxOrderList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxOrderResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT *
+			FROM
+			cygx_order
+			WHERE 1 = 1 ` + condition
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+// 获取数量
+func GetCygxOrderCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_order WHERE   1= 1  ` + condition
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
+// 根据订单编号获取订单详情
+func GetCygxOrderDetailByOrderCode(orderCode string) (item *CygxOrderResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT * FROM cygx_order WHERE order_code = ? `
+	err = o.Raw(sql, orderCode).QueryRow(&item)
+	return
+}
+
+type OrderListResp struct {
+	OrderCode       string  `comment:"订单编号"`
+	UserId          int     `comment:"用户ID"`
+	Mobile          string  `comment:"手机号"`
+	Email           string  `comment:"邮箱"`
+	CompanyId       int     `comment:"公司ID"`
+	CompanyName     string  `comment:"公司名称"`
+	RealName        string  `comment:"用户实际名称"`
+	SellerName      string  `comment:"所属销售"`
+	OrderMoney      float64 `comment:"订单总价"`
+	CreateTime      string  `comment:"创建时间"`
+	SourceId        int     `comment:"来源ID"`
+	Source          string  `comment:"来源\n报告 ：article\n活动 ：activity"`
+	SourceTitle     string  `comment:"来源名称，活动或者报告标题"`
+	OrderStatus     int     `comment:"订单状态码"`
+	OrderStatusText string  `comment:"订单状态描述"`
+	PaymentTypeText string  `comment:"支付类型。取值范围：1微信小程序，2微信扫码支付，3微信H5支付。"`
+	StartDate       string  `comment:"开始日期"`
+	EndDate         string  `comment:"结束日期"`
+	InviteName      string  `description:"邀请人"`
+	PayTime         string  `comment:"订单付款时间"`
+	RefundTime      string  `comment:"订单退款时间"`
+	RefundRemark    string  `description:"退款原因说明"`
+	PaymentProject  string  `comment:"付款项目"`
+	HttpUrl         string  `description:"跳转地址"`
+}
+
+type UserOrderListResp struct {
+	Paging *paging.PagingItem `description:"分页数据"`
+	List   []*OrderListResp
+}

models/cygx/order_action.go

@@ -0,0 +1,90 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// /订单操作表
+type CygxOrderAction struct {
+	ActionId         int       `orm:"column(action_id);pk";comment:"动作id"`
+	Action           string    `comment:"动作内容"`
+	OrderStatus      int       `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:已退款"`
+	OrderStatusText  string    `comment:"订单状态名称"`
+	OrderCode        string    `comment:"订单编号"`
+	UserId           int       `comment:"用户ID"`
+	Mobile           string    `comment:"手机号"`
+	Email            string    `comment:"邮箱"`
+	CompanyId        int       `comment:"公司ID"`
+	CompanyName      string    `comment:"公司名称"`
+	RealName         string    `comment:"用户实际名称"`
+	SellerName       string    `comment:"所属销售"`
+	CreateTime       time.Time `comment:"创建时间"`
+	ModifyTime       time.Time `comment:"修改时间"`
+	RegisterPlatform int       `comment:"来源 1小程序，2：网页"`
+	AdminId          int       `comment:"管理员ID"`
+	AdminName        string    `comment:"管理员姓名"`
+}
+
+func AddCygxOrderRefundRevoke(item *CygxOrderAction) (err error) {
+	to := orm.NewOrmUsingDB("hz_cygx")
+	o, err := to.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = o.Rollback()
+		} else {
+			_ = o.Commit()
+		}
+	}()
+	updateParams := make(map[string]interface{})
+	updateParams["OrderStatus"] = 6 //退款关闭
+	ptrStructOrTableName := "cygx_order"
+	whereParam := map[string]interface{}{"order_code": item.OrderCode}
+	qs := o.QueryTable(ptrStructOrTableName)
+	for expr, exprV := range whereParam {
+		qs = qs.Filter(expr, exprV)
+	}
+	_, err = qs.Update(updateParams)
+	if err != nil {
+		return
+	}
+
+	_, err = o.Insert(item)
+	return
+}
+
+//// 添加CygxOrderRefund
+//func AddCygxOrderRefundRevoke(item *CygxOrderRefund) (err error) {
+//	to := orm.NewOrmUsingDB("hz_cygx")
+//	o, err := to.Begin()
+//	if err != nil {
+//		return
+//	}
+//	defer func() {
+//		if err != nil {
+//			_ = o.Rollback()
+//		} else {
+//			_ = o.Commit()
+//		}
+//	}()
+//	updateParams := make(map[string]interface{})
+//	updateParams["OrderStatus"] = 3
+//	updateParams["RefundMoney"] = item.RefundMoney
+//	updateParams["RefundRemark"] = item.Remark
+//	updateParams["RefundTime"] = time.Now()
+//	ptrStructOrTableName := "cygx_order"
+//	whereParam := map[string]interface{}{"order_code": item.OrderCode}
+//	qs := o.QueryTable(ptrStructOrTableName)
+//	for expr, exprV := range whereParam {
+//		qs = qs.Filter(expr, exprV)
+//	}
+//	_, err = qs.Update(updateParams)
+//	if err != nil {
+//		return
+//	}
+//	_, err = o.Insert(item)
+//	return
+//}

models/cygx/order_refund.go

@@ -0,0 +1,58 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxOrderRefund struct {
+	//OrderRefundID   uint64    `description:"主键id"`
+	OrderRefundId   int       `orm:"column(order_refund_id);pk";comment:"主键id"`
+	OrderCode       string    `description:"订单编号"`
+	RefundTradeCode string    `description:"退款交易号"`
+	RefundMoney     float64   `description:"退款金额"`
+	RefundWay       int       `description:"退款方式（1：微信商户，2：支付宝商户，3：线下）"`
+	RefundTime      time.Time `description:"退款时间"`
+	Remark          string    `description:"备注"`
+	CreateTime      time.Time `description:"创建时间"`
+	AdminId         int       `description:"管理员ID"`
+	AdminName       string    `description:"管理员姓名"`
+}
+
+type CygxOrderRefundReq struct {
+	OrderCode string `description:"订单编号"`
+	Remark    string `description:"备注"`
+}
+
+// 添加CygxOrderRefund
+func AddCygxOrderRefund(item *CygxOrderRefund, orderStatus int) (err error) {
+	to := orm.NewOrmUsingDB("hz_cygx")
+	o, err := to.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = o.Rollback()
+		} else {
+			_ = o.Commit()
+		}
+	}()
+	updateParams := make(map[string]interface{})
+	updateParams["OrderStatus"] = orderStatus
+	updateParams["RefundMoney"] = item.RefundMoney
+	updateParams["RefundRemark"] = item.Remark
+	updateParams["RefundTime"] = time.Now()
+	ptrStructOrTableName := "cygx_order"
+	whereParam := map[string]interface{}{"order_code": item.OrderCode}
+	qs := o.QueryTable(ptrStructOrTableName)
+	for expr, exprV := range whereParam {
+		qs = qs.Filter(expr, exprV)
+	}
+	_, err = qs.Update(updateParams)
+	if err != nil {
+		return
+	}
+	_, err = o.Insert(item)
+	return
+}

models/cygx/user_business_card.go

@@ -0,0 +1,29 @@
+package cygx
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxUserBusinessCard struct {
+	UserId           int       `comment:"用户ID"`
+	Mobile           string    `comment:"手机号"`
+	Email            string    `comment:"邮箱"`
+	CompanyName      string    `comment:"公司名称"`
+	RealName         string    `comment:"用户实际名称"`
+	InviteName       string    `comment:"用户实际名称"`
+	CreateTime       time.Time `comment:"创建时间"`
+	ModifyTime       time.Time `comment:"修改时间"`
+	RegisterPlatform int       `comment:"来源 1小程序，2：网页"`
+}
+
+func GetCygxUserBusinessCardList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxUserBusinessCard, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT *
+			FROM
+			cygx_user_business_card
+			WHERE 1 = 1 ` + condition
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

models/day_new/day_new_default.go

@@ -10,6 +10,8 @@ type DayNewDefault struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -24,6 +26,8 @@ type EnglishReportDefaultSaveReq struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -51,4 +55,4 @@ func (item *DayNewDefault) Update(cols []string) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Update(item, cols...)
 	return
-}
+}

models/day_new/wework_msg.go

@@ -45,7 +45,7 @@ type WeworkMsgListResp struct {
 }
 
 type DeleteWeworkMsgReq struct {
-	MsgId      string `description:"企业微信消息id"`
+	MsgId string `description:"企业微信消息id"`
 }
 
 type EditWeworkMsgContentReq struct {
@@ -59,6 +59,8 @@ type DayNewReportDefaultResp struct {
 	ClassifyNameFirst  string `description:"一级分类名称"`
 	ClassifyIdSecond   int    `description:"二级分类id"`
 	ClassifyNameSecond string `description:"二级分类名称"`
+	ClassifyIdThird    int    `description:"三级分类ID"`
+	ClassifyNameThird  string `description:"三级分类名称"`
 	Title              string `description:"标题"`
 	Abstract           string `description:"摘要"`
 	Author             string `description:"作者"`
@@ -115,7 +117,7 @@ func GetWeworkMsgByConditionLimit(condition string, pars []interface{}, limit in
 	return
 }
 
-func UpdateContentEnByMsgId(contentEn, msgId string) (err error)  {
+func UpdateContentEnByMsgId(contentEn, msgId string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), content_en = ?
@@ -126,7 +128,7 @@ WHERE
 }
 
 // DeleteWeworkMsgByMsgId 删除消息
-func DeleteWeworkMsgByMsgId(msgId string) (err error)  {
+func DeleteWeworkMsgByMsgId(msgId string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), is_delete = 1
@@ -137,7 +139,7 @@ WHERE
 }
 
 // GetWeworkMsgByMsgId 根据消息Id查询
-func GetWeworkMsgByMsgId(msgId string) (item *WeworkMsg, err error)  {
+func GetWeworkMsgByMsgId(msgId string) (item *WeworkMsg, err error) {
 	o := orm.NewOrm()
 	sql := `select * from wework_msg where msg_id = ?`
 	err = o.Raw(sql, msgId).QueryRow(&item)
@@ -155,14 +157,13 @@ type AddEnglishReportReq struct {
 	Frequency          string `description:"频度"`
 }
 
-
 // UpdateWeworkMsgIsAdd 更新消息状态为已加入报告
-func UpdateWeworkMsgIsAdd(msgIds string, reportId int64) (err error)  {
+func UpdateWeworkMsgIsAdd(msgIds string, reportId int64) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE wework_msg 
 SET modify_time=NOW(), is_add = 1, report_id= ?
 WHERE 
-	 msg_id in (`+msgIds+`) and is_delete = 0 and is_add = 0`
+	 msg_id in (` + msgIds + `) and is_delete = 0 and is_add = 0`
 	_, err = o.Raw(sql, reportId).Exec()
 	return
 }
@@ -173,4 +174,4 @@ func GetWeworkMsgReportIdByLimit(limit int) (list []*WeworkMsg, err error) {
 	sql := `SELECT * FROM wework_msg WHERE is_add = 1 and report_id > 0 GROUP BY report_id ORDER BY report_id desc LIMIT ?`
 	_, err = o.Raw(sql, limit).QueryRows(&list)
 	return
-}
+}

models/db.go

@@ -476,6 +476,9 @@ func initCygx() {
 		new(cygx.CygxEnterScoreGroup),
 		new(cygx.CygxEnterScorePermission),
 		new(cygx.CygxEnterScoreResearcher),
+		new(cygx.CygxOrderRefund),
+		new(cygx.CygxOrder),
+		new(cygx.CygxOrderAction),
 	)
 }
 

models/english_report.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/utils"
 	"strings"
 	"time"
@@ -108,33 +107,36 @@ type EnglishClassifyList struct {
 	IsShow        int       `description:"是否在小程序显示：1-显示 0-隐藏"`
 	//ClassifyType  int       `description:"分类类型：0英文报告，1英文线上路演"`
 	EnPermissions []int `description:"英文权限IDs"`
+	Enabled       int   `description:"是否可用，1可用，0禁用"`
 	Child         []*EnglishClassifyList
 }
 
 type EnglishClassifyListResp struct {
-	List   []*EnglishClassifyList
-	Paging *paging.PagingItem `description:"分页数据"`
+	List []*EnglishClassifyList
 }
 
 // GetEnglishClassifyRootId 获取一级分类列表
-func GetEnglishClassifyRootId(startSize, pageSize int, keyWord string) (items []*EnglishClassifyList, err error) {
+func GetEnglishClassifyRootId(keyword string, enabled int) (items []*EnglishClassifyList, err error) {
 	sql := ``
 	o := orm.NewOrmUsingDB("rddp")
-	if keyWord != "" {
+	cond := ""
+	if enabled == 1 {
+		cond = " AND enabled=1 "
+	}
+	if keyword != "" {
 		sql = `SELECT * FROM (
 			                   SELECT * FROM english_classify
-                   WHERE parent_id=0 AND classify_name LIKE '%` + keyWord + `%'
+                   WHERE parent_id=0 ` + cond + ` AND classify_name LIKE ? 
                    UNION
                    SELECT * FROM english_classify
                    WHERE id IN(SELECT parent_id FROM english_classify
-                   WHERE parent_id>0 AND classify_name LIKE '%` + keyWord + `%')
+                   WHERE parent_id>0 ` + cond + ` AND classify_name LIKE ? )
                    )AS t
-                   ORDER BY sort ASC,create_time ASC
-                   LIMIT ?,? `
-		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+                   ORDER BY sort ASC,create_time ASC`
+		_, err = o.Raw(sql, utils.GetLikeKeyword(keyword), utils.GetLikeKeyword(keyword)).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id=0 ORDER BY sort ASC,create_time ASC LIMIT ?,? `
-		_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
+		sql = `SELECT * FROM english_classify WHERE parent_id=0 ` + cond + ` ORDER BY sort ASC,create_time ASC `
+		_, err = o.Raw(sql).QueryRows(&items)
 	}
 	return
 }
@@ -160,20 +162,28 @@ func GetEnglishClassifyListCount(keyWord string) (count int, err error) {
 	return
 }
 
-func GetEnglishClassifyListByRootId(rootIds []int, keyWord string) (items []*EnglishClassifyList, err error) {
+func GetEnglishClassifyListByRootId(rootIds []int, keyword string, enabled int) (items []*EnglishClassifyList, err error) {
 	sql := ``
+	pars := make([]interface{}, 0)
+
 	o := orm.NewOrmUsingDB("rddp")
-	if keyWord != "" {
+	cond := ""
+	if enabled == 1 {
+		cond = " AND enabled=1 "
+	}
+	if keyword != "" {
 		sql = `SELECT
 	a.*
 FROM
 	english_classify a
 	LEFT JOIN english_classify b ON a.root_id = b.id
 	LEFT JOIN english_classify c ON a.parent_id = c.id
-	WHERE a.parent_id > 0 and a.classify_name LIKE '%` + keyWord + `%' and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
-		_, err = o.Raw(sql, rootIds).QueryRows(&items)
+	WHERE a.parent_id>0  ` + cond + ` and a.classify_name LIKE ? and a.root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `)`
+		pars = append(pars, utils.GetLikeKeyword(keyword))
+		pars = append(pars, rootIds)
+		_, err = o.Raw(sql, pars).QueryRows(&items)
 	} else {
-		sql = `SELECT * FROM english_classify WHERE parent_id > 0 and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
+		sql = `SELECT * FROM english_classify WHERE parent_id>0  ` + cond + ` and root_id IN (` + utils.GetOrmInReplace(len(rootIds)) + `) `
 		_, err = o.Raw(sql, rootIds).QueryRows(&items)
 	}
 	return

models/eta_business/eta_business.go

@@ -330,3 +330,15 @@ type EtaBusinessItem struct {
 	ModifyTime       string `description:"更新时间"`
 	Nation           string `description:"所属国家"`
 }
+
+// EtaBusinessEditSignReq 编辑商家签约请求体
+type EtaBusinessEditSignReq struct {
+	EtaBusinessContractId int    `description:"商家合约ID"`
+	SigningTime           string `description:"当前合约的签约时间"`
+	ExpiredTime           string `description:"当前合约的到期时间"`
+}
+
+// EtaBusinessRemoveSignReq 删除商家签约请求体
+type EtaBusinessRemoveSignReq struct {
+	EtaBusinessContractId int `description:"商家合约ID"`
+}

models/eta_business/eta_business_contract.go

@@ -154,6 +154,46 @@ func (m *EtaBusinessContract) CreateMaybeUpdateFirst(item *EtaBusinessContract,
 	return
 }
 
+// UpdateMaybeUpdateFirst 编辑签约合同, 或同时更新首次签约合同
+func (m *EtaBusinessContract) UpdateMaybeUpdateFirst(item *EtaBusinessContract, changeFirst bool, updateCols []string) (err error) {
+	// 无需修改首次签约则直接更新
+	o := orm.NewOrm()
+	if !changeFirst {
+		e := item.Update(updateCols)
+		if e != nil {
+			return e
+		}
+		return
+	}
+
+	// 更新首次签约合同
+	tx, e := o.Begin()
+	if e != nil {
+		return e
+	}
+	defer func() {
+		if err != nil {
+			_ = tx.Rollback()
+			return
+		}
+		_ = tx.Commit()
+	}()
+
+	_, e = tx.Update(item, updateCols...)
+	if e != nil {
+		err = fmt.Errorf("contract update err: %s", e.Error())
+		return
+	}
+
+	sql := fmt.Sprintf(`UPDATE %s SET %s = 0 WHERE %s = ? AND %s <> ?`, m.TableName(), EtaBusinessContractColumns.IsFirst, EtaBusinessContractColumns.EtaBusinessId, EtaBusinessContractColumns.EtaBusinessContractId)
+	_, e = tx.Raw(sql, item.EtaBusinessId, item.EtaBusinessContractId).Exec()
+	if e != nil {
+		err = fmt.Errorf("update first contract err: %s", e.Error())
+		return
+	}
+	return
+}
+
 // EtaBusinessContractItem 商家签约信息
 type EtaBusinessContractItem struct {
 	EtaBusinessContractId int

models/eta_business/eta_business_operation_record.go

@@ -15,6 +15,8 @@ const (
 	EtaBusinessOperationTypeEnable
 	EtaBusinessOperationTypeMoveSeller
 	EtaBusinessOperationTypeRenewalContract
+	EtaBusinessOperationTypeEditContract
+	EtaBusinessOperationTypeRemoveContract
 )
 
 // EtaBusinessOperationRecord ETA商家操作日志表
@@ -24,7 +26,7 @@ type EtaBusinessOperationRecord struct {
 	SellerId        int       `description:"操作时所对应的销售ID"`
 	SysUserId       int       `description:"操作人ID"`
 	SysRealName     string    `description:"操作人姓名"`
-	OperationType   int       `description:"操作类型：1-新增；2-编辑；3-禁用；4-启用；5-移动销售；6-添加续约"`
+	OperationType   int       `description:"操作类型：1-新增；2-编辑；3-禁用；4-启用；5-移动销售；6-添加续约；7-编辑签约；8-删除签约"`
 	OperationRemark string    `description:"操作内容"`
 	CreateTime      time.Time `description:"创建时间"`
 }

models/permission.go

@@ -1,6 +1,10 @@
 package models
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"hongze/hz_crm_api/utils"
+)
 
 // ChartPermissionSearchKeyWordMapping 权限相关
 type ChartPermissionSearchKeyWordMapping struct {
@@ -10,6 +14,7 @@ type ChartPermissionSearchKeyWordMapping struct {
 	From               string `description:"类型标识" json:"-"`
 	TacticType         string `description:"策略表type字段值" json:"-"`
 	TeleconferenceSort int    `description:"电话会类型排序" json:"-"`
+	ClassifyId         int    `description:"分类ID"`
 }
 
 func GetPermission(classifyNameSecond string) (items []*ChartPermissionSearchKeyWordMapping, err error) {
@@ -65,7 +70,7 @@ func AddChartPermissionSearchKeyWordMappingMulti(chartPermissionSearchKeyWordMap
 
 func AddChartPermissionChapterMapping(chartPermissionId int, reportId int64) (err error) {
 	sql := `INSERT INTO chart_permission_chapter_mapping (chart_permission_id, report_chapter_type_id,research_type)
-           VALUES(?,?,?)`
+          VALUES(?,?,?)`
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, chartPermissionId, reportId, "rddp").Exec()
 	return
@@ -97,4 +102,15 @@ func UpdateChartPermissionNameFromMappingByKeyword(newKeyword, keyword, source s
 	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE key_word = ? AND `from` = ? "
 	_, err = o.Raw(sql, newKeyword, keyword, source).Exec()
 	return
-}
+}
+
+// GetPermissionsByClassifyIds 根据分类IDs获取权限IDs
+func GetPermissionsByClassifyIds(classifyIds []int) (items []*ChartPermissionSearchKeyWordMapping, err error) {
+	if len(classifyIds) == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp' AND a.classify_id IN (%s)`, utils.GetOrmInReplace(len(classifyIds)))
+	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
+	return
+}

routers/commentsRouter.go

@@ -2158,6 +2158,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:OrderController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:OrderController"],
+        beego.ControllerComments{
+            Method: "OrderList",
+            Router: `/order/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:OrderController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:OrderController"],
+        beego.ControllerComments{
+            Method: "OrderRefundList",
+            Router: `/order/refund/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ProductInteriorController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:ProductInteriorController"],
         beego.ControllerComments{
             Method: "PvExport",
@@ -2950,6 +2968,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"],
+        beego.ControllerComments{
+            Method: "OrderRefund",
+            Router: `/order/refund`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"],
+        beego.ControllerComments{
+            Method: "OrderRefundRevoke",
+            Router: `/order/refund_revoke`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserController"],
         beego.ControllerComments{
             Method: "Add",
@@ -6928,6 +6964,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"],
+        beego.ControllerComments{
+            Method: "EditSign",
+            Router: `/edit_sign`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"],
         beego.ControllerComments{
             Method: "Enable",
@@ -6964,6 +7009,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"],
+        beego.ControllerComments{
+            Method: "RemoveSign",
+            Router: `/remove_sign`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/eta_business:EtaBusinessController"],
         beego.ControllerComments{
             Method: "Signing",

routers/router.go

@@ -161,6 +161,7 @@ func init() {
 				&cygx.AskserieVideoController{},
 				&cygx.UserAdminShareHistoryController{},
 				&cygx.EnterScoreController{},
+				&cygx.OrderController{},
 			),
 		),
 		web.NSNamespace("/advisory",

services/company_apply/company_approval.go

@@ -855,10 +855,11 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		remark := "审批"
 		operation := "approve"
 		approveContent := "审批通过"
-		if companyProduct.Status == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 { //权益永续客户申请内容做变更
+		if companyProduct.InitStatus == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 { //权益永续客户申请内容做变更
 			//123月份申请转正通过时，将试用期限延长(更新)至4.30。456月份申请转正通过时，将试用期限延长至7.31。789月份申请转正通过时，将试用期限延长至10.31。101112月份申请转正通过时，将试用期限延长至次年1.31。
 			endDateContent := utils.GetLastDayOfQuarter(time.Now()).Format(utils.FormatDate)
 			approveContent += ",试用延期至" + endDateContent
+
 		}
 		services.AddCompanyOperationRecord(recodeInfo.CompanyId, companyProduct.SellerId, opUserId, recodeInfo.ProductId, opUserId, companyProduct.CompanyName,
 			companyProduct.ProductName, opUserName, remark, operation, approveContent, opUserName, "", companyProduct.Status)

services/cygx/acitvity.go

@@ -1310,7 +1310,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 	industrialName = strings.TrimRight(industrialName, ",")
 	// 发类目模版消息
 	if activityInfo.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-		actTime,_ := time.Parse(utils.FormatDateTime,activityInfo.ActivityTime)
+		actTime, _ := time.Parse(utils.FormatDateTime, activityInfo.ActivityTime)
 		first := industrialName
 		keyword1 := "发布了新活动"
 		keyword2 := utils.TruncateActivityNameString(activityInfo.ActivityName)
@@ -1401,6 +1401,7 @@ func GetActChartPermissionList() []*cygx.ChartPermissionRepMore {
 		{PermissionName: "智造"},
 		{PermissionName: "策略"},
 		{PermissionName: "固收"},
+		{PermissionName: "周期"},
 		{PermissionName: "宏观"},
 		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN},
 		//{PermissionName: utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(医药)"},

services/cygx/admin_power.go

@@ -12,13 +12,23 @@ import (
 
 // 获取这个销售所能查看的手机号权限
 func GetAdminLookUserMobile(adminInfo *system.Admin) (mapMobile map[string]string, err error) {
+
+	sellerId, e := company.GetCompanyProductSellerIdByShareSellerId(adminInfo.AdminId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCompanyProductSellerIdByShareSellerId 根据共享销售id查被共享的公司销售id, Err: " + e.Error())
+		return
+	}
 	var conditionMobile string
 	if adminInfo.RoleTypeCode == "rai_group" {
 		//组长查看本组所有组员
 		conditionMobile = ` SELECT mobile FROM user_seller_relation WHERE seller_id IN (SELECT  admin_id FROM admin WHERE group_id = (SELECT group_id FROM admin WHERE admin_id = ` + strconv.Itoa(adminInfo.AdminId) + ` )) `
 	} else {
 		//组员查看自己
-		conditionMobile = ` SELECT mobile FROM user_seller_relation WHERE seller_id  = ` + strconv.Itoa(adminInfo.AdminId)
+		if sellerId != 0 {
+			conditionMobile = ` SELECT mobile FROM user_seller_relation WHERE seller_id  IN ( ` + strconv.Itoa(adminInfo.AdminId) + `,` + strconv.Itoa(sellerId) + ` ) `
+		} else {
+			conditionMobile = ` SELECT mobile FROM user_seller_relation WHERE seller_id  IN ( ` + strconv.Itoa(adminInfo.AdminId) + ` ) `
+		}
 	}
 	mobileList, e := cygx.GetSellerUserMobile(conditionMobile)
 	if e != nil {

services/cygx/industry_fllow.go

@@ -6,12 +6,13 @@ import (
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
 	"strconv"
 	"time"
 )
 
 //func init() {
-//	AddUserFllowCompanyLossToTryOut(1431)
+//	AddUserFllowCompanyLossToTryOut(12841)
 //}
 
 // 流失客户转试用给下面的用户自动添加产业关注
@@ -30,6 +31,10 @@ func AddUserFllowCompanyLossToTryOut(companyId int) {
 		err = errors.New("GetWxUserListByUserMobileHaveCompany" + e.Error())
 		return
 	}
+
+	if len(userList) == 0 {
+		return
+	}
 	var condition string
 	var pars []interface{}
 	//所有的产业
@@ -38,8 +43,15 @@ func AddUserFllowCompanyLossToTryOut(companyId int) {
 		err = errors.New("GetTopOneMonthArtReadNumIndustryAll, Err: " + e.Error())
 		return
 	}
-	condition = " AND company_id =  ? "
-	pars = append(pars, companyId)
+
+	var userIds []int
+
+	for _, v := range userList {
+		userIds = append(userIds, v.UserId)
+	}
+
+	condition = " AND user_id IN  (" + utils.GetOrmInReplace(len(userIds)) + ")  "
+	pars = append(pars, userIds)
 	userFllowList, e := cygx.GetCygxIndustryFllowList(condition, pars, 0, 0)
 	if e != nil {
 		err = errors.New("GetCygxIndustryFllowList, Err: " + e.Error())
@@ -75,7 +87,7 @@ func AddUserFllowCompanyLossToTryOut(companyId int) {
 			Items = append(Items, item)
 		}
 	}
-
+	//fmt.Println("Items", len(Items))
 	//如果小于五千条就直接插入，大于五千条就批量插入
 	if len(Items) < 5000 {
 		e = cygx.AddCygxIndustryFllowMulti(Items)
@@ -118,5 +130,7 @@ func AddUserFllowCompanyLossToTryOut(companyId int) {
 			}
 		}
 	}
+
+	//fmt.Println("AddUserFllowCompanyLossToTryOut end")
 	return
 }

services/cygx/order.go

@@ -0,0 +1,39 @@
+package cygx
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
+)
+
+// GetCygxUserBusinessCardMap 获取手机号对应的邀请人
+func GetCygxUserBusinessCardMap(mobileArr []string) (mapResp map[string]string) {
+	lenArr := len(mobileArr)
+	if lenArr == 0 {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("获取手机号对应的邀请人，信息失败，GetCygxUserBusinessCardMap Err："+err.Error(), 3)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+
+	condition = ` AND  mobile IN (` + utils.GetOrmInReplace(lenArr) + `)`
+	pars = append(pars, mobileArr)
+	list, e := cygx.GetCygxUserBusinessCardList(condition, pars, 0, lenArr)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetArticlList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[string]string, 0)
+	for _, v := range list {
+		mapResp[v.Mobile] = v.InviteName
+	}
+	return
+}

services/cygx/wx_pay.go

@@ -0,0 +1,125 @@
+package cygx
+
+import (
+	"context"
+	"fmt"
+	"github.com/wechatpay-apiv3/wechatpay-go/core"
+	"github.com/wechatpay-apiv3/wechatpay-go/core/option"
+	"github.com/wechatpay-apiv3/wechatpay-go/services/refunddomestic"
+	payUtils "github.com/wechatpay-apiv3/wechatpay-go/utils"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
+)
+
+const (
+	//MchPKFileName              = "./utils/cert/apiclient_key.pem"
+	//MchPKFileName              = "../hongze_mfyx/utils/cert/apiclient_key.pem"
+	MchPKFileName              = "/home/code/wechat_cert/cygx/apiclient_key.pem"
+	Mchid                      = "1624495680"
+	MchCertificateSerialNumber = "5ED2719CFAE5205763034AD80BF4B8A33533C418"
+	MchAPIv3Key                = "W1tbnzQrzQ7yRRNuQCIHjis8dgdasKVX"
+)
+
+// 微信商户建立连接
+//func getWechatClient() (context.Context, *core.Client, error) {
+//	var err error
+//	defer func() {
+//		if err != nil {
+//			fmt.Println(err)
+//			go alarm_msg.SendAlarmMsg(fmt.Sprint("微信商户建立连接失败 getWechatClient, err：", err.Error()), 2)
+//		}
+//	}()
+//	// 使用 utils 提供的函数从本地文件中加载商户私钥，商户私钥会用来生成请求的签名
+//	mchPrivateKey, err := payUtils.LoadPrivateKeyWithPath(MchPKFileName)
+//	if err != nil {
+//		log.Print("load merchant private key error")
+//		return nil, nil, err
+//	}
+//	ctx := context.Background()
+//	// 使用商户私钥等初始化 client，并使它具有自动定时获取微信支付平台证书的能力
+//	opts := []core.ClientOption{
+//		option.WithWechatPayAutoAuthCipher(Mchid, MchCertificateSerialNumber, mchPrivateKey, MchAPIv3Key),
+//	}
+//	client, err := core.NewClient(ctx, opts...)
+//	if err != nil {
+//		log.Printf("new wechat pay client err:%s", err)
+//		return nil, nil, err
+//	}
+//	return ctx, client, nil
+//}
+
+var WechatCertClient *core.Client
+
+// 微信商户建立连接(全局)
+func init() {
+	if !utils.FileIsExist(MchPKFileName) {
+		//fmt.Println("商户私钥文件不存在")
+		go alarm_msg.SendAlarmMsg("微信商户链接失败 商户私钥文件不存在", 2)
+		return
+	}
+	// 使用 utils 提供的函数从本地文件中加载商户私钥，商户私钥会用来生成请求的签名
+	mchPrivateKey, err := payUtils.LoadPrivateKeyWithPath(MchPKFileName)
+	if err != nil {
+		fmt.Println(err)
+		go alarm_msg.SendAlarmMsg("微信商户链接失败 LoadPrivateKeyWithPath"+err.Error(), 2)
+	}
+	ctx := context.Background()
+	// 使用商户私钥等初始化 client，并使它具有自动定时获取微信支付平台证书的能力
+	opts := []core.ClientOption{
+		option.WithWechatPayAutoAuthCipher(Mchid, MchCertificateSerialNumber, mchPrivateKey, MchAPIv3Key),
+	}
+
+	client, err := core.NewClient(ctx, opts...)
+	if err != nil {
+		fmt.Println(err)
+		go alarm_msg.SendAlarmMsg("微信商户链接失败 NewClient"+err.Error(), 2)
+	}
+	WechatCertClient = client
+	return
+}
+
+// 微信商户退款
+func RefundsApiService(orderDetail *cygx.CygxOrderResp) (statusCode int, err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg(fmt.Sprint("微信商户退款失败 RefundsApiService, err：", err.Error()), 2)
+		}
+	}()
+	//ctx, client, err := getWechatClient()
+	//if err != nil {
+	//	//log.Printf("getWechatClientt err:%s", err)
+	//	return
+	//}
+	ctx := context.Background()
+	svc := refunddomestic.RefundsApiService{Client: WechatCertClient}
+	resp, result, err := svc.Create(ctx,
+		refunddomestic.CreateRequest{
+			//SubMchid:      core.String(Mchid),
+			TransactionId: core.String(orderDetail.OutTradeCode),
+			OutTradeNo:    core.String(orderDetail.OutTradeNo),
+			OutRefundNo:   core.String("RE" + orderDetail.OrderCode),
+			Reason:        core.String("退款"),
+			NotifyUrl:     core.String(utils.Wx_MFYX_Refund_NotifyUrl),
+			FundsAccount:  refunddomestic.REQFUNDSACCOUNT_AVAILABLE.Ptr(),
+			Amount: &refunddomestic.AmountReq{
+				Currency: core.String("CNY"),
+				//From: []refunddomestic.FundsFromItem{refunddomestic.FundsFromItem{
+				//	Account: refunddomestic.ACCOUNT_AVAILABLE.Ptr(),
+				//	Amount:  core.Int64(444),
+				//}},
+				Refund: core.Int64(int64(orderDetail.PayMoney * 100)),
+				Total:  core.Int64(int64(orderDetail.PayMoney * 100)),
+			},
+		},
+	)
+	if err != nil {
+		return
+	} else {
+		utils.FileLogCygx.Info("status=%d resp=%s", result.Response.StatusCode, resp)
+	}
+	statusCode = result.Response.StatusCode
+
+	return
+}

services/eta_business/eta_business.go

@@ -45,6 +45,9 @@ func UpdateEtaBusinessAfterSigning(businessId int) (err error) {
 	businessOb := new(eta_business.EtaBusiness)
 	business, e := businessOb.GetItemById(businessId)
 	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			return
+		}
 		err = fmt.Errorf("获取商家信息失败, Err: %s", e.Error())
 		return
 	}
@@ -55,7 +58,8 @@ func UpdateEtaBusinessAfterSigning(businessId int) (err error) {
 		cond := fmt.Sprintf(` AND %s = ?`, eta_business.EtaBusinessContractColumns.EtaBusinessId)
 		pars := make([]interface{}, 0)
 		pars = append(pars, businessId)
-		list, e := ob.GetItemsByCondition(cond, pars, []string{}, "")
+		// 按签约时间倒序
+		list, e := ob.GetItemsByCondition(cond, pars, []string{}, fmt.Sprintf("%s DESC", eta_business.EtaBusinessContractColumns.SigningTime))
 		if e != nil {
 			err = fmt.Errorf("获取商家合同列表失败, Err: " + e.Error())
 			return
@@ -63,6 +67,16 @@ func UpdateEtaBusinessAfterSigning(businessId int) (err error) {
 		contracts = list
 	}
 	if len(contracts) == 0 {
+		// 重置签约信息
+		cols := []string{"ContractId", "SigningStatus", "SigningTime", "ExpiredTime", "ModifyTime"}
+		business.ContractId = 0
+		business.SigningStatus = eta_business.EtaBusinessSigningStatusWait
+		business.SigningTime = time.Time{}
+		business.ExpiredTime = time.Time{}
+		business.ModifyTime = time.Now().Local()
+		if e = business.Update(cols); e != nil {
+			err = fmt.Errorf("更新商家信息失败, Err: %s", e.Error())
+		}
 		return
 	}
 
@@ -86,18 +100,20 @@ func UpdateEtaBusinessAfterSigning(businessId int) (err error) {
 			break
 		}
 	}
-	// 不存在任一合同期内, 当前合同不变, 更新状态
-	if !using {
-		business.SigningStatus = eta_business.EtaBusinessSigningStatusTerminate
-		business.ModifyTime = time.Now().Local()
-		cols := []string{"SigningStatus", "ModifyTime"}
-		if e = business.Update(cols); e != nil {
-			err = fmt.Errorf("更新商家信息失败, Err: %s", e.Error())
-			return
+
+	// 不存在任一合同期内, 取签约时间最后的合同(已按时间排序)
+	if !using && len(contracts) > 0 {
+		business.ContractId = contracts[0].EtaBusinessContractId
+		business.SigningTime = contracts[0].SigningTime
+		business.ExpiredTime = contracts[0].ExpiredTime
+		if contracts[0].IsFirst == 1 {
+			business.SigningStatus = eta_business.EtaBusinessSigningStatusFirst
+		} else {
+			business.SigningStatus = eta_business.EtaBusinessSigningStatusTerminate
 		}
-		return
+		business.ModifyTime = time.Now().Local()
 	}
-	// 合同期内
+
 	cols := []string{"ContractId", "SigningStatus", "SigningTime", "ExpiredTime", "ModifyTime"}
 	if e = business.Update(cols); e != nil {
 		err = fmt.Errorf("更新商家信息失败, Err: %s", e.Error())

utils/common.go

@@ -2307,9 +2307,9 @@ func GetQuarterStrStartDatesInRangeHaveYear(startTimeStr, endTimeStr string) (qu
 	return quartersStar, nil
 }
 
-// 获取当前时间所属季度的最后一天，并往后推一个月
+// 获取当前时间所属季度的最后一天，并往后推两个月
 func GetLastDayOfQuarter(t time.Time) time.Time {
-	month := (t.Month()-1)/3*3 + 1 // 计算当前季度的第一个月份
+	month := (t.Month()-1)/3*3 + 2 // 计算当前季度的第一个月份
 	nextQuarter := month + 3
 	year := t.Year()
 	if nextQuarter > 12 {
@@ -2341,4 +2341,15 @@ func TruncateActivityNameString(s string) string {
 	}
 	// 截取前15个汉字，并添加省略号
 	return s[:byteIndex] + "…"
-}
+}
+
+// GetLikeKeyword
+//
+//	@Description: 获取sql查询中的like查询字段
+//	@author: Roc
+//	@datetime2023-10-23 14:46:32
+//	@param keyword string
+//	@return string
+func GetLikeKeyword(keyword string) string {
+	return `%` + keyword + `%`
+}

utils/config.go

@@ -31,10 +31,11 @@ var (
 
 // 微信配置信息
 var (
-	WxId                string //微信原始ID
-	WxAppId             string
-	WxAppSecret         string
-	TemplateIdByProduct string //产品运行报告通知-模板ID
+	WxId                     string //微信原始ID
+	WxAppId                  string
+	WxAppSecret              string
+	TemplateIdByProduct      string //产品运行报告通知-模板ID
+	Wx_MFYX_Refund_NotifyUrl string //买方研选微信商户退款回调地址
 
 	TemplateRedirectUrl                      string //模板消息跳转地址
 	DayReportTemplateRedirectUrl             string //模板消息跳转地址（晨报、周报）
@@ -373,6 +374,9 @@ ZwIDAQAB
 
 	// 初始化内部服务配置
 	initSystemServer()
+
+	//微信商户内部配置
+	WxPayConfig()
 }
 
 // 测试环境模板消息
@@ -533,6 +537,15 @@ func initSystemServer() {
 
 }
 
+// WxPayConfig 微信商户内部配置
+func WxPayConfig() {
+	if RunMode == "release" {
+		Wx_MFYX_Refund_NotifyUrl = "https://mfyx.hzinsights.com/api/wechat/wxpay/refunds/notify/" //买方研选微信商户退款回调地址
+	} else {
+		Wx_MFYX_Refund_NotifyUrl = "https://testmfyx.hzinsights.com/api/wechat/wxpay/refunds/notify" //买方研选微信商户退款回调地址
+	}
+}
+
 //http://adminapi.brilliantstart.cn/admin/
 //http://adminapi.brilliantstart.cn/swagger/
 //http://8.136.199.33:8602/swagger/

utils/constants.go

@@ -394,6 +394,7 @@ const (
 	ZHI_ZAO_NAME                            string = "智造"
 	ZHI_ZAO_ID                              int    = 19
 	GU_SHOU_NAME                            string = "固收"
+	ZHOU_QI_NAME                            string = "周期"
 	GU_SHOU_ID                              int    = 100000 // 自定义权限类型ID ，十万起步
 	YI_DONG_NAME                            string = "（易董）"
 	YI_DONG_NAME_TWO                        string = "--易董"
@@ -422,11 +423,19 @@ const (
 	HONG_GUAN_NAME                          string = "宏观"
 )
 
+// 权益cygx_config配置主键以后放这里
+const (
+	YANXUAN_SPECIAL_ARTICLE_BUTTON_MOBILE string = "yanxuan_special_article_button_mobile" //CRM研选专栏模块文章管理可以查看的手机号
+	YANXUAN_SPECIAL_AUTHOR_BUTTON_MOBILE  string = "yanxuan_special_author_button_mobile"  //CRM研选专栏模块作者管理可以查看的手机号
+)
+
 var CYGX_REGISTER_PLATFORM_MAP = map[string]string{
 	"1": "小程序",
 	"2": "网页版",
 }
 
+var ACTIVITY_SPECIAL_TRIP_PERMISSION_NAME_OTHER = []string{"策略", "固收", "周期"} //专项调研活动带扣点的行业
+
 const (
 	CYGX_OBJ_ARTICLE            string = "article"            // 对象类型：文章
 	CYGX_OBJ_ACTIVITY           string = "activity"           // 对象类型：活动
@@ -598,4 +607,4 @@ const (
 	WX_MSG_PATH_YX_ACTIVITY_DETAIL = "pages-activity/activityDetail/activityDetail?id=" //研选活动详情
 	WX_MSG_PATH_YX_ARTICLE_DETAIL  = "pages-user/reportDetail/reportDetail?id="         //研选纪要详情
 
-)
+)