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

conf/app.conf

 appname = services
 httpport = 8080
-runmode = dev
+runmode = prod
 autorender = false
 copyrequestbody = true
 EnableDocs = true
-sessionon = false
 excelpath = ./
 clienturl = http://dev.ycjcjy.com/c-v2
 

controllers/coupon/coupon.go

 
 	c.ResponseJSON(coupons)
 }
+
+// GetCouponWithCustomer 获取优惠券领取信息
+func (c *CouponController) GetCouponWithCustomer() {
+	couponid := c.GetString(":id")
+	couponDetail, err := c.serv.GetCouponWithCustomer(couponid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(couponDetail)
+}

log/common.log

 2018/09/13 10:24:25 [E] 用户没有设置默认案场
 2018/09/13 10:49:12 [E] 用户没有设置默认案场
 >>>>>>> yansen
+2018/09/13 17:53:24 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:53:24 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_sAtgG_I5C0cIB3oE07TwgL0liULpmiKC2LVmEoLV4qAjnw62EGxoKcM6Rwq4ZDQO80ZDZ6Y0g1gX5yTTgmZM-luw5RIGI9l8fkeOfgTk3paqL9Eaf0Qc40p9cLa8XZlFgXaUvwFshVLM2dv1SMHhAGAMGB","expires_in":7200})
+2018/09/13 17:53:24 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_sAtgG_I5C0cIB3oE07TwgL0liULpmiKC2LVmEoLV4qAjnw62EGxoKcM6Rwq4ZDQO80ZDZ6Y0g1gX5yTTgmZM-luw5RIGI9l8fkeOfgTk3paqL9Eaf0Qc40p9cLa8XZlFgXaUvwFshVLM2dv1SMHhAGAMGB expires_in:7200])
+2018/09/13 17:55:33 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:55:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BgSpOJyw7POeYv2-lhNILmp7cu0uXc3D0R1xtwtWSDEz26Yci4pkYNra445VNzJCSaTxLHiF_b4UVjq3hzAQ7LH1icPj7qJN_aMNFyC8Li-C4FAxeCTPeaVpAYEGEi3ibB2BC1kTaJeyUUNaFRGbAIAIUJ","expires_in":7200})
+2018/09/13 17:55:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BgSpOJyw7POeYv2-lhNILmp7cu0uXc3D0R1xtwtWSDEz26Yci4pkYNra445VNzJCSaTxLHiF_b4UVjq3hzAQ7LH1icPj7qJN_aMNFyC8Li-C4FAxeCTPeaVpAYEGEi3ibB2BC1kTaJeyUUNaFRGbAIAIUJ expires_in:7200])
+2018/09/13 18:35:49 [E] 解析 Token 失败: token contains an invalid number of segments
+2018/09/13 18:36:27 [E] 解析 Token 失败: token contains an invalid number of segments
+2018/09/13 18:48:47 [E] 解析 Token 失败: token contains an invalid number of segments
+2018/09/13 18:55:18 [E] 解析 Token 失败: token contains an invalid number of segments
+2018/09/13 18:59:53 [E] 解析 Token 失败: token contains an invalid number of segments
+2018/09/13 18:59:53 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 18:59:53 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_5wS0P68kkvP1JMUgKvLRHiorDM-9wwzYsyPyvqoO45oQ0svaKslNuzuXiPj_H38ci_CC0I6KOpYftBjHdls38dPUclu9vr-5l2KYA2bQSXzkruy7W_eRaiKgGZm9RDemUtccGpZrt6GsJQd1DRZaAAATHP","expires_in":7200})
+2018/09/13 18:59:53 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_5wS0P68kkvP1JMUgKvLRHiorDM-9wwzYsyPyvqoO45oQ0svaKslNuzuXiPj_H38ci_CC0I6KOpYftBjHdls38dPUclu9vr-5l2KYA2bQSXzkruy7W_eRaiKgGZm9RDemUtccGpZrt6GsJQd1DRZaAAATHP])
+2018/09/13 19:04:23 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:04:24 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_5FVpoe4s6lQAYRgaIhfOemZ8x2JZqaVEC0HLnxX2GVDmozbqIEDsOy_VJvYYiV66RLWNi5i4xCXfwhlWOyJt0PsIJG7_WPIHk3L4xcu3hElyNBonTktgQLSJhLJ4yV2eqGbQglXlbE6HN8Z7SQRjABAMKL","expires_in":7200})
+2018/09/13 19:04:24 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_5FVpoe4s6lQAYRgaIhfOemZ8x2JZqaVEC0HLnxX2GVDmozbqIEDsOy_VJvYYiV66RLWNi5i4xCXfwhlWOyJt0PsIJG7_WPIHk3L4xcu3hElyNBonTktgQLSJhLJ4yV2eqGbQglXlbE6HN8Z7SQRjABAMKL expires_in:7200])
+2018/09/13 19:09:43 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:09:44 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Bt-a8HjMB8lI3pECMEnQHNxh1Po7akGhaKn5eNanfovztO5_nfsc0HWTVN1vpReBlOrUsFEJaLdoy4z8fHFOOPFEB4LDtbaKvFBTRfARZwR-rOKNtgyp0wZ38ySOH-JkxWfdZSRAIXeqI3baVAYgACARWU","expires_in":7200})
+2018/09/13 19:09:44 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Bt-a8HjMB8lI3pECMEnQHNxh1Po7akGhaKn5eNanfovztO5_nfsc0HWTVN1vpReBlOrUsFEJaLdoy4z8fHFOOPFEB4LDtbaKvFBTRfARZwR-rOKNtgyp0wZ38ySOH-JkxWfdZSRAIXeqI3baVAYgACARWU expires_in:7200])
+2018/09/13 19:11:52 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:11:53 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BdnfI9eRgdWJ2pX_ptvxYJzNwW1N7Tx5K1fl4Kg96qRNBPiooTJsbFsCie5kE20w8zPX_DVjSwU9i5x12kgxQgFVxkB9gA0BBvpWqzUa4N7BKZCf7sH0o3U7-ZdjeIX5KLRRqnvyQuL7dDIVUVPjADAMNH","expires_in":7200})
+2018/09/13 19:11:53 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BdnfI9eRgdWJ2pX_ptvxYJzNwW1N7Tx5K1fl4Kg96qRNBPiooTJsbFsCie5kE20w8zPX_DVjSwU9i5x12kgxQgFVxkB9gA0BBvpWqzUa4N7BKZCf7sH0o3U7-ZdjeIX5KLRRqnvyQuL7dDIVUVPjADAMNH expires_in:7200])
+2018/09/13 19:14:43 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:14:44 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_BMIA6dCwkLjDzepNYIIRFe2JzLIctYG36ppOfwE6i_M6bUIvmfktLfZ26ePesQFSdCvVscBoGHS8MPF_P-LJrquzmexWDTHcfZUBw42eHC_XPABs2jKzKz3ekPy5vK0UZnnO68NRYYzBr2nzLGXbAHABWN","expires_in":7200})
+2018/09/13 19:14:44 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BMIA6dCwkLjDzepNYIIRFe2JzLIctYG36ppOfwE6i_M6bUIvmfktLfZ26ePesQFSdCvVscBoGHS8MPF_P-LJrquzmexWDTHcfZUBw42eHC_XPABs2jKzKz3ekPy5vK0UZnnO68NRYYzBr2nzLGXbAHABWN expires_in:7200])
+2018/09/13 19:23:03 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:23:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_3F2SCIMWfeDPI5z-531zJHgzuaUav4JQaR18w0wICNTy6XXNQcfIHldt0bppa4YPZLMwYtKsRJbb2jl8scaagJq5wbGsNCjJuCGA32sMqwN-DjMaFmuflHM9tIhOy9Nc1-7yUtNWcVm-m72FWQBhACADXI","expires_in":7200})
+2018/09/13 19:23:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_3F2SCIMWfeDPI5z-531zJHgzuaUav4JQaR18w0wICNTy6XXNQcfIHldt0bppa4YPZLMwYtKsRJbb2jl8scaagJq5wbGsNCjJuCGA32sMqwN-DjMaFmuflHM9tIhOy9Nc1-7yUtNWcVm-m72FWQBhACADXI expires_in:7200])
+2018/09/13 19:36:36 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 19:36:36 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Dgj9aFWEtUxeOojlCynPzMk6KposI5qyWTWRhdn_gEBHEEO7uXxaeNRZ-LfWoT8XWB6GFW_Ppk6zj8lotRj0BudhE64k4Pcv9-yuWK-LyvU7ZKqPP2CowT6qzBy0vOjKIvetxFS8yxJeN0C6LSMfAEAUBV","expires_in":7200})
+2018/09/13 19:36:36 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Dgj9aFWEtUxeOojlCynPzMk6KposI5qyWTWRhdn_gEBHEEO7uXxaeNRZ-LfWoT8XWB6GFW_Ppk6zj8lotRj0BudhE64k4Pcv9-yuWK-LyvU7ZKqPP2CowT6qzBy0vOjKIvetxFS8yxJeN0C6LSMfAEAUBV expires_in:7200])
+2018/09/13 19:40:08 [E] 解析 Token 失败: token contains an invalid number of segments

