Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="E:\\GoProject\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/course/order.go

@@ -15,7 +15,7 @@ func (c *CourseController) PostOrder() {
 	}
 
 	// 订单优惠券
-	coupon := c.GetString("coupon")
+	coupons := c.GetString("coupons")
 
 	//
 	var orderInfo model.TaCourseOrders
@@ -26,7 +26,7 @@ func (c *CourseController) PostOrder() {
 		c.ResponseError(errors.New("下单数据格式不正确"))
 	}
 
-	if err := json.Unmarshal([]byte(coupon), &orderCoupon); err != nil {
+	if err := json.Unmarshal([]byte(coupons), &orderCoupon); err != nil {
 		utils.LogError("下单优惠转换JSON失败: " + err.Error())
 		c.ResponseError(errors.New("优惠数据格式不正确"))
 	}

controllers/goods/goods.go

@@ -80,7 +80,7 @@ func (c *GoodsController) UpdateGoods() {
 	gds := model.TaGoods{}
 	if err := c.ParseForm(&gds); err != nil {
 		utils.LogError("接收商品参数失败: " + err.Error())
-		c.ResponseError(errors.New("接收商品参数失败"))
+		c.ResponseError(errors.New("接收商品参数失败1"))
 	}
 
 	// 图片
@@ -91,7 +91,7 @@ func (c *GoodsController) UpdateGoods() {
 	specsJSON := c.GetString("specs")
 	if err := json.Unmarshal([]byte(specsJSON), &specs); err != nil {
 		utils.LogError("接收商品参数失败: " + err.Error())
-		c.ResponseError(errors.New("接收商品参数失败"))
+		c.ResponseError(errors.New("接收商品参数失败2"))
 	}
 
 	goodsID := c.GetString(":id")

controllers/marketing/marketing.go

@@ -0,0 +1,124 @@
+package marketing
+
+import(
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/service/marketing"
+	"spaceofcheng/services/models/model"
+)
+
+
+// CourseController 商品
+type MarketingController struct {
+	serv *marketing.MarketingServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *MarketingController) Constructor() {
+	c.serv = marketing.NewMarketingServ(c.Context)
+}
+
+// 获取 营销活动列表
+func (c *MarketingController) GetMarketingList(){
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+
+	marketings, err := c.serv.GetMarketingList(page,pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(marketings)
+
+}
+
+// SaveMarketing 保存营销活动
+func (c *MarketingController) SaveMarketing() {
+	marketing := model.SysActivity{}
+
+	// 获取值
+	activityName := c.GetString("activityName")
+	activityType := c.GetString("activityType")
+	resourceDesc := c.GetString("resourceDesc") // 活动描述
+
+	// 赋值
+	marketing.ActivityName = activityName
+	marketing.ActivityType = activityType
+
+	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(newInfo)
+}
+
+
+// GetMarketingById 根据activityId查询
+func (c *MarketingController) GetMarketingById(){
+	 activityId := c.GetString("activityId")
+
+	 info,err :=	c.serv.GetMarketingById(activityId)
+	 if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(info)
+}
+
+// UpdateMarketing 修改数据
+func (c *MarketingController) UpdateMarketing(){
+	activity := model.SysActivity{}
+
+	// 获取值
+	activityName := c.GetString("activityName")
+	activityType := c.GetString("activityType")
+	
+	// 赋值
+	activity.ActivityName = activityName
+	activity.ActivityType = activityType
+	
+	err := c.serv.UpdateMarketing(activity)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功!")
+}
+
+// DelMarketing 删除
+func (c *MarketingController) DelMarketing(){
+	activityId := c.GetString("activityId")
+	err := c.serv.DelMarketing(activityId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功!")
+}
+
+// DelMarketing 正常
+func (c *MarketingController) DelMarketingNormal(){
+	activityId := c.GetString("activityId")
+	err := c.serv.DelMarketingNormal(activityId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功!")
+}
+
+// DelMarketing 停用
+func (c *MarketingController) DelMarketingDisable(){
+	activityId := c.GetString("activityId")
+	err := c.serv.DelMarketingDisable(activityId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功!")
+}
+
+
+
+
+
+
+

controllers/user/user.go

@@ -79,8 +79,8 @@ func (c *UserController) GetUserList() {
 func (c *UserController) GetUserTypes() {
 	// cases := c.Context.Get("cases").([]model.SysUserCase)
 	// caseIDs := c.GetCaseIDs(cases)
-	orgid := c.GetString(":org")
-	usertypes, err := c.dao.GetUserTypes(orgid)
+	org := c.Context.Get("org").(model.SysOrg)
+	usertypes, err := c.dao.GetUserTypes(org.OrgId)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/verify/verify.go

@@ -0,0 +1,95 @@
+package verify
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/verify"
+)
+
+// CaseController 信息
+type VerifyController struct {
+	dao *verify.VerifyServ
+	controllers.BaseController
+}
+
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *VerifyController) Constructor() {
+	c.dao = verify.NewVerifyServ(c.Context)
+}
+
+// GetCustomerCourseDetailListById 根据id获取我的课程详情
+func (c *VerifyController) GetCustomerCourseDetailListById() {
+	customerCourseId := c.GetString(":customerCourseId")
+	caseid := c.GetString("caseid")
+	if caseid == "" {
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
+		caseid = caseinfo.CaseId
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseid, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+
+}
+
+// GetCustomerCourseDetailListBytel 根据手机号获取我的课程详情id
+func (c *VerifyController) GetCustomerCourseDetailListBytel() {
+	caseid := c.GetString("caseid")
+	if caseid == "" {
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
+		caseid = caseinfo.CaseId
+	}
+	tel := c.GetString(":tel")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseid, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+
+}
+
+// VerifyCourse核销我的课程详情
+func (c *VerifyController) VerifyCourse() {
+	sysUser := c.Context.Get("user").(model.SysUser)
+	userId := sysUser.UserId
+	customerDetailId := c.GetString(":customerDetailId")
+	customerCourseDetail, err := c.dao.GetCustomerCourseDetailByDetailId(customerDetailId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	customerCourse, err := c.dao.GetCustomerCourseByDetailId(customerCourseDetail.CustomerDetailId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	if customerCourse.CourseObtaimType == "card" {
+		customerCard, err := c.dao.GetCustomerCardByDetailId(customerCourseDetail.CustomerDetailId)
+		if err != nil {
+			c.ResponseError(err)
+		}
+		if customerCard.VerifyStatus == "usable" {
+			customerCard.VerifyStatus = "used"
+			err := c.dao.UpdateCustomerCard(customerCard)
+			if err != nil {
+				c.ResponseError(err)
+			}
+		}
+	}
+	err = c.dao.UpdateCustomerCourse(customerCourse)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	err = c.dao.UpdateCustomerCourseDetail(customerCourseDetail, userId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("核销成功")
+
+}

log/common.2018-08-19.log

@@ -1,22 +0,0 @@
-2018/08/19 11:00:44 [E] 用户登录失败: 账户不存在
-2018/08/19 11:02:08 [E] 用户登录失败: 账户不存在
-2018/08/19 11:02:30 [E] 用户登录失败: 账户不存在
-2018/08/19 11:04:13 [E] 用户登录失败: 账户不存在
-2018/08/19 11:04:23 [E] 用户登录失败: 账户不存在
-2018/08/19 11:04:53 [E] 用户登录失败: 账户不存在
-2018/08/19 12:40:59 [E] 用户登录失败: 账户不存在
-2018/08/19 12:41:32 [E] 用户登录失败: 账户不存在
-2018/08/19 12:53:00 [E] 用户登录失败: 账户不存在
-2018/08/19 12:53:39 [E] 用户登录失败: 账户不存在
-2018/08/19 12:53:59 [E] 用户登录失败: 账户不存在
-2018/08/19 12:56:51 [E] 用户登录失败: 账户不存在
-2018/08/19 12:57:10 [E] 用户登录失败: 账户不存在
-2018/08/19 12:58:27 [E] 用户登录失败: 账户不存在
-2018/08/19 13:00:08 [E] 用户登录失败: 账户不存在
-2018/08/19 13:33:36 [E] 用户登录失败: 账户不存在
-2018/08/19 13:51:39 [E] 用户登录失败: 账户不存在
-2018/08/19 13:51:48 [E] 用户登录失败: 账户不存在
-2018/08/19 13:52:14 [E] 用户登录失败: 用户密码不正确
-2018/08/19 13:52:14 [E] 用户登录失败: 账户不存在
-2018/08/19 13:52:20 [E] 用户登录失败: 账户不存在
-2018/08/19 13:52:27 [E] 用户登录失败: 账户不存在

log/common.2018-08-23.log

@@ -1,27 +0,0 @@
-2018/08/20 15:27:18 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:36:51 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:37:19 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:44:30 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
-2018/08/20 15:46:35 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
-2018/08/20 15:49:09 [E] 获取客户列表失败: Error 1060: Duplicate column name 'user_id'
-2018/08/20 15:57:45 [E] 获取客户列表失败: sql: statement expects 2 inputs; got 1
-2018/08/20 19:25:08 [E] 短信发送失败: 400 
-2018/08/20 19:27:58 [E] 短信发送失败: 400 
-2018/08/20 19:28:52 [E] 短信发送失败: 400 
-2018/08/21 13:38:17 [E] 用户没有设置默认案场
-2018/08/21 13:38:17 [E] 您没有该案场的权限！
-2018/08/21 13:39:04 [E] 用户没有设置默认案场
-2018/08/21 13:39:04 [E] 您没有该案场的权限！
-2018/08/21 13:39:09 [E] 用户没有设置默认案场
-2018/08/21 13:39:09 [E] 您没有该案场的权限！
-2018/08/21 13:39:24 [E] 用户没有设置默认案场
-2018/08/21 13:39:24 [E] 您没有该案场的权限！
-2018/08/21 13:41:04 [E] 用户没有设置默认案场
-2018/08/21 13:41:04 [E] 您没有该案场的权限！
-2018/08/21 14:26:22 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
-2018/08/21 14:27:06 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
-2018/08/23 19:57:03 [E] 获取人员映射账户失败: Params type error
-2018/08/23 19:58:00 [E] 获取人员映射账户失败: Params type error
-2018/08/23 19:58:39 [E] 获取人员映射账户失败: Params type error
-2018/08/23 20:03:16 [E] 获取人员映射账户失败: Params type error
-2018/08/23 20:05:14 [E] 获取人员映射账户失败: Params type error

log/common.2018-08-24.log

@@ -1,7 +0,0 @@
-2018/08/24 09:40:16 [E] 验证码 - 17714208769 : 648633
-2018/08/24 10:53:37 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:54:58 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:03 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:42 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 10:55:46 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
-2018/08/24 11:30:58 [E] 更新用户映射信息失败:Params type error

log/common.2018-09-05.log

@@ -0,0 +1,118 @@
+2018/08/26 09:37:50 [E] 查询微信配置失败: Error 1054: Unknown column 'rmark' in 'field list'
+2018/08/26 09:38:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:38:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ","expires_in":7200})
+2018/08/26 09:38:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ])
+2018/08/26 09:44:13 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:44:13 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI","expires_in":7200})
+2018/08/26 09:44:13 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI expires_in:7200])
+2018/08/26 09:45:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:45:32 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG","expires_in":7200})
+2018/08/26 09:45:32 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG expires_in:7200])
+2018/08/26 09:49:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:49:09 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM","expires_in":7200})
+2018/08/26 09:49:09 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM expires_in:7200])
+2018/08/26 09:50:11 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:50:11 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL","expires_in":7200})
+2018/08/26 09:50:11 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL expires_in:7200])
+2018/08/26 09:51:59 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:51:59 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK","expires_in":7200})
+2018/08/26 09:51:59 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK expires_in:7200])
+2018/08/26 09:52:26 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:52:26 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE","expires_in":7200})
+2018/08/26 09:52:26 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE expires_in:7200])
+2018/08/26 09:52:52 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:52:52 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV","expires_in":7200})
+2018/08/26 09:52:52 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV])
+2018/08/26 09:53:06 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:53:06 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX","expires_in":7200})
+2018/08/26 09:53:06 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX expires_in:7200])
+2018/08/26 09:54:43 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:54:44 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS","expires_in":7200})
+2018/08/26 09:54:44 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS expires_in:7200])
+2018/08/26 09:56:04 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 09:56:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO","expires_in":7200})
+2018/08/26 09:56:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO expires_in:7200])
+2018/08/26 10:01:23 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:01:23 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC","expires_in":7200})
+2018/08/26 10:01:23 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC])
+2018/08/26 10:03:00 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:00 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN","expires_in":7200})
+2018/08/26 10:03:00 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN expires_in:7200])
+2018/08/26 10:03:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:03:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI","expires_in":7200})
+2018/08/26 10:03:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI expires_in:7200])
+2018/08/26 10:06:33 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:06:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL","expires_in":7200})
+2018/08/26 10:06:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL expires_in:7200])
+2018/08/26 10:08:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:08:43 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV","expires_in":7200})
+2018/08/26 10:08:43 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV expires_in:7200])
+2018/08/26 10:28:46 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:28:47 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY","expires_in":7200})
+2018/08/26 10:28:47 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY expires_in:7200])
+2018/08/26 10:36:16 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:36:16 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ","expires_in":7200})
+2018/08/26 10:36:16 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ expires_in:7200])
+2018/08/26 10:37:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:37:08 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN","expires_in":7200})
+2018/08/26 10:37:08 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN expires_in:7200])
+2018/08/26 10:48:19 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:48:20 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB","expires_in":7200})
+2018/08/26 10:48:20 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB expires_in:7200])
+2018/08/26 10:57:38 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:57:38 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW","expires_in":7200})
+2018/08/26 10:57:38 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW expires_in:7200])
+2018/08/26 10:58:56 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 10:58:56 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE","expires_in":7200})
+2018/08/26 10:58:56 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE expires_in:7200])
+2018/08/26 15:20:02 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 15:20:03 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU","expires_in":7200})
+2018/08/26 15:20:03 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU expires_in:7200])
+2018/08/26 16:17:50 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/08/26 16:17:50 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE","expires_in":7200})
+2018/08/26 16:17:50 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE expires_in:7200])
+2018/09/05 14:05:44.496 [E]  不存在营销信息!
+2018/09/05 16:08:13.236 [E]  没有对应的营销活动
+2018/09/05 20:46:22 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:46:22 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:46:22 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 20:46:22 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaCourseOrders.CustomerId of type string
+2018/09/05 20:46:22 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_40wwMDxnHi_pYFr00yd2aut_EFTLarqBafPHqwv8R183qUqb_YaeFDTKjy41RrX3fcayrs1zAx5M_6V9ZD3sDSlU-y6F6AUbjV9EPZKOwIASwWYXHIjgt0sFtaWVB0WGhgDUSTKjiN-xejmBZGFcACAQXW","expires_in":7200})
+2018/09/05 20:46:22 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_40wwMDxnHi_pYFr00yd2aut_EFTLarqBafPHqwv8R183qUqb_YaeFDTKjy41RrX3fcayrs1zAx5M_6V9ZD3sDSlU-y6F6AUbjV9EPZKOwIASwWYXHIjgt0sFtaWVB0WGhgDUSTKjiN-xejmBZGFcACAQXW])
+2018/09/05 20:47:15 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:47:15 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:47:17 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:47:17 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:47:17 [E] 下单优惠转换JSON失败: unexpected end of JSON input
+2018/09/05 20:48:57 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:48:57 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:48:57 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 20:48:58 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_cODCqx4ygv6jVXcnJpx7FaGHTMbuGAJ0c3XHxHJvQHXHMcBcaodYjJY5tRxxoe2Gsd0-sIBbBj-q0CgP4zyVQamH4N5Y7ea4MaPEMRdM52tJMfsGeDrmO1679DHdpl-gxcPMGdTSgm_Sn5SHNLLcAFAQOO","expires_in":7200})
+2018/09/05 20:48:58 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_cODCqx4ygv6jVXcnJpx7FaGHTMbuGAJ0c3XHxHJvQHXHMcBcaodYjJY5tRxxoe2Gsd0-sIBbBj-q0CgP4zyVQamH4N5Y7ea4MaPEMRdM52tJMfsGeDrmO1679DHdpl-gxcPMGdTSgm_Sn5SHNLLcAFAQOO expires_in:7200])
+2018/09/05 20:49:18 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:49:18 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:49:23 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:49:23 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:49:27 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:49:27 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:49:44 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:49:44 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:50:00 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:50:00 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:50:00 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 20:50:01 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Kx2YTe2o_Xlqu7XwXF_SmuGSs0pzMKdzTxBVOrdW9Y406UB_OAbuy181N3cqFQVOoZodH7DHkEddPsPgIPU2vlxzXwkW3W5yafkaNSYtFWE80lWE4u8-HpRsU2pSqlplcPZH4hkcqMDFbuJ3NAUaAHAJWQ","expires_in":7200})
+2018/09/05 20:50:01 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_Kx2YTe2o_Xlqu7XwXF_SmuGSs0pzMKdzTxBVOrdW9Y406UB_OAbuy181N3cqFQVOoZodH7DHkEddPsPgIPU2vlxzXwkW3W5yafkaNSYtFWE80lWE4u8-HpRsU2pSqlplcPZH4hkcqMDFbuJ3NAUaAHAJWQ])
+2018/09/05 20:50:06 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:50:06 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:50:10 [E] 解密 Base64 字串失败: illegal base64 data at input byte 1
+2018/09/05 20:50:10 [E] 获取组织信息失败: 没有查询到机构信息
+2018/09/05 20:50:45 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 20:50:45 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JBzudKpFiCtAdYE0Rouc5sin8BHZTUcYQXNEZsXSd7xj7A9OfXnnywRVpAcdwjR2-Bz6OzGkl3lfVl23L7XvGYVU8dj3cjI8qLLW93vaXgz1qE3dPhDt2xqHTTYOv8Ajh4rofEGTmnXP9iX1UAXaAGADJG","expires_in":7200})
+2018/09/05 20:50:45 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JBzudKpFiCtAdYE0Rouc5sin8BHZTUcYQXNEZsXSd7xj7A9OfXnnywRVpAcdwjR2-Bz6OzGkl3lfVl23L7XvGYVU8dj3cjI8qLLW93vaXgz1qE3dPhDt2xqHTTYOv8Ajh4rofEGTmnXP9iX1UAXaAGADJG expires_in:7200])
+2018/09/05 20:55:30 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 20:55:30 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_xvcEAyP8v3zEDtsbWm__3tPL-9QqCmyCudjbChDCB9R-KjLf6T4SKjItQO9to77IfBUy96-2z36i3YKKgpDFTFOA8lNQ6ao81nyrzPkwdhtWV8UHrZctadS1rN6uIm0NHzY353OMLIitxWuBKWFcAGAAMV","expires_in":7200})
+2018/09/05 20:55:30 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xvcEAyP8v3zEDtsbWm__3tPL-9QqCmyCudjbChDCB9R-KjLf6T4SKjItQO9to77IfBUy96-2z36i3YKKgpDFTFOA8lNQ6ao81nyrzPkwdhtWV8UHrZctadS1rN6uIm0NHzY353OMLIitxWuBKWFcAGAAMV expires_in:7200])
+2018/09/05 22:55:30 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/05 22:55:30 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_t_RW2B_Cdc9JwXZWF5oX2-mKsE_NyyL3FclnDrUGboPVRbdDUOKiATUMBPxpfReVAFildW2ChpcVFmo9fR0OAVQCMEE0JYO4kFNN4nVTBKjDr7ih0YnhHn54Ttkrc6vbiiTGfOGJZGgVN1ZAAOBhAIADRE","expires_in":7200})
+2018/09/05 22:55:30 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_t_RW2B_Cdc9JwXZWF5oX2-mKsE_NyyL3FclnDrUGboPVRbdDUOKiATUMBPxpfReVAFildW2ChpcVFmo9fR0OAVQCMEE0JYO4kFNN4nVTBKjDr7ih0YnhHn54Ttkrc6vbiiTGfOGJZGgVN1ZAAOBhAIADRE expires_in:7200])

