0913PM

controllers/user/user.go

@@ -297,3 +297,14 @@ func (c *UserController) GetCaseUserByType() {
 	}
 	c.ResponseJSON(users)
 }
+
+// GetCaseUserByID 根据id获取用户详情
+func (c *UserController) GetCaseUserByID() {
+	userid := c.GetString(":id")
+	userdetail, err := c.dao.GetCaseUserByUserID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		c.ResponseError(errors.New("获取人员信息失败"))
+	}
+	c.ResponseJSON(userdetail)
+}

log/common.log

@@ -0,0 +1,45 @@
+2018/09/13 16:16:14 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:16:15 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_t75mKBMe6kmrMYXXQrTSheSWuAj8XAN8wpjERPyoSOjvQSSVe7NcsQ0AQqE_X0VnNN9dzKKjULsOK8I7en1nqaeKnD4p76Dnxou2L0Iwo58VUlYugQ6h-KhPA_p1bACYJItDynXHmP3gaCnASSUgAJAFFH","expires_in":7200})
+2018/09/13 16:16:15 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_t75mKBMe6kmrMYXXQrTSheSWuAj8XAN8wpjERPyoSOjvQSSVe7NcsQ0AQqE_X0VnNN9dzKKjULsOK8I7en1nqaeKnD4p76Dnxou2L0Iwo58VUlYugQ6h-KhPA_p1bACYJItDynXHmP3gaCnASSUgAJAFFH expires_in:7200])
+2018/09/13 16:17:48 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:17:48 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_LReP4MllVdzfT3IR1lg7LOMBQUWZkpMdh44eZr42GkCbFuE19P_0WPmO4Ph3y2V_kWGd8MQ9Jieu5ZNneIBRvwYxjUVuqb5m1X1lZ80yBpFaJWLaM5xW0ucUoWPP6tT13Y67CDh1K91hpKp8VSXaACACZE","expires_in":7200})
+2018/09/13 16:17:48 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_LReP4MllVdzfT3IR1lg7LOMBQUWZkpMdh44eZr42GkCbFuE19P_0WPmO4Ph3y2V_kWGd8MQ9Jieu5ZNneIBRvwYxjUVuqb5m1X1lZ80yBpFaJWLaM5xW0ucUoWPP6tT13Y67CDh1K91hpKp8VSXaACACZE expires_in:7200])
+2018/09/13 16:19:04 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:19:04 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kQzv1RZr6UI80uqFnorJZ1DGDHRYdWePSVkv4KYUFfwBRMb9ZmYopw7GTz3bRYYTTOP3bxT-SgL8sbFQQYogiiIZQSyO9exDIhriJznPahpxPwOWuhPORvDVYGvB8L7dqn3fhJJZkj_fcl3-TQXfAIAJGN","expires_in":7200})
+2018/09/13 16:19:04 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kQzv1RZr6UI80uqFnorJZ1DGDHRYdWePSVkv4KYUFfwBRMb9ZmYopw7GTz3bRYYTTOP3bxT-SgL8sbFQQYogiiIZQSyO9exDIhriJznPahpxPwOWuhPORvDVYGvB8L7dqn3fhJJZkj_fcl3-TQXfAIAJGN expires_in:7200])
+2018/09/13 16:20:38 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:20:38 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_maYX9r_i2yTh_ZMzT3CBfOMdXv8RbHS_9jxpq9tfuvnWs0cFVlOSP61O2yIaokUHd1hkup6zyWix2jWUQ-HYq5F5Fqog5J1VFjdtKq7MBMYwivpZbfyoxvUbTp2gsJuhUEvBmo6kRwNhRxSFDSEcAHAVKW","expires_in":7200})
+2018/09/13 16:20:38 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_maYX9r_i2yTh_ZMzT3CBfOMdXv8RbHS_9jxpq9tfuvnWs0cFVlOSP61O2yIaokUHd1hkup6zyWix2jWUQ-HYq5F5Fqog5J1VFjdtKq7MBMYwivpZbfyoxvUbTp2gsJuhUEvBmo6kRwNhRxSFDSEcAHAVKW expires_in:7200])
+2018/09/13 16:24:00 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:24:01 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_LN5DDwhzg_YXVxoaMEnQHNxh1Po7akGhaKn5eG06ehRBtDQMT2iWCdhWJuwXGeTNfiMklk8YM0FX2TI-bYgWKhvWJDrLzPwvsqbRnp_7f6TDwCn1lg3tBRMSPuRX-Ee_yDZ6YPvRLNnSTZGnCDReADAYZN","expires_in":7200})
+2018/09/13 16:24:01 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_LN5DDwhzg_YXVxoaMEnQHNxh1Po7akGhaKn5eG06ehRBtDQMT2iWCdhWJuwXGeTNfiMklk8YM0FX2TI-bYgWKhvWJDrLzPwvsqbRnp_7f6TDwCn1lg3tBRMSPuRX-Ee_yDZ6YPvRLNnSTZGnCDReADAYZN expires_in:7200])
+2018/09/13 16:41:15 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:41:15 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_sM3eFKiF10Dc4_mrvH8fFbF4uxuLd_wX0frUbJm-0aQT0gIe5ARVYwDH3sOCMHsW6f1zXyI9WZyFGdF0m0b2aXGih7Uyxxd0d6ffPKi0iCiVUqR8XV4Mvbs1BXVDiclcxgGZN0kpEgM8_TzRBMKiAGAJUS","expires_in":7200})
+2018/09/13 16:41:15 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_sM3eFKiF10Dc4_mrvH8fFbF4uxuLd_wX0frUbJm-0aQT0gIe5ARVYwDH3sOCMHsW6f1zXyI9WZyFGdF0m0b2aXGih7Uyxxd0d6ffPKi0iCiVUqR8XV4Mvbs1BXVDiclcxgGZN0kpEgM8_TzRBMKiAGAJUS expires_in:7200])
+2018/09/13 16:41:41 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:41:41 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_K_bD0F7FF9TcHL_5g8p4_fIcALQ5Ql7VI34eu1JIQ2i75-u4-Gk2TL8a4bMMUKf35HzxFZZrweYAg7PL9YfAzz5K-MuHw58wjQp5UmICZdeUzgZY58BvDtDihJQhVgDzODlNymlZ9y4qdX0dPWOgACAJQI","expires_in":7200})
+2018/09/13 16:41:41 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_K_bD0F7FF9TcHL_5g8p4_fIcALQ5Ql7VI34eu1JIQ2i75-u4-Gk2TL8a4bMMUKf35HzxFZZrweYAg7PL9YfAzz5K-MuHw58wjQp5UmICZdeUzgZY58BvDtDihJQhVgDzODlNymlZ9y4qdX0dPWOgACAJQI expires_in:7200])
+2018/09/13 16:42:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:42:42 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_NXBnDyv6wtq181zln6Sm-liedNbNRUDD0lZuCcE44jgewGDYZ4frfF6qWC5oCqEYNcG_lnSqgStw1aGqn-T5aPtvqF3J0IaQac2b2fIT1C4sWLOq7XHWV1O5XEF3fhB1AF3wvFd2yq1HImsfQOXfAEATRA","expires_in":7200})
+2018/09/13 16:42:42 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_NXBnDyv6wtq181zln6Sm-liedNbNRUDD0lZuCcE44jgewGDYZ4frfF6qWC5oCqEYNcG_lnSqgStw1aGqn-T5aPtvqF3J0IaQac2b2fIT1C4sWLOq7XHWV1O5XEF3fhB1AF3wvFd2yq1HImsfQOXfAEATRA])
+2018/09/13 16:44:19 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:44:19 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_muDCgCmGeBItmi8FbRxCsoQiUV0j-zAfNmXR38X1alvEA2-mEr6zHNNm3WU3maoMUuHi__kxopZw9xnmCnRoUqEUjtow484r03YSkc6t0hgD7pVrvRp5o55B9ZgQZLhAHAFOA","expires_in":7200})
+2018/09/13 16:44:19 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_muDCgCmGeBItmi8FbRxCsoQiUV0j-zAfNmXR38X1alvEA2-mEr6zHNNm3WU3maoMUuHi__kxopZw9xnmCnRoUqEUjtow484r03YSkc6t0hgD7pVrvRp5o55B9ZgQZLhAHAFOA expires_in:7200])
+2018/09/13 16:51:54 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:51:54 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_RvPuvAWYerAzdMoI07TwgL0liULpmiKC2LVmEtK-hDEf7fITAzgOhkDTcb8bOf9HldbBd62Nw0jEnqbjCTjL0KkDlY_6oGuzO1-KbEBGAeygeR_2nmaOwWKGFEBCappxwKLxC_txoKYY5qe0JNZjADAWAM","expires_in":7200})
+2018/09/13 16:51:54 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_RvPuvAWYerAzdMoI07TwgL0liULpmiKC2LVmEtK-hDEf7fITAzgOhkDTcb8bOf9HldbBd62Nw0jEnqbjCTjL0KkDlY_6oGuzO1-KbEBGAeygeR_2nmaOwWKGFEBCappxwKLxC_txoKYY5qe0JNZjADAWAM expires_in:7200])
+2018/09/13 16:58:59 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 16:59:00 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_tEBDDK2PZ64AjP2fCynPzMk6KposI5qyWTWRhTZGxl5Sg-fJAmMesx_eXX6nKKSxql8ADj31ak4UVrgNvygy8UReA741GzQOB-S87QoMq9IDRd6BHnBBMmHggdag1A8UJabzUYha1yGu-7gYNFObAEASKT","expires_in":7200})
+2018/09/13 16:59:00 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_tEBDDK2PZ64AjP2fCynPzMk6KposI5qyWTWRhTZGxl5Sg-fJAmMesx_eXX6nKKSxql8ADj31ak4UVrgNvygy8UReA741GzQOB-S87QoMq9IDRd6BHnBBMmHggdag1A8UJabzUYha1yGu-7gYNFObAEASKT expires_in:7200])
+2018/09/13 17:11:14 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:11:14 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_vINCPh8vPhqM7Bi1eJGqZNcS6qNgg7xF5DV8W0e9sdRdwUhgL8GkIKuBcevjQAGzjx6pSTfDGdyNeKTf7p62UmczHgQ0pkTV-z1bTr3Qajsr3JQlKxwTi1PqzyRZXhbuy0u_RYxU2xovH_rjVZXeAHANRP","expires_in":7200})
+2018/09/13 17:11:14 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_vINCPh8vPhqM7Bi1eJGqZNcS6qNgg7xF5DV8W0e9sdRdwUhgL8GkIKuBcevjQAGzjx6pSTfDGdyNeKTf7p62UmczHgQ0pkTV-z1bTr3Qajsr3JQlKxwTi1PqzyRZXhbuy0u_RYxU2xovH_rjVZXeAHANRP])
+2018/09/13 17:13:06 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:13:06 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_gR9L77qQVeIfhpsWcIlzH2dMOQRu-NPQ0Pm92LcB5z7mYRujKJQ80-xDcZSWJZCFUaP49jidFBSeTmmEjAAWzrfY1I3qItWfIyAyyJIMcTiwwx8HU9Ead3ya-HN-nYNFDibC61cmjuPg_bc4ZINdAFAJSX","expires_in":7200})
+2018/09/13 17:13:06 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_gR9L77qQVeIfhpsWcIlzH2dMOQRu-NPQ0Pm92LcB5z7mYRujKJQ80-xDcZSWJZCFUaP49jidFBSeTmmEjAAWzrfY1I3qItWfIyAyyJIMcTiwwx8HU9Ead3ya-HN-nYNFDibC61cmjuPg_bc4ZINdAFAJSX expires_in:7200])
+2018/09/13 17:23:58 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:23:58 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JAHqIzd8t7RjwVC99zRLjKz7qgb7MCnlyogvQShEpMyhVrHxIMWv3NqQLcMUK-EOMVMIv_1qA3iIko_YQr7jHzFIptl0oavzVQFsSdrzKteafX54tWnKGr2s2WvEkIfA7gZj3n1sqMSzq_emMCZhAIADTQ","expires_in":7200})
+2018/09/13 17:23:58 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JAHqIzd8t7RjwVC99zRLjKz7qgb7MCnlyogvQShEpMyhVrHxIMWv3NqQLcMUK-EOMVMIv_1qA3iIko_YQr7jHzFIptl0oavzVQFsSdrzKteafX54tWnKGr2s2WvEkIfA7gZj3n1sqMSzq_emMCZhAIADTQ expires_in:7200])
+2018/09/13 17:29:28 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 17:29:28 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_-MyaEvs8zCN1AcbmsHBHbC-MFRohzD9yROKsAhqfXKYp7rvzxWPtCRmkBsjyjqmKdFrEkChzlZosmvUbYoAJhggHNj5p7tRtRkgWVy_1Z9-7DgkO8_UG0sqNlYAQTZmrYIHSUCe3_2-iP8g4TAOaADACJX","expires_in":7200})
+2018/09/13 17:29:28 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_-MyaEvs8zCN1AcbmsHBHbC-MFRohzD9yROKsAhqfXKYp7rvzxWPtCRmkBsjyjqmKdFrEkChzlZosmvUbYoAJhggHNj5p7tRtRkgWVy_1Z9-7DgkO8_UG0sqNlYAQTZmrYIHSUCe3_2-iP8g4TAOaADACJX expires_in:7200])