models/coupon/coupon.go

 	return coupons, err
 }
 
-// CaseUsableCoupon 案场可用优惠券信息
-type CaseUsableCoupon struct {
-	model.TaCoupon `xorm:"extends"`
-	CustomerCoupon []model.TaCustomerCoupon
-}
-
 // GetCaseUsableCoupon 获取案场可用优惠券信息
-func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseUsableCoupon, error) {
-	var Coupons []CaseUsableCoupon
+func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
+	var Coupons []CaseCouponDetail
 	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
 	if userid != "" {
 }
 
 // GetCouponDetail 获取优惠券详情
-func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseUsableCoupon, error) {
-	var coupon = new(CaseUsableCoupon)
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error) {
+	var coupon = new(CaseCouponDetail)
 	sql := `select * from ta_coupon_Coupon where coupon_id=? and status>?`
 	_, err := m.db.Sql(sql, couponid, models.STATUS_DEL).Get(&coupon)
 	if err != nil {
 	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
 	return customerCoupons, err
 }
+
+// GetCouponWithCustomer 获取优惠券明细
+func (m CouponDAO) GetCouponWithCustomer(couponid string) (*CaseCouponDetail, error) {
+	var coupon = new(CaseCouponDetail)
+	sql := `select * from ta_coupon where coupin_id=?`
+	_, err := m.db.Sql(sql, couponid).Get(&coupon)
+	if err != nil {
+		return nil, err
+	}
+	if coupon == nil || coupon.CouponId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	var customerCopons []model.TaCustomerCoupon
+	sql = `select * from ta_customer_coupon where coupon_id = ? and status>?`
+	err = m.db.Sql(sql, coupon, models.STATUS_DEL).Find(&customerCopons)
+	if err != nil {
+		return nil, err
+	}
+	coupon.CustomerCoupon = customerCopons
+	return coupon, nil
+}

models/coupon/types.go

 	Images         []model.TaCouponImage
 	Rules          []model.TaCouponRule
 }