log/common.log

@@ -1,74 +1,19 @@
-2018/08/26 09:37:50 [E] 查询微信配置失败: Error 1054: Unknown column 'rmark' in 'field list'
-2018/08/26 09:38:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:38:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ","expires_in":7200})
-2018/08/26 09:38:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_-Lg_RS71-apY79btcVmfgOoi47yZER01vtlROS4cXfqgIRfbPkzUPTwvZz6w0DlHMJIk7h-xISGUwZ0Tosff1sEpcfhNiBLw6zvr-l9zpi-tp2N6hJY7QM4uExMIZTSOixTUS9uHKOiK7trvUZWdAIAHMJ])
-2018/08/26 09:44:13 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:44:13 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI","expires_in":7200})
-2018/08/26 09:44:13 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_2REPD5yYQxrGgfgH94odWyxn0xLwS_-9HvVko999_vYdApibljI1UuhMYohVkLz84IMkGEyf9BpSFWbR9oH3qJffwFnjb-f3XVDXjuuGRPpFU5q3acQ1-8Q5PzEXWZdAJAGFI expires_in:7200])
-2018/08/26 09:45:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:45:32 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG","expires_in":7200})
-2018/08/26 09:45:32 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xTyy-6CTPuz4gw7CzuHQhZ73GnK1IL_KpzT9EgUTUX4qSgdqH0ZEgNMxhavJY-kMsaHN15owtkQe0dlf9kfE7Cl0PvCmC9OPc5PiJhflZ2NAAiZp84sKHp81FDsTSBeAHAYXG expires_in:7200])
-2018/08/26 09:49:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:49:09 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM","expires_in":7200})
-2018/08/26 09:49:09 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_K6k5JNOBeMpIe_gitC04i233yiyA6yh1smV1feyiUQTk6010b98PU3X67e8KCvaCjTR0HmjrttsTJLrtzg54TwKnGLE-UgV7NDMMhp4u2r2V56ghJDZ5-7xlC9SxvTkIu0nmQAfAif3ktCULIQZeADAVDM expires_in:7200])
-2018/08/26 09:50:11 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:50:11 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL","expires_in":7200})
-2018/08/26 09:50:11 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Dm3oaLYTAMFOsaxzn6Sm-liedNbNRUDD0lZuCSUHfVFWry9R7oXyyLDXGOsDR6XO_cAReWZ0KBgituizW20oxfHHq8ezj0iiUveePrL03Cml6x7R0WkzMOiNGcXmyzo3Igh3r8QhGK2WfuwOMVQfAAAHQL expires_in:7200])
-2018/08/26 09:51:59 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:51:59 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK","expires_in":7200})
-2018/08/26 09:51:59 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_B0bGSFxdnZK5KT9wzuHQhZ73GnK1IL_KpzT9EvI_ZHhdHbiwSy9FiEfhct77uI_1Brx6kBu3SklukBzw2BnWBk-Q52pYYIb9NpZELzJVR8tzWWbPWD9Tc36StP7FmdpzG1y9UrT4A3idUIDfVRGgAEAZVK expires_in:7200])
-2018/08/26 09:52:26 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:52:26 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE","expires_in":7200})
-2018/08/26 09:52:26 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JaO07aaK8Vbt8mVhb88JC_57VjUKFd0UxQUL0TVMKNF0DUrcHPt4tjZjaeF3K1UI0NPOyNqYytzPg5YfIeSfDowMBreC86pigfPIXZrwlqspCOddE5QtTmD8uGQZ7_VhX0aHegYT8Iy-dSupBNQcAFAPBE expires_in:7200])
-2018/08/26 09:52:52 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:52:52 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV","expires_in":7200})
-2018/08/26 09:52:52 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_W_Xh9756zIW8jFK4bRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkROLC6iU7zSqQxcPQQz-NsBHfFaK9Ol1HliVvIg8efKZGrfBwXva0asAn0OnU869MNfv5-EtNzJl_talvZ7N2twBOBfAEAVIV])
-2018/08/26 09:53:06 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:53:06 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX","expires_in":7200})
-2018/08/26 09:53:06 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_x8W4tYHqT6-xw2KZbRxCsoQiUV0j-zAfNmXR38hdAk10_MDRh15cOJkDRkTiPc6vNMq046pPpyHg_ksa0ELjakenatHGtKfyBPLppB1hTwdcpghc5Z8QmY5upPqR37Epw0HfFweotkLnljJiOEOfAEAXNX expires_in:7200])
-2018/08/26 09:54:43 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:54:44 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS","expires_in":7200})
-2018/08/26 09:54:44 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_PK1MfsKJTJBSyulyKvLRHiorDM-9wwzYsyPyvpnEpTQgtpnYsMM6AwA9DcpV5vq0REYd69l3WhYQ1_0AOZcTW7GKQaAxLmxj47IBXdxLScTYi4l-8ZtP6ZmS96kFROeAGAJVS expires_in:7200])
-2018/08/26 09:56:04 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 09:56:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO","expires_in":7200})
-2018/08/26 09:56:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_igGxdtw6AzmfTOu9cIlzH2dMOQRu-NPQ0Pm92NS4Hm9llCRTrFHsaxQb0etiAjOuQBL7_ep7csgPjvyNWEEZGOZ28akNtaDQD1ApoYYeAihI58iUra270dbdmO8MNEfAGAWXO expires_in:7200])
-2018/08/26 10:01:23 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:01:23 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC","expires_in":7200})
-2018/08/26 10:01:23 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_ho3BftxaKmrGQie6QrTSheSWuAj8XAN8wpjERCj2FB00PWVCksSlu-X-3yVreKXyMZiE9TKDHdpFRJ4TwWiWKC6Bn7nwuF38emI9H3YKw41aq4OzdCHxSpeswgkiUTmGyyLdUBTGvBg3LrgbQUQaACACGC])
-2018/08/26 10:03:00 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:03:00 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN","expires_in":7200})
-2018/08/26 10:03:00 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_mPkwKKOyg1_TrG55P9WmMf-uZJq9ElASxwnCi3kwUmH6i2JfpZRszI-vThMJ8p2BZ155si1rJiD9T1OMphQ2LlU4mVJK2VylENa49ZYKq1nman7AQKmmUhQQf1NF61dSpJzwWL1YcmtxdswWPEWcAFAGVN expires_in:7200])
-2018/08/26 10:03:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:03:37 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:03:37 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI","expires_in":7200})
-2018/08/26 10:03:37 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_pDrce0TWVtCLO-krXhdBpI73YPmDSHDuiZldQlc0KhV3MDE9JEF9fhiCft8VbdEtodGzPVCL0_HE1pGlJ8SPI64yDhihRsrgkw7gh8tUnzSXlax1SqATFixZjSN6ufmekVUwX1lTNaQxz74BDSNaAHAYNI expires_in:7200])
-2018/08/26 10:06:33 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:06:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL","expires_in":7200})
-2018/08/26 10:06:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_DZoFCC4yhlTyAkYxNIDuR2xRUAWJHPruJFOqDuEV3D5d1DdqVNkCznwmzs340F7K4wM5CiXND7hySR6ljElUYYPdZq_LrWW-g-Q5SzsRT6RRelYmhu4yRe8J8cBBg_ElkEbervWfr1DBlstvZOHaAIADSL expires_in:7200])
-2018/08/26 10:08:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:08:43 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV","expires_in":7200})
-2018/08/26 10:08:43 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_96NNB_wLDEFTiOTGTmi9TkQvj1AiAe3lQIQWnbQIohFWbJ5DduY27W7k_Acaf8CUKq-N1Bl9yorRUuG690EDGHwBuA5tpkg3fAvrnn50VNEmTbtaNN3H22dcMu5eqxZIAtptEs_n5SRPXBfXOKIcACABXV expires_in:7200])
-2018/08/26 10:28:46 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:28:47 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY","expires_in":7200})
-2018/08/26 10:28:47 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_tfSozSKyxf6tttaz0yd2aut_EFTLarqBafPHq9AIARgmCTZL471kN1LURN4Fkklongv4QIwKWMKPgiDc0Lz_2UrwBmbDWFsr_CsKoXMewVTLbjcPRMzVwps-bgL865o-ivCgAv_1lk9AZ92BFPFeAFAYIY expires_in:7200])
-2018/08/26 10:36:16 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:36:16 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ","expires_in":7200})
-2018/08/26 10:36:16 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Bgp4G3PY317x9UpbQOS6uPUvYLON3hDKHhqdyhD0TB_S4qUw5Kps-GnjTBABV8fU0Fq5JZkiTeXHHCLXnolcWgx3lMMy736Q_UU2hWVRHoiVTR7WRe08Yg3p2_OxIS43-bhf5ZZ1Pq1vpla5PDDfABACQQ expires_in:7200])
-2018/08/26 10:37:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:37:08 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN","expires_in":7200})
-2018/08/26 10:37:08 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_7OsVSwADwqEcwqQKNIDuR2xRUAWJHPruJFOqDlmHgDjknD0fdU94o7ndqas3U5aNtlfiNoovlsA4RLjUmqIMGf0vTlCFBjQ_M8L-N-i1jlcQiugyXFDRWsui1CUIG_9gW7gCdS1LUybkGRE4ZCIcABAEHN expires_in:7200])
-2018/08/26 10:48:19 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:48:20 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB","expires_in":7200})
-2018/08/26 10:48:20 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kgQXjSoiSNu6r7VNYRaB7Jkvc6MyxsgqlfRp0GD3t4U9VVRlLLteA1jq_4IZBAVt3zYLiacrmsTJLR2nD9qb99yUWfPaLFP8NBTDPvu4cFYbNFHmOBMUJwVW9lVEaPm_2kQY1tnqcmFRpa6uKOGeABAFJB expires_in:7200])
-2018/08/26 10:57:38 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:57:38 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW","expires_in":7200})
-2018/08/26 10:57:38 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_IuDEV53CHWkI4PMqWBMNgMuHx4Y6f7UP5MD90PRncFeGPK9Ri00Zbf6d-IvnUZ3FEhCN7bkwGK9wJPJGXu-RY5J91Cpr_OII7IZhVYPjtdLWuBIPzkcq28gKfxTRlSQTCQXGc3_khJMAJrNIDUThAGAGXW expires_in:7200])
-2018/08/26 10:58:56 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 10:58:56 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE","expires_in":7200})
-2018/08/26 10:58:56 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_j6hv2N3bFx7qKu-zMWqgXQqP5f3C1fi5MKw7aVmOU27p7NHWfiwleuTzzhyuccc9zfejZJV9s615X9pGZo2swrUQa_R4b3jFxn7OLuA3jDgBBUQwvIv578aeNjgLLVfAIAUUE expires_in:7200])
-2018/08/26 15:20:02 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 15:20:03 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU","expires_in":7200})
-2018/08/26 15:20:03 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BWujCeV9M2yUp5tsJpx7FaGHTMbuGAJ0c3XHxCrkY7-Ro9tiu-cAJNx45PdkiNe5SfTZrW7ZhHXz36VnZ8HYzN6arFiFgloLHh9qJIb9_sIqFAgi2NPApcOm16BXEF4GY7KDOza67EWofM1jIQIgABAUCU expires_in:7200])
-2018/08/26 16:17:50 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
-2018/08/26 16:17:50 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE","expires_in":7200})
-2018/08/26 16:17:50 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_hezlnSFBORaBwf5SdwfaSZEoGO35hkS4XL7D2SKqDSUwryGZpP6lFh9fVUDjFQzwv0oH3wZnP5ANT4rE1nQEeBgZTHIPo5Qzu5KpHhVFQNc_0bb6XGAFm-ugPf9iKI2tVA4SIfILsf6VunDeLZUeAAAVJE expires_in:7200])
+2018/09/06 00:55:30 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 00:55:31 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kGO2m4o8zKJ3gsMJZyjvca0UIbYlLWH2LICN32aHM_FWndndUtbu34yKWCFl6ZsTz1aOU1hkIThtzE9-zlua3unqWpSWsAksqPkACepBBrg3GvG12z3XFne7pqTDYiFt1NFaRYIY8chIebf_LXTdABAWIE","expires_in":7200})
+2018/09/06 00:55:31 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kGO2m4o8zKJ3gsMJZyjvca0UIbYlLWH2LICN32aHM_FWndndUtbu34yKWCFl6ZsTz1aOU1hkIThtzE9-zlua3unqWpSWsAksqPkACepBBrg3GvG12z3XFne7pqTDYiFt1NFaRYIY8chIebf_LXTdABAWIE expires_in:7200])
+2018/09/06 02:55:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 02:55:34 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_aR4DB2OqIdEfP4JJnJDeSpgzotgSdNS5Vf2aZSVy5E7DNXVx1L_mB6YqHaa7ZiKR_rL6o0WrprpqjbwIQc5cIn2BrsGw1aATXZ10aX2uOnYZz-H6IveV2iBctqediWKkUvHk_RUu_5Oz1ioTGRYdAEAWHO","expires_in":7200})
+2018/09/06 02:55:34 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_aR4DB2OqIdEfP4JJnJDeSpgzotgSdNS5Vf2aZSVy5E7DNXVx1L_mB6YqHaa7ZiKR_rL6o0WrprpqjbwIQc5cIn2BrsGw1aATXZ10aX2uOnYZz-H6IveV2iBctqediWKkUvHk_RUu_5Oz1ioTGRYdAEAWHO expires_in:7200])
+2018/09/06 04:55:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 04:55:34 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_b4rZ-khuDu-W1D6NR8XrOWIrmE3-ZsK0ek_a8Nu_jF0qRX77WawUfzuLA_jfEXK-ar0-MvWW56TTbNHTxJBiuaYeqZXRxEBhhTFAIiCwOUNVhKRUv20HEiDXWxUtARHuhwMWLrq-5RpSR4kWUNEaAFABUL","expires_in":7200})
+2018/09/06 04:55:34 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_b4rZ-khuDu-W1D6NR8XrOWIrmE3-ZsK0ek_a8Nu_jF0qRX77WawUfzuLA_jfEXK-ar0-MvWW56TTbNHTxJBiuaYeqZXRxEBhhTFAIiCwOUNVhKRUv20HEiDXWxUtARHuhwMWLrq-5RpSR4kWUNEaAFABUL])
+2018/09/06 06:55:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 06:55:35 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_9QbvqB6jescI5Bo9mzNBGgnkIi9oOXCa9C8mUchk9QW3m7tNujZrRWyyNzj0az0bITcMUuZv1Z-zzGijPG_CwqEoQDGRnLaSBdkrrleAUx_E39Yq5FywHsnZ3V_JggU6f3qK75Web3xS8UuRSHTjAAAGVH","expires_in":7200})
+2018/09/06 06:55:35 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_9QbvqB6jescI5Bo9mzNBGgnkIi9oOXCa9C8mUchk9QW3m7tNujZrRWyyNzj0az0bITcMUuZv1Z-zzGijPG_CwqEoQDGRnLaSBdkrrleAUx_E39Yq5FywHsnZ3V_JggU6f3qK75Web3xS8UuRSHTjAAAGVH expires_in:7200])
+2018/09/06 08:55:35 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 08:55:35 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_PqDN-Jr9h-T_WNXormtbkXrv6GoHX0tx6D0z52ItI6GGvhP76ZCVBxIIOlddFvQrch-ayrCOhjOYPU8PeR2ME_UaSoHX0QHST1KgtKpK_J4SQwE0JuIusnBg3UbQ9MjIPVTemQiSCrqIyKp7AJGaAIASBY","expires_in":7200})
+2018/09/06 08:55:35 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_PqDN-Jr9h-T_WNXormtbkXrv6GoHX0tx6D0z52ItI6GGvhP76ZCVBxIIOlddFvQrch-ayrCOhjOYPU8PeR2ME_UaSoHX0QHST1KgtKpK_J4SQwE0JuIusnBg3UbQ9MjIPVTemQiSCrqIyKp7AJGaAIASBY expires_in:7200])
+2018/09/06 08:59:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 08:59:42 [E] 获取课程信息失败: a pointer to a pointer is not allowed
+2018/09/06 08:59:42 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_M_kvI_z4pOqAS1IOxrEBuww0pRQQc71V6Q1orhkJL7Nxt91N34sELesVttpgb575SNGF36NA08CfuEOxoxCbjL2ugqCle9NG4wdBdtjfa_YwOUJ2AD0g63LmRtcAAAbAAAJJJ","expires_in":7200})
+2018/09/06 08:59:42 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_M_kvI_z4pOqAS1IOxrEBuww0pRQQc71V6Q1orhkJL7Nxt91N34sELesVttpgb575SNGF36NA08CfuEOxoxCbjL2ugqCle9NG4wdBdtjfa_YwOUJ2AD0g63LmRtcAAAbAAAJJJ])