models/card/card.go

@@ -267,3 +267,10 @@ func (m *CardDAO) GetCustomerCardByCard(cardid string) ([]model.TaCustomerCard,
 	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&customerCards)
 	return customerCards, err
 }
+
+// GetCustomerCardByUser 根据用户获取发送的卡信息
+func (m *CardDAO) GetCustomerCardByUser(caseid, userid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}

models/coupon/coupon.go

@@ -258,3 +258,66 @@ func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCou
 	err := m.db.Where("case_id in ('"+strings.Replace(caseids, ",", "','", -1)+"')").And("send_type=?", sendtype).And("status=?", models.STATUS_NORMAL).Find(&coupons)
 	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
+	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 != "" {
+		for inx, Coupon := range Coupons {
+			cCoupons, err := m.GetCustomerCouponByCouponAndUser(Coupon.CouponId, userid)
+			if err != nil {
+				return nil, err
+			}
+			Coupons[inx].CustomerCoupon = cCoupons
+		}
+	}
+	return Coupons, err
+}
+
+// GetCustomerCouponByCouponAndUser 根据优惠券与用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCouponDetail 获取优惠券详情
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseUsableCoupon, error) {
+	var coupon = new(CaseUsableCoupon)
+	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 {
+		return nil, err
+	}
+	if coupon == nil || coupon.CouponId == "" {
+		return nil, errors.New("无优惠券信息")
+	}
+	cCoupons, err := m.GetCustomerCouponByCoupon(couponid)
+	if err != nil {
+		return nil, err
+	}
+	coupon.CustomerCoupon = cCoupons
+	return coupon, nil
+}
+
+// GetCustomerCouponByCoupon 根据优惠券获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCoupon(couponid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("coupon_id=?", couponid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
+// GetCustomerCouponByUser 根据用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCustomerCoupon, error) {
+	var customerCoupons []model.TaCustomerCoupon
+	err := m.db.Where("case_id=?", caseid).And("sales_id=?", userid).And("status>?", models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}