+
+// CaseUsableCoupon 案场可用优惠券信息
+type CaseCouponDetail struct {
+	model.TaCoupon `xorm:"extends"`
+	CustomerCoupon []model.TaCustomerCoupon
+}

service/coupon/coupon.go

 	}
 	return coupon, nil
 }
+
+// GetCouponWithCustomer 获取优惠券明细
+func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetail, error) {
+	if couponid == "" {
+		return nil, errors.New("没有券信息！")
+	}
+	couponDetail, err := s.dao.GetCouponDetail(couponid)
+	if err != nil {
+		utils.LogError("获取优惠券失败: " + err.Error())
+		return nil, errors.New("获取优惠券失败")
+	}
+	return couponDetail, nil
+}

service/sys.go

 	"spaceofcheng/services/models/customer"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
 	"strings"
 	"time"
 
 		}
 	}
 
+	// 客户端类型
+	// 通过 UA 判断
+	clientType := utils.GetClientType(gctx.Request)
+	if clientType == utils.ClientWechat {
+		// 初始化微信配置
+		if err := s.initWechatClient(s.org.OrgId); err != nil {
+			utils.LogError("初始化微信客户端失败: " + err.Error())
+
+			return map[string]interface{}{
+				"code":  http.StatusInternalServerError,
+				"error": errors.New("初始化微信客户端失败"),
+			}
+		}
+	}
+
 	// 获取 token