models/course/course.go

@@ -194,10 +194,16 @@ func (m *CourseDAO) DelCourseImg(imgid string) error {
 	return err
 }
 
+// TagDetail 标签
+type TagDetail struct {
+	model.TaCourseTag `xorm:"extends"`
+	TagName           string
+}
+
 // CourseDetail 课程详情
 type CourseDetail struct {
 	model.TaCourse `xorm:"extends"`
-	CourseTags     []model.TaCourseTag
+	CourseTags     []TagDetail
 	CourseImgs     []model.TaCourseImg
 	CourseDetail   []model.TaCourseDetail
 	CaseInfo       *model.SysCase
@@ -205,16 +211,25 @@ type CourseDetail struct {
 
 // GetCourseInfo 获取课程详情
 func (m *CourseDAO) GetCourseInfo(courseid string) (*CourseDetail, error) {
-	var courses []CourseDetail
+	course := new(CourseDetail)
 	sql := `select * from ta_course where course_id='` + courseid + `'`
-	err := m.db.Sql(sql).Find(&courses)
+	has, err := m.db.Sql(sql).Get(&course)
 	if err != nil {
 		return nil, err
 	}
-	if len(courses) > 0 {
-		return &courses[0], nil
+
+	if !has {
+		return nil, nil
 	}
-	return nil, nil
+
+	details, err := m.GetCourseDetail(courseid)
+	if err != nil {
+		return nil, err
+	}
+
+	course.CourseDetail = details
+
+	return course, nil
 }
 
 // GetCourseDetail 获取课程明细
@@ -224,36 +239,52 @@ func (m *CourseDAO) GetCourseDetail(courseid string) ([]model.TaCourseDetail, er
 	return details, err
 }
 
+// DetailInfo 排课记录
+type DetailInfo struct {
+	model.TaCourseDetail `xorm:"extends"`
+	CourseStatus         int
+	CourseName           string
+	CaseName             string
+	CaseAddress          string
+}
+
 // GetDetails 获取所有的排课记录
-func (m *CourseDAO) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
-	var details []model.TaCourseDetail
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
+func (m *CourseDAO) GetDetails(caseid, date string) ([]DetailInfo, error) {
+	var details []DetailInfo
+
+	sql := `select a.*,b.course_name,b.status as course_status,c.case_name,c.case_address from ta_course_detail a 
+	inner join ta_course b on a.course_id=b.course_id 
+	inner join sys_case c on a.case_id=c.case_id where a.status>` + strconv.Itoa(models.STATUS_DEL) + `
+	and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id='` + caseid + `' and DATE_FORMAT(a.begin_date,'%Y-%m') = '` + date + `'`
+	err := m.db.Sql(sql).Find(&details)
+
+	// err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
 	return details, err
 }
 
 // GetCourseSchedule 获取需要排课的记录
 func (m *CourseDAO) GetCourseSchedule(name, caseids, date string, page, pageSize int) ([]model.TaCourse, error) {
 	var courses []model.TaCourse
-	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
 	if caseids != "" {
-		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	}
-	err := dao.OrderBy("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
+	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
 	return courses, err
 }
 
 // GetCourseScheduleCount 获取排课记录数
 func (m *CourseDAO) GetCourseScheduleCount(name, caseids, date string) (int, error) {
 	var courses []model.TaCourse
-	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
 	if caseids != "" {
-		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	}
 	err := dao.Find(&courses)
 	return len(courses), err
@@ -319,9 +350,10 @@ func (m *CourseDAO) SaveCourseTag(coursetags []model.TaCourseTag) error {
 }
 
 // GetCourseTag 获取课程对应标签
-func (m *CourseDAO) GetCourseTag(courseid string) ([]model.TaCourseTag, error) {
-	var coursetags []model.TaCourseTag
-	err := m.db.Where("course_id=?", courseid).Find(&coursetags)
+func (m *CourseDAO) GetCourseTag(courseid string) ([]TagDetail, error) {
+	var coursetags []TagDetail
+	sql := `select a.*,b.tag_name from ta_course_tag a inner join td_course_tag b on a.tag_id=b.tag_id where a.course_id='` + courseid + `'`
+	err := m.db.Sql(sql).Find(&coursetags)
 	return coursetags, err
 }
 

models/course/tag.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 )
 
 // GetTagsList 获取标签列表
@@ -31,6 +32,7 @@ func (m *CourseDAO) GetTagsCount(orgid string) (int, error) {
 func (m *CourseDAO) AddCourseTag(tag model.TdCourseTag) (*model.TdCourseTag, error) {
 	tag.TagId = utils.GetGUID()
 	tag.Status = models.STATUS_NORMAL
+	tag.CreateDate = time.Now()
 	_, err := m.db.Insert(tag)
 	return &tag, err
 }

models/goods/goods.go

@@ -5,6 +5,8 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/yl10/kit/guid"
@@ -32,43 +34,49 @@ func (m *GoodsDAO) GetGoodsListPageNavi(name, typeID, caseID string, limit []int
 	sql := `
 		SELECT *
 		FROM
-			ta_goods t
+			ta_goods
 		WHERE
-			t.case_id = ?
+			case_id in ('` + strings.Replace(caseID, ",", "','", -1) + `')
 	`
 
 	if name != "" {
 		sql += `
-			AND LOWER(t.goods_name) LIKE '%` + name + `%'
+			AND goods_name LIKE '%` + name + `%'
 		`
 	}
 
 	if typeID != "" {
 		sql += `
-			AND t.type_id = '` + typeID + `'
+			AND type_id = '` + typeID + `'
 		`
 	}
 
 	sql += `		
-		AND t.status > ?
+		AND status > ` + strconv.Itoa(models.STATUS_DEL) + `
 		ORDER BY
-			t.type_id,
-			t.create_date
+			type_id,
+			create_date
 	`
 
+	// sql += ` limit ` + strconv.Itoa(limit[0]) + ` OFFSET ` + strconv.Itoa(limit[1])
+
 	var goodsList []GoodsWithSpec
-	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&goodsList, sql, limit, caseID, models.STATUS_DEL)
+	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&goodsList, sql, limit)
 	if err != nil {
 		return nil, 0, err
 	}
-
 	for inx, goods := range goodsList {
 		specs, err := m.GetSpecWithPrice(goods.GoodsId)
 		if err != nil {
 			return nil, 0, err
 		}
-
 		goodsList[inx].Specs = specs
+
+		imgs, err := m.GetGoodsImgByGoodsID(goods.GoodsId)
+		if err != nil {
+			return nil, 0, err
+		}
+		goodsList[inx].Images = imgs
 	}
 
 	return goodsList, cnt, nil
@@ -98,9 +106,9 @@ func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 
 // GetSpecWithPrice 获取商品规格 含 金额
 func (m *GoodsDAO) GetSpecWithPrice(goodsID string) ([]SpecWithPrice, error) {
-	sql := `SELECT * FROM td_spec t
+	sql := `SELECT t.*,s.goods_price FROM td_spec t
 		JOIN ta_goods_spec s ON t.spec_id = s.spec_id
-		WHERE t.status = ? AND s.goods_id = ?
+		WHERE t.status > ? AND s.goods_id = ?
 	`
 
 	var specs []SpecWithPrice
@@ -162,9 +170,15 @@ func (m *GoodsDAO) GetGoodsWithSpecByID(id string) (*GoodsWithSpec, error) {
 		return nil, err
 	}
 
+	imgs, err := m.GetGoodsImgByGoodsID(id)
+	if err != nil {
+		return nil, err
+	}
+
 	return &GoodsWithSpec{
 		TaGoods: *goods,
 		Specs:   specs,
+		Images:  imgs,
 	}, nil
 }
 
@@ -293,3 +307,10 @@ func (m *GoodsDAO) DeleteGoods(id string) error {
 
 	return nil
 }
+
+// GetGoodsImgByGoodsID 根据商品ID获取商品图片信息
+func (m *GoodsDAO) GetGoodsImgByGoodsID(goodsid string) ([]model.TaGoodsImg, error) {
+	var goodsimg []model.TaGoodsImg
+	err := m.db.Where("goods_id=?", goodsid).Find(&goodsimg)
+	return goodsimg, err
+}

models/goods/types.go

@@ -14,20 +14,21 @@ const (
 
 // SpecWithPrice 规格价格
 type SpecWithPrice struct {
-	model.TdSpec `xorm."extends"`
+	model.TdSpec `xorm:"extends"`
 	GoodsPrice   string `xorm:"DECIMAL(8,2)"`
 }
 
 // GoodsWithSpec 含规格商品
 type GoodsWithSpec struct {
-	model.TaGoods `xorm."extends"`
+	model.TaGoods `xorm:"extends"`
 	Specs         []SpecWithPrice
+	Images        []model.TaGoodsImg
 }
 
 // GoodsWithPrice 含规格商品
 type GoodsWithPrice struct {
-	model.TaGoods     `xorm."extends"`
-	model.TaGoodsSpec `xorm."extends"`
+	model.TaGoods     `xorm:"extends"`
+	model.TaGoodsSpec `xorm:"extends"`
 }
 
 // OrdersWithGoods 订单列表

models/marketing/marketing.go

@@ -0,0 +1,153 @@
+package marketing
+
+import(
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"time"
+	"github.com/go-xorm/xorm"
+)
+
+// 活动类型
+const (
+	NEW_ACTIVITIES = 0 // 注册赠券
+
+)
+
+// 状态
+const (
+	DELETE = -1 // 删除
+	NORMAL = 0 // 正常
+	DISABLE = 1 // 停用
+
+)
+
+// 赠券卡券
+const (
+	drink = 1 // 饮品通用卷
+	course = 2 // 课程通用卷
+	petty_diplomat = 3 // 小小外交官通用卷
+)
+
+// GoodsDAO 当前数据库操作对象
+type MarketingDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewMarketingDAO New Inst
+func NewMarketingDAO(ctx *utils.Context) *MarketingDAO {
+	return &MarketingDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// MarketingInfo 课程
+type MarketingInfo struct {
+	model.SysActivity `xorm:"extends"`
+	Actions []model.SysActivityAction
+}
+
+// GetMarketingList 查询所有
+func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo ,error){
+
+	var news []MarketingInfo
+	sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&news)
+	return news, err
+
+}
+
+// GetMarketingCount 获取总数
+func (m *MarketingDAO) GetMarketingCount()(int64, error){
+	var total []int64
+	sql := `select count(*) as total from sys_activity`
+	err := m.db.Sql(sql).Cols("total").Find(&total)
+	if err!=nil{
+
+	}
+	return total[0], err
+}
+
+
+// AddMarketing 添加
+func (m *MarketingDAO) AddMarketing(activity *model.SysActivity) (*model.SysActivity, error) {
+	activity.ActivityId = utils.GetGUID()
+	activity.CreateDate = time.Now()
+	//activity.Status = models.STATUS_NORMAL
+	activity.Status = NORMAL // 状态为正常
+	org := m.ctx.Get("org").(model.SysOrg)
+	activity.OrgId = org.OrgId
+	caseinfo := m.ctx.Get("currentCase").(model.SysCase)
+	activity.CaseId = caseinfo.CaseId
+	//activity.CaseId = user.
+
+	_, err := m.db.Insert(activity)
+
+	// // 添加活动动作数据
+	// var new model.SysActivityAction
+	// new.ActionId = activity.ActivityId
+	// new.ActiveType = activity.ActivityType
+	return activity, err
+}
+
+
+// GetMarketingById 根据ID查询活动营销
+func (m *MarketingDAO) GetMarketingById(activityId string) (*model.SysActivity,error){
+
+	var activity []model.SysActivity
+	err := m.db.Where("activity_id=?",activityId).Find(&activity)
+	if err != nil {
+		return nil, err
+	}
+	if len(activity) >0 {
+		return &activity[0],nil
+	}
+	return nil,nil
+	
+}
+
+// DelMarketing 修改状态 营销活动(删除,启用,停用)
+/**
+ *	DELETE = -1 // 删除
+		NORMAL = 0 // 正常
+		DISABLE = 1 // 停用
+ **/
+func (m *MarketingDAO) DelMarketing(activityId string,status int) error {
+
+	var info = model.SysActivity{
+		ActivityId: activityId,
+		// Status:   models.STATUS_DEL,
+		Status:   status,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("activity_id=?", activityId).Update(info)
+	return err
+}
+
+
+// UpdateMarketing 修改 营销活动
+func (m *MarketingDAO) UpdateMarketing(activity model.SysActivity) error {
+	// var cols = []string{
+	// 	"activity_name",
+	// 	"activity_type",
+	// 	"case_id",
+	// 	"org_id",
+	// 	"case_id",
+	// }
+
+	var cols = []string{
+		"activity_name",
+		"activity_type",
+	}
+	_, err := m.db.Cols(cols...).Where("action_id=?", activity.ActivityId).Update(activity)
+	return err
+}
+
+
+
+
+

models/marketing/work.go

@@ -0,0 +1,52 @@
+package marketing
+
+import(
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"github.com/go-xorm/xorm"
+)
+
+// WorkDAO 当前数据库操作对象
+type WorkDAO struct {
+	ctx *utils.Context
+	db *xorm.Session
+}
+
+// NewMarketingDAO New Inst
+func NewWorkDAO(ctx *utils.Context) *WorkDAO {
+	return &WorkDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+// WrokInfo 活动动作
+type WrokInfo struct {
+	model.SysActivityAction `xorm:"extends"`
+	CourseType     string
+}
+
+// 添加 活动动作
+func (m *WorkDAO) AddWork(action *model.SysActivityAction) (*model.SysActivityAction,error){
+	action.ActionId = utils.GetGUID()
+	_,err := m.db.Insert(&action)
+
+	return action,err
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

models/message/cmscase.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
@@ -9,8 +10,6 @@ import (
 	"time"
 
 	"github.com/astaxie/beego"
-
-	"github.com/go-xorm/builder"
 )
 
 // CmsCaseInfo 项目专题
@@ -60,14 +59,15 @@ func (m *MessageDAO) GetCmsCaseListCount(name, caseids string) (int, error) {
 // CmsCase 项目详情
 type CmsCase struct {
 	model.TaCmsCase `xorm:"extends"`
-	Courses         []model.TaCourse
+	CaseAddress     string
+	Courses         []course.CourseDetail
 	CmsCaseImgs     []model.TaCmsCaseImage
 }
 
 // GetCmsCaseByID 获取项目专题详情
 func (m *MessageDAO) GetCmsCaseByID(cmscaseid string) (*CmsCase, error) {
 	var cases []CmsCase
-	sql := `select * from ta_cms_case where cms_case_id='` + cmscaseid + `' and status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `select a.*,b.case_address from ta_cms_case a inner join sys_case b on a.case_id=b.case_id where a.cms_case_id='` + cmscaseid + `' and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&cases)
 	if err != nil {
 		beego.Error(err)
@@ -80,9 +80,11 @@ func (m *MessageDAO) GetCmsCaseByID(cmscaseid string) (*CmsCase, error) {
 }
 
 // GetCoursesByCmsCase 根据项目专题ID获取课程信息
-func (m *MessageDAO) GetCoursesByCmsCase(cmscaseid string) ([]model.TaCourse, error) {
-	var course []model.TaCourse
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).In("course_id", builder.Select("course_id").From("ta_cms_case_course").Where(builder.Eq{"cms_case_id": cmscaseid})).Find(&course)
+func (m *MessageDAO) GetCoursesByCmsCase(cmscaseid string) ([]course.CourseDetail, error) {
+	var course []course.CourseDetail
+	sql := `select a.* from ta_course a inner join ta_cms_case_course b on a.course_id=b.course_id where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and b.cms_case_id = ?`
+
+	err := m.db.Sql(sql, cmscaseid).Find(&course)
 	return course, err
 }
 
@@ -94,9 +96,10 @@ func (m *MessageDAO) GetCmsCaseImgs(cmscaseid string) ([]model.TaCmsCaseImage, e
 }
 
 // GetCourseByCaseID 根据案场ID获取所有的课程信息
-func (m *MessageDAO) GetCourseByCaseID(caseid string) ([]model.TaCourse, error) {
-	var course []model.TaCourse
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id=?", caseid).Find(&course)
+func (m *MessageDAO) GetCourseByCaseID(caseid string) ([]course.CourseDetail, error) {
+	var course []course.CourseDetail
+	sql := `select * from ta_course where status>` + strconv.Itoa(models.STATUS_DEL) + ` and case_id=?`
+	err := m.db.Sql(sql, caseid).Find(&course)
 	return course, err
 }
 

models/model/ta_customer_card.go

@@ -11,9 +11,6 @@ type TaCustomerCard struct {
 	CustomerId       string    `xorm:"VARCHAR(64)"`
 	StartDate        time.Time `xorm:"DATETIME"`
 	EndDate          time.Time `xorm:"DATETIME"`
-	CourseNum        int       `xorm:"INT(11)"`
-	JoinNum          int       `xorm:"INT(11)"`
-	CardState        string    `xorm:"VARCHAR(64)"`
 	Status           int       `xorm:"SMALLINT(6)"`
 	ReceiveDate      time.Time `xorm:"DATETIME"`
 	VerifyDate       time.Time `xorm:"DATETIME"`

models/model/ta_customer_course.go

@@ -11,6 +11,7 @@ type TaCustomerCourse struct {
 	OrgId            string    `xorm:"VARCHAR(64)"`
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	CourseName       string    `xorm:"VARCHAR(50)"`
+	LocationId       string    `xorm:"VARCHAR(64)"`
 	Price            string    `xorm:"DECIMAL(8,2)"`
 	CourseNum        int       `xorm:"INT(11)"`
 	JoinNum          int       `xorm:"INT(11)"`

models/verify/verify.go

@@ -1,11 +1,9 @@
 package verify
 
 import (
-	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
-	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -24,267 +22,176 @@ func NewVerifyDAO(ctx *utils.Context) *VerifyDAO {
 	}
 }
 
-type verifyCourse struct {
-	targetId     string
-	caseId       string
-	caseName     string
-	locationName string
-	courseName   string
-	detailName   string
-	beginDate    time.Time
-	endDate      time.Time
-	courseType   string
+type MyCourse struct {
+	model.TaCustomerCourseDetail `xorm:"extends"`
+	CaseName                     string
+	CourseName                   string
+	DetailName                   string
+	LocationName                 string
+	CustomerId                   string
 }
 
-func (m *VerifyDAO) GetExperienceCardVerifyList(customerCardId string, page, pageSize int) ([]verifyCourse, error) {
-	var course []verifyCourse
-	sql := `SELECT
-	a.target_id,
-	g.case_name,
-	c.card_id,
-	f.location_name,
-	e.course_name,
-	d.detail_name,
-	d.begin_date,
-	d.end_date,
-	'card' as courseType 
-FROM
-	ta_coupon_card_target a
-	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
-	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
-	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
-	INNER JOIN ta_course e ON d.course_id = e.course_id
-	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
-	INNER JOIN sys_case g ON g.case_id = c.case_id 
-WHERE
-	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
-	AND c.customer_card_id = ` + customerCardId
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql).Find(&course)
-	return course, err
+func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
+	var customerCourseDerail []model.TaCustomerCourseDetail
+	err := m.db.Where("customer_detail_id =?", id).Find(&customerCourseDerail)
+	if err != nil {
+		return nil, err
+	}
+	if len(customerCourseDerail) > 0 {
+		return &customerCourseDerail[0], nil
+	}
+	return nil, nil
 }
 
-func (m *VerifyDAO) GetExperienceCardVerifyListCount(customerCardId string) (int, error) {
-	var course []verifyCourse
+// GetCustomerCourseList 根据我的课程id获取我的课程详情
+func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page int, pageSize int) ([]MyCourse, error) {
+	var courseList []MyCourse
 	sql := `SELECT
-	a.target_id,
-	g.case_name,
-	c.card_id,
+	a.*,
+	d.case_name,
+	b.course_name,	
+	c.detail_name,
 	f.location_name,
-	e.course_name,
-	d.detail_name,
-	d.begin_date,
-	d.end_date,
-	'card' as courseType 
-FROM
-	ta_coupon_card_target a
-	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
-	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
-	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
-	INNER JOIN ta_course e ON d.course_id = e.course_id
-	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
-	INNER JOIN sys_case g ON g.case_id = c.case_id 
-WHERE
-	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
-	AND c.customer_card_id = ` + customerCardId
-	err := m.db.Sql(sql).Find(&course)
-	return len(course), err
+	b.customer_id
+	FROM
+	ta_customer_course_detail a
+	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
+	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
+	INNER JOIN sys_case d ON d.case_id = a.case_id
+	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
+	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+	AND a.customer_course_id = '` + customerCourseId + `'
+	and b.case_id = '` + caseid + `'`
+	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql).Find(&courseList)
+	return courseList, err
 }
 
-func (m *VerifyDAO) GetOrderCourseList(courseOrderId string, page, pageSize int) ([]verifyCourse, error) {
-	var course []verifyCourse
+// GetCustomerCourseListCount 根据我的课程id获取我的课程详情数量
+func (m *VerifyDAO) GetCustomerCourseListCount(customerCourseId, caseid string) (int, error) {
+	var courseList []MyCourse
 	sql := `SELECT
-	a.orders_detail_id AS target_id,
-	b.case_id,
-	f.case_name,
-	e.location_name,
-	c.course_name,
-	d.detail_name,
-	a.begin_date,
-	a.end_date,
-	'order' as courseType
-FROM
-	ta_course_orders_detail a
-	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
-	INNER JOIN ta_course c ON b.course_id = c.course_id
-	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
-	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
-	INNER JOIN sys_case f ON b.case_id = f.case_id 
-WHERE
-	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	AND b.orders_id = ` + courseOrderId
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql).Find(&course)
-	return course, err
-
+	a.*,
+	d.case_name,
+	b.course_name,	
+	c.detail_name
+	FROM
+	ta_customer_course_detail a
+	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
+	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
+	INNER JOIN sys_case d ON d.case_id = a.case_id
+	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+	AND a.customer_course_id = '` + customerCourseId + `'
+	and b.case_id = '` + caseid + `'`
+	err := m.db.Sql(sql).Find(&courseList)
+	return len(courseList), err
 }
 
-func (m *VerifyDAO) GetOrderCourseListCount(courseOrderId string) (int, error) {
-	var course []verifyCourse
-	sql := `SELECT
-	a.orders_detail_id AS target_id,
-	b.case_id,
-	f.case_name,
-	e.location_name,
-	c.course_name,
-	d.detail_name,
-	a.begin_date,
-	a.end_date,
-	'order' as courseType
-FROM
-	ta_course_orders_detail a
-	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
-	INNER JOIN ta_course c ON b.course_id = c.course_id
-	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
-	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
-	INNER JOIN sys_case f ON b.case_id = f.case_id 
-WHERE
-	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	AND b.orders_id = ` + courseOrderId
-	err := m.db.Sql(sql).Find(&course)
-	return len(course), err
+// UpdateCustomerCourseDetail 更新我的课程详情
+func (m *VerifyDAO) UpdateCustomerCourseDetail(customerCourse *model.TaCustomerCourseDetail) error {
+	var cols = []string{
+		"verify_status",
+		"verify_date",
+		"verify_user",
+	}
+	_, err := m.db.Cols(cols...).Where("customer_detail_id=?", customerCourse.CustomerDetailId).Update(customerCourse)
+	return err
 }
 
-func (m *VerifyDAO) GetCourseListByTel(tel string, page, pageSize int) ([]verifyCourse, error) {
-	var course []verifyCourse
+// GetCustomerCourseListByTel 根据客户电话获取我的课程详情
+func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSize int) ([]MyCourse, error) {
+	var courseList []MyCourse
 	sql := `SELECT
-	a.target_id,
-	g.case_name,
-	c.card_id,
-	f.location_name,
-	e.course_name,
-	d.detail_name,
-	d.begin_date,
-	d.end_date,
-	'card' as courseType 
-FROM
-	ta_coupon_card_target a
-	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
-	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
-	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
-	INNER JOIN ta_course e ON d.course_id = e.course_id
-	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
-	INNER JOIN sys_case g ON g.case_id = c.case_id 
-	INNER JOIN ta_customer h ON c.customer_id = h.customer_id
-WHERE
-	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
-	AND h.phone = ` + tel + `
-	union all
-	SELECT
-	a.orders_detail_id AS target_id,
-	b.case_id,
-	f.case_name,
-	e.location_name,
-	c.course_name,
-	d.detail_name,
-	a.begin_date,
-	a.end_date,
-	'order' as courseType
-FROM
-	ta_course_orders_detail a
-	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
-	INNER JOIN ta_course c ON b.course_id = c.course_id
-	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
-	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
-	INNER JOIN sys_case f ON b.case_id = f.case_id 
-	INNER JOIN ta_customer g ON b.customer_id = g.customer_id
-WHERE
-	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	AND g.phone = ` + tel
-	sql = sql + " limit  " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql).Find(&course)
-	return course, err
+	a.*,
+	d.case_name,
+	b.course_name,
+	c.detail_name,
+	b.customer_id,
+	f.location_name
+	FROM
+	ta_customer_course_detail a
+	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
+	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
+	INNER JOIN sys_case d ON d.case_id = a.case_id
+	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
+	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
+	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+	AND e.phone = '` + tel + `'
+	and b.case_id='` + caseid + `'`
+	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := m.db.Sql(sql).Find(&courseList)
+	return courseList, err
 }
 
-func (m *VerifyDAO) GetCourseListByTelCount(tel string) (int, error) {
-	var course []verifyCourse
+// GetCustomerCourseListByTelCount 根据客户电话获取我的课程详情数量
+func (m *VerifyDAO) GetCustomerCourseListByTelCount(tel, caseid string) (int, error) {
+	var courseList []MyCourse
 	sql := `SELECT
-	a.target_id,
-	g.case_name,
-	c.card_id,
-	f.location_name,
-	e.course_name,
-	d.detail_name,
-	d.begin_date,
-	d.end_date,
-	'card' as courseType 
+	a.*,
+	d.case_name,
+	b.course_name,
+	c.detail_name
 FROM
-	ta_coupon_card_target a
-	INNER JOIN ta_coupon_card b ON a.card_id = b.card_id
-	INNER JOIN ta_customer_card c ON c.card_id = b.card_id
-	INNER JOIN ta_course_detail d ON d.detail_id = a.detail_id
-	INNER JOIN ta_course e ON d.course_id = e.course_id
-	INNER JOIN td_cms_image_location f ON e.location_id = f.location_id
-	INNER JOIN sys_case g ON g.case_id = c.case_id 
-	INNER JOIN ta_customer h ON c.customer_id = h.customer_id
-WHERE
-	DATE_FORMAT( d.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' )
-	AND h.phone = ` + tel + `
-	union all
-	SELECT
-	a.orders_detail_id AS target_id,
-	b.case_id,
-	f.case_name,
-	e.location_name,
-	c.course_name,
-	d.detail_name,
-	a.begin_date,
-	a.end_date,
-	'order' as courseType
-FROM
-	ta_course_orders_detail a
-	INNER JOIN ta_course_orders b ON a.orders_id = b.orders_id
-	INNER JOIN ta_course c ON b.course_id = c.course_id
-	INNER JOIN ta_course_detail d ON a.course_detail_id = d.detail_id
-	INNER JOIN td_cms_image_location e ON e.location_id = c.location_id
-	INNER JOIN sys_case f ON b.case_id = f.case_id 
-	INNER JOIN ta_customer g ON b.customer_id = g.customer_id
-WHERE
-	DATE_FORMAT( a.begin_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	AND g.phone = ` + tel
-	err := m.db.Sql(sql).Find(&course)
-	return len(course), err
+	ta_customer_course_detail a
+	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
+	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
+	INNER JOIN sys_case d ON d.case_id = a.case_id
+	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
+	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+	AND e.phone = '` + tel + `'
+	and b.case_id='` + caseid + `'`
+	err := m.db.Sql(sql).Find(&courseList)
+	return len(courseList), err
 }
 
-func (m *VerifyDAO) AddExperienceCardVerification(verify model.TaExperienceCardVerification) (*model.TaExperienceCardVerification, error) {
-	verify.ExperienceCardVerifyTime = time.Now()
-	verify.Status = models.STATUS_NORMAL
-	verify.ExperienceCardVerifyId = utils.GetGUID()
-	_, err := m.db.Insert(verify)
-	return &verify, err
-}
-
-func (m *VerifyDAO) updateExperienceCardTarget(verify model.TaCouponCardTarget) error {
+// UpdateCustomerCard 更新客户体验卡
+func (m *VerifyDAO) UpdateCustomerCard(customerCard *model.TaCustomerCard) error {
 	var cols = []string{
-		"card_state",
-	}
-	_, err := m.db.Cols(cols...).Where("target_id=?", verify.TargetId).Update(verify)
-	return err
-}
-
-func (m *VerifyDAO) updateCustomerExperienceCard(verify model.TaCustomerCard) error {
-	var cols = []string{
-		"card_state",
-		"join_num",
 		"verify_date",
+		"verify_status",
 	}
-	_, err := m.db.Cols(cols...).Where("customer_card_id=?", verify.CustomerCardId).Update(verify)
+	_, err := m.db.Cols(cols...).Where("customer_card_id=?", customerCard.CustomerCardId).Update(customerCard)
 	return err
 }
 
-func (m *VerifyDAO) updateCustomerOrderCourse(verify model.TaCourseOrders) error {
+// UpdateCustomerCourse 更新我的课程
+func (m *VerifyDAO) UpdateCustomerCourse(customerCourse *model.TaCustomerCourse) error {
 	var cols = []string{
 		"join_num",
+		"is_done",
 	}
-	_, err := m.db.Cols(cols...).Where("orders_id = ?", verify.OrdersId).Update(verify)
+	_, err := m.db.Cols(cols...).Where("customer_course_id=?", customerCourse.CustomerCourseId).Update(customerCourse)
 	return err
 }
 
-func (m *VerifyDAO) AddOrdersVerification(verify model.TaCourseVerifcation) (*model.TaCourseVerifcation, error) {
-	verify.CreateDate = time.Now()
-	verify.VerifcationId = utils.GetGUID()
-	verify.Status = models.STATUS_NORMAL
-	_, err := m.db.Insert(verify)
-	return &verify, err
+// GetCustomerCardByDetailId 根据我的课程详情ID查询用户体验卡
+func (m *VerifyDAO) GetCustomerCardByDetailId(detailId string) (*model.TaCustomerCard, error) {
+	var customerCard []model.TaCustomerCard
+	sql := `SELECT
+	a.* 
+FROM
+	ta_customer_card a
+	INNER JOIN ta_customer_course b ON a.customer_card_id = b.source_id 
+	
+	INNER JOIN ta_customer_course_detail c ON c.customer_course_id = b.customer_course_id
+WHERE  b.course_obtaim_type = 'card'
+and  c.customer_detail_id = '` + detailId + `'`
+	err := m.db.Sql(sql).Find(&customerCard)
+	return &customerCard[0], err
+
+}
 
+// GetCustomerCourseByDetailId 根据我的课程详情ID查询我的课程
+func (m *VerifyDAO) GetCustomerCourseByDetailId(detailId string) (*model.TaCustomerCourse, error) {
+	var customerCard []model.TaCustomerCourse
+	sql := `SELECT
+	a.* 
+FROM
+	ta_customer_course a
+	INNER JOIN ta_customer_course_detail b ON a.customer_course_id = b.customer_course_id 
+WHERE
+	b.customer_detail_id = '` + detailId + `'`
+	err := m.db.Sql(sql).Find(&customerCard)
+	return &customerCard[0], err
 }

routers/common.go

@@ -10,7 +10,9 @@ import (
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/system"
 	"spaceofcheng/services/controllers/user"
+	"spaceofcheng/services/controllers/verify"
 	"spaceofcheng/services/controllers/vipcard"
+	"spaceofcheng/services/controllers/marketing"
 
 	"github.com/astaxie/beego"
 )
@@ -151,6 +153,11 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/vipcard", &vipcard.VipcardController{}, "post:AddVipCard"),
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
 
+		// courseVerify 核销课程
+		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
+		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
+		beego.NSRouter("/verify/course/:customerDetailId", &verify.VerifyController{}, "put:VerifyCourse"),
+
 		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
 		beego.NSRouter("/role/:roleid", &system.RoleController{}, "get:GetRoleByID"),
@@ -171,7 +178,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),
 		beego.NSRouter("/course/:courseid", &course.CourseController{}, "delete:DeleteCourse"),
 		beego.NSRouter("/course/:courseid/public", &course.CourseController{}, "put:CoursePublic"),
-		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "get:CourseUnPublic"),
+		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "put:CourseUnPublic"),
 		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "get:GetCourseImgs"),
 		beego.NSRouter("/courseimg", &course.CourseController{}, "post:SaveCourseImg"),
 		beego.NSRouter("/courseimg", &course.CourseController{}, "put:SaveCourseImg"),
@@ -185,10 +192,10 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// 商品
 		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListByCase"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "get:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "get:GetGoodsByID"),
 		beego.NSRouter("/goods", &goods.GoodsController{}, "post:UpdateGoods"),
 		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "put:UpdateGoods"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:DeleteGoods"),
 
 		// 商品订单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),
@@ -202,5 +209,16 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// 系统相关
 		beego.NSRouter("/system/init", &user.UserController{}, "get:GetEnvVars"),
+
+
+		// 营销活动
+		beego.NSRouter("/marketing/list",&marketing.MarketingController{},"get:GetMarketingList"),
+		beego.NSRouter("/marketing/add",&marketing.MarketingController{},"get:SaveMarketing"),
+		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"get:GetMarketingById"),
+		beego.NSRouter("/marketing/update",&marketing.MarketingController{},"get:UpdateMarketing"),
+		beego.NSRouter("/marketing/normal/:activityId",&marketing.MarketingController{},"get:DelMarketingNormal"),
+		beego.NSRouter("/marketing/disable/:activityId",&marketing.MarketingController{},"get:DelMarketingDisable"),
+		beego.NSRouter("/marketing/delete/:activityId",&marketing.MarketingController{},"get:DelMarketing"),
+
 	)
 }

routers/guest.go

@@ -1,47 +1,51 @@
-package routers
-
-import (
-	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/controllers/cases"
-	"spaceofcheng/services/controllers/course"
-	"spaceofcheng/services/controllers/customer"
-	"spaceofcheng/services/controllers/goods"
-	"spaceofcheng/services/controllers/message"
-	"spaceofcheng/services/controllers/user"
-
-	"github.com/astaxie/beego"
-)
-
-func getGuestRoutes() beego.LinkNamespace {
-	prefix := beego.AppConfig.String("api::guest")
-
-	return beego.NSNamespace(prefix,
-		// cms
-		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),
-		beego.NSRouter("/cms/img", &message.MessageController{}, "get:GetImgByLocation"),
-		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
-		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
-		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
-		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
-
-		// 案场
-		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
-
-		// 商品制作状态
-		beego.NSRouter("/dict/order/makestatus", &goods.GoodsController{}, "get:GetMakeStatus"),
-
-		// 商品
-		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListForWechat"),
-
-		// 验证码 获取, 校验
-		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),
-		beego.NSRouter("/captcha", &controllers.BaseController{}, "post:ValidCaptcha"),
-
-		// 微信 登录, 注册
-		beego.NSRouter("/wxsignin", &customer.CustomerController{}, "post:SignIn"),
-		beego.NSRouter("/wxsignup", &customer.CustomerController{}, "post:SignUp"),
-
-		// 登录
-		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"),
-	)
-}
+package routers
+
+import (
+	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/controllers/cases"
+	"spaceofcheng/services/controllers/course"
+	"spaceofcheng/services/controllers/customer"
+	"spaceofcheng/services/controllers/goods"
+	"spaceofcheng/services/controllers/message"
+	"spaceofcheng/services/controllers/user"
+
+	"github.com/astaxie/beego"
+)
+
+func getGuestRoutes() beego.LinkNamespace {
+	prefix := beego.AppConfig.String("api::guest")
+
+	return beego.NSNamespace(prefix,
+		// cms
+		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoByLocation"),
+		beego.NSRouter("/cms/img", &message.MessageController{}, "get:GetImgByLocation"),
+		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
+		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
+		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
+
+		// 课程
+		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
+
+		// 案场
+		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
+
+		// 商品制作状态
+		beego.NSRouter("/dict/order/makestatus", &goods.GoodsController{}, "get:GetMakeStatus"),
+
+		// 商品
+		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListForWechat"),
+
+		// 验证码 获取, 校验
+		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),
+		beego.NSRouter("/captcha", &controllers.BaseController{}, "post:ValidCaptcha"),
+
+		// 微信 登录, 注册
+		beego.NSRouter("/wxsignin", &customer.CustomerController{}, "post:SignIn"),
+		beego.NSRouter("/wxsignup", &customer.CustomerController{}, "post:SignUp"),
+
+		// 登录
+		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"),
+	)
+}

service/course/course.go

@@ -134,7 +134,7 @@ func (s *CourseServ) SaveCourse(course model.TaCourse, tagids string) (*model.Ta
 	if course.BeginDate.IsZero() || course.EndDate.IsZero() {
 		return nil, utils.LogError("课程时间不允许为空！")
 	}
-	if course.EndDate.After(course.BeginDate) {
+	if !course.EndDate.After(course.BeginDate) {
 		return nil, utils.LogError("截止时间必须大于开始时间！")
 	}
 	if tagids == "" {
@@ -176,7 +176,7 @@ func (s *CourseServ) SaveCourse(course model.TaCourse, tagids string) (*model.Ta
 			tagid = newtag.TagId
 		}
 		var coursetag = model.TaCourseTag{
-			CourseId: course.CourseId,
+			CourseId: newInfo.CourseId,
 			TagId:    tagid,
 		}
 		courseTags = append(courseTags, coursetag)
@@ -306,7 +306,7 @@ func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSiz
 }
 
 // GetDetails 获取所有排课
-func (s *CourseServ) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
+func (s *CourseServ) GetDetails(caseid, date string) ([]course.DetailInfo, error) {
 	if caseid == "" {
 		return nil, utils.LogError("请先选择案场！")
 	}

service/course/order.go

@@ -33,6 +33,7 @@ func (s *CourseServ) Orders(
 		couseOrder.PayType = models.CONSUME_COUPON
 	}
 
+	// TODO
 	// 校验案场
 	// caseID := couseOrder.CaseId
 	// if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
@@ -245,6 +246,7 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCo
 		OrgId:            order.OrgId,
 		CaseId:           order.CaseId,
 		CourseName:       course.CourseName,
+		LocationId:       course.LocationId,
 		Price:            course.Price,
 		CourseNum:        course.CourseNum,
 		JoinNum:          0,

service/marketing/marketing.go

@@ -0,0 +1,177 @@
+package marketing
+
+import(
+	"spaceofcheng/services/models/marketing"
+	"spaceofcheng/services/utils"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/models/model"
+	"github.com/astaxie/beego"
+)
+
+// MarketingServ 系统处理
+type MarketingServ struct {
+	ctx     *utils.Context
+	dao     *marketing.MarketingDAO
+	wdao    *marketing.WorkDAO
+}
+
+// NewMarketingServ 初始化
+func NewMarketingServ(ctx *utils.Context) *MarketingServ {
+	return &MarketingServ{
+		ctx:     ctx,
+		dao:     marketing.NewMarketingDAO(ctx),
+	}
+}
+
+// GetCustWithWXList 获取客户列表
+func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
+
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+
+	list,err := s.dao.GetMarketingList(page,pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+
+	total, err := s.dao.GetMarketingCount()
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// 保存 营销活动
+/**
+	* resource_desc 活动描述
+	*/
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity,resourceDesc string) (*model.SysActivity,*model.SysActivityAction, error) {
+
+	var newInfo *model.SysActivity
+	var newWoke *model.SysActivityAction
+
+	var err error
+	// 存储 营销活动
+	newInfo,err = s.dao.AddMarketing(&activity)
+	if err != nil {
+		return nil,nil, err
+	}
+	
+	woke := model.SysActivityAction{}
+	woke.ActivityId = newInfo.ActivityId
+	woke.ActiveType = newInfo.ActivityType
+	woke.ResourceDesc = resourceDesc
+
+	// 存储 活动动作
+	newWoke,err = s.wdao.AddWork(&woke)
+	if err != nil {
+		return nil,nil, err
+	}
+
+	return newInfo,newWoke,err
+
+}
+
+// GetMarketingById 根据ID查询数据
+func (s *MarketingServ) GetMarketingById(activityId string) (*model.SysActivity,error){
+
+	if activityId == "" {
+		return nil,utils.LogError("不存在营销信息!")
+	}
+
+	info,err:= s.dao.GetMarketingById(activityId)
+	if err != nil {
+		return nil, err
+	}
+	if info == nil {
+		return nil,utils.LogError("不存在营销信息!")
+	}
+	if info.Status == marketing.DELETE {
+		return nil, utils.LogError("营销信息已被删除！")
+	}
+
+	return info,err
+
+}
+
+// DelMarketing 删除 根据ID删除数据
+func (s *MarketingServ) DelMarketing(activityId string) error {
+
+	if activityId == "" {
+		return utils.LogError("没有对应的营销活动")
+	}
+
+	info,err := s.dao.GetMarketingById(activityId)
+	if err != nil {
+		return err
+	}
+	// 判断状态是否被删除
+	if info.Status == marketing.DELETE {
+		return utils.LogError("营销状态异常")
+	}
+	err = s.dao.DelMarketing(activityId,marketing.DELETE)
+	return err;
+
+}
+
+// DelMarketing  根据ID 修改状态为 正常
+func (s *MarketingServ) DelMarketingNormal(activityId string) error {
+
+	if activityId == "" {
+		return utils.LogError("没有对应的营销活动")
+	}
+
+	info,err := s.dao.GetMarketingById(activityId)
+	if err != nil {
+		return err
+	}
+	// 判断状态是否已经是正常
+	if info.Status == marketing.NORMAL {
+		return utils.LogError("营销状态异常")
+	}
+	err = s.dao.DelMarketing(activityId,marketing.NORMAL)
+	return err;
+
+}
+
+// DelMarketing  根据ID 修改状态为 停用
+func (s *MarketingServ) DelMarketingDisable(activityId string) error {
+
+	if activityId == "" {
+		return utils.LogError("没有对应的营销活动")
+	}
+
+	info,err := s.dao.GetMarketingById(activityId)
+	if err != nil {
+		return err
+	}
+	// 判断状态是否已经是停用
+	if info.Status == marketing.DISABLE {
+		return utils.LogError("营销状态异常")
+	}
+	err = s.dao.DelMarketing(activityId,marketing.DISABLE)
+	return err;
+
+}
+
+
+// UpdateMarketing 修改 营销活动
+func (s *MarketingServ) UpdateMarketing(activity model.SysActivity) error {
+	if activity.ActivityId == "" {
+		return utils.LogError("没有对应的营销活动")
+	}
+	err := s.dao.UpdateMarketing(activity)
+	return err
+}
+
+
+
+

service/marketing/work.go

@@ -0,0 +1,46 @@
+package marketing
+
+
+import(
+	"spaceofcheng/services/models/marketing"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+)
+
+
+// MarketingServ 系统处理
+type WorkServ struct {
+	ctx     *utils.Context
+	dao     *marketing.WorkDAO
+}
+
+// NewMarketingServ 初始化
+func NewWorkServ(ctx *utils.Context) *WorkServ {
+	return &WorkServ{
+		ctx:     ctx,
+		dao:     marketing.NewWorkDAO(ctx),
+	}
+}
+
+// 保存 Work
+func (s *WorkServ) SaveWork(work *model.SysActivityAction)  (*model.SysActivityAction, error){
+		var newInfo *model.SysActivityAction
+		if work.ActivityId == "" {
+			return nil, utils.LogError("营销编号为空!")
+		}
+		
+		newInfo,err := s.dao.AddWork(work)
+		
+		if err != nil {
+			return nil, err
+		}
+
+		return newInfo,nil
+
+}
+
+
+
+
+

service/message/cmscase.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
@@ -63,24 +64,46 @@ func (s *MessageServ) GetCmsCasesByID(cmscaseid string) (*message.CmsCase, error
 		beego.Error(err)
 		return nil, err
 	}
-	var course []model.TaCourse
-	if info.IsAllCourse == 1 {
-		course, err = s.dao.GetCourseByCaseID(info.CaseId)
-	} else {
-		course, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
-	}
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	info.Courses = course
+	if info != nil {
+		var courses []course.CourseDetail
+		if info.IsAllCourse == 1 {
+			courses, err = s.dao.GetCourseByCaseID(info.CaseId)
+		} else {
+			courses, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
+		}
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
 
-	imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
+		for inx, course := range courses {
+			tags, err := s.coursedao.GetCourseTag(course.CourseId)
+			if err != nil {
+				return nil, err
+			}
+			courses[inx].CourseTags = tags
+			details, err := s.coursedao.GetCourseDetail(course.CourseId)
+			if err != nil {
+				return nil, err
+			}
+			courses[inx].CourseDetail = details
+			imgs, err := s.coursedao.GetCourseImgs(course.CourseId)
+			if err != nil {
+				return nil, err
+			}
+			courses[inx].CourseImgs = imgs
+		}
+
+		info.Courses = courses
+
+		imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		info.CmsCaseImgs = imgs
 	}
-	info.CmsCaseImgs = imgs
+
 	return info, nil
 }
 

service/message/message.go

@@ -1,6 +1,7 @@
 package message
 
 import (
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service"
@@ -11,15 +12,17 @@ import (
 
 // MessageServ 系统处理
 type MessageServ struct {
-	ctx *utils.Context
-	dao *message.MessageDAO
+	ctx       *utils.Context
+	dao       *message.MessageDAO
+	coursedao *course.CourseDAO
 }
 
 // NewMessageServ 初始化
 func NewMessageServ(ctx *utils.Context) *MessageServ {
 	return &MessageServ{
-		ctx: ctx,
-		dao: message.NewMessageDAO(ctx),
+		ctx:       ctx,
+		dao:       message.NewMessageDAO(ctx),
+		coursedao: course.NewCourseDAO(ctx),
 	}
 }
 

service/verify/verify.go

@@ -0,0 +1,162 @@
+package verify
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/verify"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+	"time"
+
+	"github.com/astaxie/beego"
+)
+
+// CaseServ 系统处理
+type VerifyServ struct {
+	ctx  *utils.Context
+	dao  *verify.VerifyDAO
+	cdao *customer.CustomerDAO
+}
+
+// NewVerifyServ 初始化
+func NewVerifyServ(ctx *utils.Context) *VerifyServ {
+	return &VerifyServ{
+		ctx:  ctx,
+		dao:  verify.NewVerifyDAO(ctx),
+		cdao: customer.NewCustomerDAO(ctx),
+	}
+}
+
+// GetCustomerCourseDetailById 根据ID获取当日可核销课程
+func (s *VerifyServ) GetCustomerCourseDetailById(id, caseid string, page, pageSize int) (map[string]interface{}, error) {
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+		return nil, err
+	}
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	customerDetail, err := s.dao.GetCustomerCourseList(id, caseid, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	customerId := customerDetail[0].CustomerId
+	total, err := s.dao.GetCustomerCourseListCount(id, caseid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	beego.Error(customerId)
+	customer, err := s.cdao.GetCustomerByID(customerId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return map[string]interface{}{
+		"list":         customerDetail,
+		"pagesize":     pageSize,
+		"pagenum":      total,
+		"page":         page,
+		"customerInfo": customer,
+	}, err
+}
+
+// GetCustomerCourseDetailByTel根据电话号码获取当日可核销课程
+func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseid string, page, pageSize int) (map[string]interface{}, error) {
+	if err := utils.NewAuthEngine(s.ctx).CheckCase(caseid); err != nil {
+		return nil, err
+	}
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	customerDetail, err := s.dao.GetCustomerCourseListByTel(tel, caseid, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	customerId := customerDetail[0].CustomerId
+	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	customer, err := s.cdao.GetCustomerByID(customerId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return map[string]interface{}{
+		"list":         customerDetail,
+		"pagesize":     pageSize,
+		"pagenum":      total,
+		"page":         page,
+		"customerInfo": customer,
+	}, err
+
+}
+func (s *VerifyServ) GetCustomerCourseDetailByDetailId(id string) (*model.TaCustomerCourseDetail, error) {
+	customerDetail, err := s.dao.GetCustomerCourseDetailById(id)
+	return customerDetail, err
+}
+
+// UpdateCustomerCourseDetail更新我的课程详情
+func (s *VerifyServ) UpdateCustomerCourseDetail(customerDetail *model.TaCustomerCourseDetail, userid string) error {
+	var err error
+	customerDetail.VerifyDate = time.Now()
+	customerDetail.VerifyUser = userid
+	if time.Now().After(customerDetail.EndDate) {
+		customerDetail.VerifyStatus = "late"
+	} else {
+		customerDetail.VerifyStatus = "used"
+	}
+	err = s.dao.UpdateCustomerCourseDetail(customerDetail)
+	return err
+}
+
+// UpdateCustomerCard 更新我的体验卡
+func (s *VerifyServ) UpdateCustomerCard(customerCard *model.TaCustomerCard) error {
+	var err error
+	customerCard.VerifyDate = time.Now()
+	err = s.dao.UpdateCustomerCard(customerCard)
+	return err
+
+}
+
+// UpdateCustomerCourse 更新我的课程
+func (s *VerifyServ) UpdateCustomerCourse(customerCourse *model.TaCustomerCourse) error {
+	var err error
+	customerCourse.JoinNum = customerCourse.JoinNum + 1
+	if customerCourse.JoinNum >= customerCourse.CourseNum {
+		customerCourse.IsDone = models.BOOL_TRUE
+	}
+	err = s.dao.UpdateCustomerCourse(customerCourse)
+	return err
+
+}
+
+// GetCustomerCardByDetailId 根据我的课程详情id获取体验卡
+func (s *VerifyServ) GetCustomerCardByDetailId(detailId string) (*model.TaCustomerCard, error) {
+	customerCard, err := s.dao.GetCustomerCardByDetailId(detailId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return customerCard, err
+}
+
+// GetCustomerCourseByDetailId 根据我的课程详情id获取我的课程
+func (s *VerifyServ) GetCustomerCourseByDetailId(detailId string) (*model.TaCustomerCourse, error) {
+	customerCourse, err := s.dao.GetCustomerCourseByDetailId(detailId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	return customerCourse, err
+}