models/goods/orders.go

@@ -262,3 +262,15 @@ func (m *GoodsDAO) UpdateOrdersMake(orders model.TaGoodsOrders) error {
 	_, err := m.db.Cols(cols...).Where("orders_id=?", orders.OrdersId).Update(orders)
 	return err
 }
+
+// GetOrderDetailByUser 获取用户所有下单信息
+func (m *GoodsDAO) GetOrderDetailByUser(caseid, userid string) ([]model.TaGoodsOrdersDetail, error) {
+	var details []model.TaGoodsOrdersDetail
+	sql := `select a.* from ta_goods_orders_detail a inner join ta_goods_orders b on a.orders_id=b.orders_id
+		inner join ta_customer c on b.user_id = c.customer_id
+	where c.user_id=? and b.status>? and b.case_id=?`
+	if err := m.db.Sql(sql, userid, models.STATUS_DEL, caseid).Find(&details); err != nil {
+		return nil, err
+	}
+	return details, nil
+}

models/system/user.go

@@ -465,7 +465,7 @@ func (m *UserDAO) CheckUserName(userid, username, orgid string) (bool, error) {
 // GetForbidUsers 获取所有禁止人员信息
 func (m *UserDAO) GetForbidUsers(caseid string) ([]model.TaForbidUser, error) {
 	var forbiduser []model.TaForbidUser
-	err := m.db.Where("case_id=?", caseid).And("end_date > NOW()").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
+	err := m.db.Where("case_id=?", caseid).And("(end_date is null or end_date > NOW())").And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&forbiduser)
 	return forbiduser, err
 }
 