-	token, err := s.getToken(gctx)
+	token, err := s.getToken(gctx, clientType)
 	if err != nil {
+		message := make(map[string]interface{})
+		if clientType == utils.ClientWechat {
+			message["appid"] = utils.GetWxAppID(s.org.OrgId)
+		}
+
 		// token 报错一律视为需要重新登录
 		return map[string]interface{}{
-			"code":  http.StatusUnauthorized,
-			"error": err,
+			"code":    http.StatusUnauthorized,
+			"error":   err,
+			"message": message,
 		}
 	}
 
-	// 客户端类型
-	// 通过 UA 判断
-	clientType := utils.GetClientType(gctx.Request)
-
 	// pc 管理端
 	if clientType == utils.ClientAdmin {
 		return s.authPCAdmin(gctx, token)
 
 	// 未登录 或 未验证
 	if token.ID == "" {
-		// 需要微信验证
-		if code == "" {
-			return map[string]interface{}{
-				"code":  http.StatusUnauthorized,
-				"error": errors.New("请授权微信用户登录"),
-				"message": map[string]interface{}{
-					"appid": utils.GetWxAppID(s.org.OrgId),
-				},
-			}
-		}
-
 		// 微信用户信息
 		var err error
 		wxUser, err = s.wechartSignIn(gctx, code)
 		if err != nil {
+			if strings.Index(err.Error(), strconv.Itoa(http.StatusUnauthorized)) > -1 {
+				return map[string]interface{}{
+					"code":  http.StatusUnauthorized,
+					"error": errors.New("请授权微信用户登录"),
+					"message": map[string]interface{}{
+						"appid": utils.GetWxAppID(s.org.OrgId),
+					},
+				}
+			}
+
 			return map[string]interface{}{
 				"code":  http.StatusInternalServerError,
 				"error": err,
 		}, nil
 	}
 
-	// 初始化微信配置
-	if err := s.initWechatClient(s.org.OrgId); err != nil {
-		utils.LogError("初始化微信客户端失败: " + err.Error())
-		return nil, errors.New("初始化微信客户端失败")
+	if code == "" {
+		return nil, errors.New(strconv.Itoa(http.StatusUnauthorized))
 	}
 
 	// 获取 微信信息
 	return utils.MapToWechatUser(wxUserMap), nil
 }
 
-func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
+func (s *SysServ) getToken(gctx *context.Context, clientType string) (*utils.JWTToken, error) {
+	if beego.BConfig.RunMode == "dev" {
+		id := "0"
+		if clientType == utils.ClientWechat {
+			id = "OPENID"
+		}
+
+		return &utils.JWTToken{
+			ID: id,
+		}, nil
+	}
+
 	tokenRaw := gctx.Input.Header(utils.TokenHeader)
 	if tokenRaw == "" {
-		return nil, nil
+		return new(utils.JWTToken), nil
 	}
 
 	tokenEnStr := strings.Trim(strings.TrimLeft(tokenRaw, utils.TokenSchema), " ")
 }
 
 // initWechatClient 初始化微信客户端
-func (s SysServ) initWechatClient(orgID string) error {
+func (s *SysServ) initWechatClient(orgID string) error {
 	conf, err := s.dao.GetWeChatConfig(orgID)
 	if err != nil {
 		utils.LogError("获取微信配置失败: " + err.Error())
 }
 
 // SetOrgByID 获取组织
-func (s SysServ) SetOrgByID(orgID string) error {
+func (s *SysServ) SetOrgByID(orgID string) error {
 	orgID = utils.DecodeBase64NoTail(orgID)
 
 	org, err := s.dao.GetOrg(orgID)