Merge branch 'wechat/template' into debug

controllers/admin_wx.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_mobile_admin/models/tables/admin"
+	"hongze/hongze_mobile_admin/models/tables/company_remind_record"
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
@@ -19,7 +20,7 @@ type AdminWxController struct {
 // @Param   Token   query   string  true       "授权token"
 // @Success 200 {object} wechat.WxLoginResp
 // @router /send_sms_code [post]
-func (c *AdminWxController) SendSmsCode()  {
+func (c *AdminWxController) SendSmsCode() {
 	var req admin.SmsCodeReq
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -37,12 +38,12 @@ func (c *AdminWxController) SendSmsCode()  {
 
 	areaNum := req.AreaNum
 	//获取token，如果没有token不允许发送验证码
-	infoJson, err := utils.Rc.RedisString(utils.HZ_MOBILE_ADMIN_WXLOGIN_TOKEN+req.Token)
+	infoJson, err := utils.Rc.RedisString(utils.HZ_MOBILE_ADMIN_WXLOGIN_TOKEN + req.Token)
 	if err != nil {
 		c.FailWithMessage("授权信息不存在", "授权信息不存在"+err.Error())
 		return
 	}
-	info := map[string]string{"open_id":"", "union_id":""}
+	info := map[string]string{"open_id": "", "union_id": ""}
 	err = json.Unmarshal([]byte(infoJson), &info)
 	if err != nil {
 		c.FailWithMessage("授权信息解析失败", "授权信息解析失败"+err.Error())
@@ -58,17 +59,17 @@ func (c *AdminWxController) SendSmsCode()  {
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
 			err = nil
-		}else{
+		} else {
 			c.FailWithMessage("查询管理员信息失败", "查询管理员信息失败"+err.Error())
 			return
 		}
-	}else{
+	} else {
 		if adminInfo.Mobile != req.Mobile {
 			c.FailWithMessage("该微信已被其他账号绑定", "该微信已被其他账号绑定")
 			return
-		}else{
+		} else {
 			resp := &admin.WxSmsResp{
-				BindFlag:  true,
+				BindFlag: true,
 			}
 			c.OkDetailed(resp, "已绑定")
 			return
@@ -87,7 +88,7 @@ func (c *AdminWxController) SendSmsCode()  {
 	}
 	if adminMobileInfo.OpenId == openId {
 		resp := &admin.WxSmsResp{
-			BindFlag:  true,
+			BindFlag: true,
 		}
 		c.OkDetailed(resp, "已绑定")
 		return
@@ -95,7 +96,7 @@ func (c *AdminWxController) SendSmsCode()  {
 
 	//发送短信
 	var sendRet bool
-	code :=  utils.GetRandDigit(4)
+	code := utils.GetRandDigit(4)
 	if areaNum == "86" || areaNum == "" || areaNum == "0" {
 		//国内的短信
 		sendRet = services.SendSmsCode(req.Mobile, code)
@@ -115,7 +116,7 @@ func (c *AdminWxController) SendSmsCode()  {
 		return
 	}
 	resp := &admin.WxSmsResp{
-		SmsFlag:  true,
+		SmsFlag: true,
 	}
 	c.OkDetailed(resp, "发送成功")
 	return
@@ -154,7 +155,7 @@ func (c *AdminWxController) BindMobile() {
 		c.FailWithMessage("验证码错误或者已过期", "验证码错误或者已过期"+err.Error())
 		return
 	}
-	if  req.Code != code {
+	if req.Code != code {
 		c.FailWithMessage("验证码错误", "验证码错误")
 		return
 	}
@@ -220,3 +221,34 @@ func (c *AdminWxController) BindMobile() {
 	c.Ok()
 	return
 }
+
+// CompanyRemindList
+// @Title 客户过期提醒记录
+// @Description 客户过期提醒记录
+// @Param   UniqueCode   query   string  true       "唯一编码"
+// @Success 200 {object} company_remind_record.CompanyRemindRecordResp
+// @router /company_remind/list [get]
+func (c *AdminWxController) CompanyRemindList() {
+	uniqueCode := c.GetString("UniqueCode")
+	if uniqueCode == "" {
+		c.FailWithMessage("来源异常", "UniqueCode异常")
+		return
+	}
+
+	list, err := company_remind_record.GetAllCompanyRemindRecordList(uniqueCode)
+	if err != nil {
+		c.FailWithMessage("获取失败", "获取客户即将过期提醒失败："+err.Error())
+		return
+	}
+	lenList := len(list)
+	response := company_remind_record.CompanyRemindRecordResp{
+		Total: lenList,
+		List:  list,
+	}
+	if len(list) > 0 {
+		response.RemindType = list[0].Type
+		response.EndDate = list[0].EndDate
+	}
+	c.OkDetailed(response, "获取成功")
+	return
+}

models/tables/company_remind_record/company_remind_record.go

@@ -0,0 +1,37 @@
+package company_remind_record
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// CompanyRemindRecord 客户到期提醒记录
+type CompanyRemindRecord struct {
+	CompanyRemindRecordId int    `orm:"column(company_remind_record_id);pk"`
+	Type                  int    `description:"过期类型，1:1天，2:7天，3:15天；4:30天"`
+	SellerId              int    `description:"销售id"`
+	SellerName            string `description:"销售名称"`
+	CompanyId             int    `description:"客户id"`
+	CompanyName           string `description:"客户名称"`
+	Status                string `description:"客户状态"`
+	EndDate               string `description:"到期日期"`
+	UniqueCode            string `description:"唯一code"`
+	CreateTime            time.Time
+}
+
+// GetAllCompanyRemindRecordList 获取所有的客户到期提醒记录
+func GetAllCompanyRemindRecordList(uniqueCode string) (list []*CompanyRemindRecord, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM company_remind_record WHERE unique_code=? `
+
+	_, err = o.Raw(sql, uniqueCode).QueryRows(&list)
+	return
+}
+
+// CompanyRemindRecordResp 客户即将过期列表返回
+type CompanyRemindRecordResp struct {
+	RemindType int                    `description:"过期类型，1:1天，2:7天，3:15天；4:30天"`
+	Total      int                    `description:"总数量"`
+	EndDate    string                 `description:"到期日期"`
+	List       []*CompanyRemindRecord `description:"数据列表"`
+}

routers/commentsRouter.go

@@ -376,6 +376,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminWxController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminWxController"],
+        beego.ControllerComments{
+            Method: "CompanyRemindList",
+            Router: `/company_remind/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminWxController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:AdminWxController"],
         beego.ControllerComments{
             Method: "SendSmsCode",