@@ -502,6 +502,7 @@ type UserWithCouponAndCard struct {
 	model.SysUser  `xorm:"extends"`
 	CustomerCoupon []model.TaCustomerCoupon
 	CustomerCard   []model.TaCustomerCard
+	OrdersDetail   []model.TaGoodsOrdersDetail
 }
 
 // GetCaseUserByType 获取案场所有销售信息
@@ -513,3 +514,11 @@ func (m *UserDAO) GetCaseUserByType(caseid, usertype string) ([]UserWithCouponAn
 	err := m.db.Sql(sql, models.STATUS_DEL, caseid, usertype).Find(&users)
 	return users, err
 }
+
+// GetUserDetailByID 根据id获取案场销售
+func (m *UserDAO) GetUserDetailByID(userid string) (*UserWithCouponAndCard, error) {
+	var user UserWithCouponAndCard
+	sql := `select * from sys_user where status>? and user_id=?`
+	_, err := m.db.Sql(sql, models.STATUS_DEL, userid).Get(&user)
+	return &user, err
+}

routers/wechat.go

@@ -44,5 +44,6 @@ func getWechatRoutes() beego.LinkNamespace {
 
 		// 用户
 		beego.NSRouter("/user/:type", &user.UserController{}, "get:GetCaseUserByType"),
+		beego.NSRouter("/user/detail/:id", &user.UserController{}, "get:GetCaseUserByID"),
 	)
 }

service/user.go

@@ -5,7 +5,9 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/card"
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/coupon"
 	"spaceofcheng/services/models/customer"
+	"spaceofcheng/services/models/goods"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/utils"
@@ -21,6 +23,8 @@ type UserServ struct {
 	casedao     *cases.CaseDAO
 	customerdao *customer.CustomerDAO
 	carddao     *card.CardDAO
+	coupondao   *coupon.CouponDAO
+	ordersdao   *goods.GoodsDAO
 }
 
 // NewUserServ 初始化
@@ -31,6 +35,8 @@ func NewUserServ(ctx *utils.Context) *UserServ {
 		casedao:     cases.NewCaseDAO(ctx),
 		customerdao: customer.NewCustomerDAO(ctx),
 		carddao:     card.NewCardDAO(ctx),
+		coupondao:   coupon.NewCouponDAO(ctx),
+		ordersdao:   goods.NewGoodsDAO(ctx),
 	}
 }
 
@@ -528,19 +534,75 @@ func (s *UserServ) GetCaseUserByType(usertype string) ([]system.UserWithCouponAn
 	}
 	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
 	}
 
 	users, err := s.dao.GetCaseUserByType(caseinfo.CaseId, usertype)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
 	}
 	for inx, user := range users {
-		cards, err := s.carddao.GetCustomerCardByCardAndUser(caseinfo.CaseId, user.UserId)
+		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
 		if err != nil {
 			return nil, err
 		}
-		users[inx].CustomerCard = cards
+		users[inx] = user
 	}
-	return users, err
+	return users, nil
+}
+
+// GetCaseUserByUserID 根据用户id获取人员信息
+func (s *UserServ) GetCaseUserByUserID(userid string) (*system.UserWithCouponAndCard, error) {
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.CustomerId == "" || customer.UserId == "" {
+		return nil, errors.New("当前用户没有权限查看用户信息")
+	}
+	caseinfo, err := s.dao.GetUserBelongCase(customer.UserId)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	usercaseinfo, err := s.dao.GetUserBelongCase(userid)
+	if err != nil {
+		utils.LogError("获取人员归属案场失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	if usercaseinfo.CaseId != caseinfo.CaseId {
+		return nil, errors.New("您没有权限查看此用户的数据！")
+	}
+	user, err := s.dao.GetUserDetailByID(userid)
+	if err != nil {
+		utils.LogError("获取人员信息失败: " + err.Error())
+		return nil, errors.New("获取人员信息失败")
+	}
+	err = s.GetUserWithDetail(usercaseinfo.CaseId, user)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
+}
+
+// GetUserWithDetail 获取用户详情
+func (s *UserServ) GetUserWithDetail(caseid string, user *system.UserWithCouponAndCard) error {
+	cards, err := s.carddao.GetCustomerCardByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送卡信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCard = cards
+	coupons, err := s.coupondao.GetCustomerCouponByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取发送券信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.CustomerCoupon = coupons
+	details, err := s.ordersdao.GetOrderDetailByUser(caseid, user.UserId)
+	if err != nil {
+		utils.LogError("获取用户点单信息失败: " + err.Error())
+		return errors.New("获取人员信息失败")
+	}
+	user.OrdersDetail = details
+	return nil
 }