update

controllers/gymcard/gymcard.go

@@ -59,7 +59,7 @@ func (c *GymcardController) GetGymcardDetailbyId() {
 
 // GetCustomerGymDetailById 根据客户健身卡ID获取客户健身卡详情
 func (c *GymcardController) GetCustomerGymDetailById() {
-	id := c.GetString("customerGymId")
+	id := c.GetString(":customerGymId")
 	customerGym, err := c.dao.GetCustomerGymDetailById(id)
 	if err != nil {
 		c.ResponseError(err)

log/common.log

@@ -3663,6 +3663,96 @@
 2018/09/12 14:27:38 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
 2018/09/12 14:27:38 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_0QjgwowdSGInKdwbrmtbkXrv6GoHX0tx6D0z56rH8acNnHqeB0NgY4tzJ4KFVi7YxnIBH9ZMnePZVbpKUMJBJ0uZp3RPnjz3ughGkbP_weau5lL_3Mbs3Xrrsi6_sXkPUesmk1P9eN767-oSFIQcAJAMPX","expires_in":7200})
 2018/09/12 14:27:38 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_0QjgwowdSGInKdwbrmtbkXrv6GoHX0tx6D0z56rH8acNnHqeB0NgY4tzJ4KFVi7YxnIBH9ZMnePZVbpKUMJBJ0uZp3RPnjz3ughGkbP_weau5lL_3Mbs3Xrrsi6_sXkPUesmk1P9eN767-oSFIQcAJAMPX expires_in:7200])
+<<<<<<< HEAD
+2018/09/12 19:07:52.382 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:07:52.560 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_t1-py2x8W9escUVK1lg7LOMBQUWZkpMdh44eZri5k_2aZthzHsxhKI7eSe7cJ5h31ivd7nmMEmbgN1-DBLt9eCifzULPs4UhjJiS3quXczTv0-bVPUzwmWeHOcbad4CcPdjGkyHTl8g0WXFDHDFiACAWSU","expires_in":7200})
+2018/09/12 19:07:52.560 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_t1-py2x8W9escUVK1lg7LOMBQUWZkpMdh44eZri5k_2aZthzHsxhKI7eSe7cJ5h31ivd7nmMEmbgN1-DBLt9eCifzULPs4UhjJiS3quXczTv0-bVPUzwmWeHOcbad4CcPdjGkyHTl8g0WXFDHDFiACAWSU expires_in:7200])
+2018/09/12 19:11:40.049 [E]  获取健身卡列表失败：Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-10, 10' at line 12
+2018/09/12 19:13:32.335 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:13:32.512 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_ZX3NYSg1jssJzbksQOS6uPUvYLON3hDKHhqdytbFv0XD5V9QoZ6s64X8B_wZecC0CiLayS54_nys2jH2v05lg0kjZdWEdo7skjueFln00emG0pie8KokF4Tne69hxLihFIu1DDT4H5zZF2edYIAjAHATDV","expires_in":7200})
+2018/09/12 19:13:32.512 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_ZX3NYSg1jssJzbksQOS6uPUvYLON3hDKHhqdytbFv0XD5V9QoZ6s64X8B_wZecC0CiLayS54_nys2jH2v05lg0kjZdWEdo7skjueFln00emG0pie8KokF4Tne69hxLihFIu1DDT4H5zZF2edYIAjAHATDV expires_in:7200])
+2018/09/12 19:13:33.655 [E]  获取健身卡列表失败：Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-10, 10' at line 12
+2018/09/12 19:18:02.585 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:18:03.016 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_BtNV6M3nO6zaUe8qPL3TGZh1p0b4pDIXSCsp7KgQumR8pI4EIROi9skpXfihgqHXH-ekgpaI9C8fCnG1YsKRSBByDJcNUvUpQIGFK-edHqL4vRpVSzuQjokScE6kD7NzXIwjAZM6mphIWdqFUBJfAJAPWE","expires_in":7200})
+2018/09/12 19:18:03.016 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_BtNV6M3nO6zaUe8qPL3TGZh1p0b4pDIXSCsp7KgQumR8pI4EIROi9skpXfihgqHXH-ekgpaI9C8fCnG1YsKRSBByDJcNUvUpQIGFK-edHqL4vRpVSzuQjokScE6kD7NzXIwjAZM6mphIWdqFUBJfAJAPWE expires_in:7200])
+2018/09/12 19:18:05.120 [E]  获取健身卡列表失败：Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-10, 10' at line 12
+2018/09/12 19:18:40.657 [E]  获取健身卡列表失败：Error 1054: Unknown column 'a.create_date' in 'order clause'
+2018/09/12 19:26:10.709 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:26:11.461 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_4STHi_HrDUlkEpE1R8XrOWIrmE3-ZsK0ek_a8MkJG1WpQ-H2vKrAUsdXf5jtjI2COjbPkP8Gs2F-HUZngkOGEcnBeaZY-xZY2eVS7HKmZr716UQSmSMKE57c7EeFgUnabWymhXX2GE1MOB8fAUBeAJATNU","expires_in":7200})
+2018/09/12 19:26:11.461 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_4STHi_HrDUlkEpE1R8XrOWIrmE3-ZsK0ek_a8MkJG1WpQ-H2vKrAUsdXf5jtjI2COjbPkP8Gs2F-HUZngkOGEcnBeaZY-xZY2eVS7HKmZr716UQSmSMKE57c7EeFgUnabWymhXX2GE1MOB8fAUBeAJATNU expires_in:7200])
+2018/09/12 19:26:12.706 [E]  获取健身卡列表失败：Error 1054: Unknown column 'a.create_date' in 'order clause'
+2018/09/12 19:33:47.743 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:33:47.903 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_a8wdp8NtLGOu4tK4IE6gxjDBIY3OaGmwelIEMRp7gxTnn7U7NKyyWpg0LEuMe9yg6JCon4brtXOCnrS0XU6WOC_BJFtEO4Q1879z76cdIHhLENP23Xft1AvBizdhSMTPfVn8qzGYuuzkaYZxFHSfADAOQB","expires_in":7200})
+2018/09/12 19:33:47.903 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_a8wdp8NtLGOu4tK4IE6gxjDBIY3OaGmwelIEMRp7gxTnn7U7NKyyWpg0LEuMe9yg6JCon4brtXOCnrS0XU6WOC_BJFtEO4Q1879z76cdIHhLENP23Xft1AvBizdhSMTPfVn8qzGYuuzkaYZxFHSfADAOQB expires_in:7200])
+2018/09/12 19:33:50.433 [E]  获取健身卡列表失败：Error 1054: Unknown column 'a.create_date' in 'order clause'
+2018/09/12 19:36:49.488 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 19:36:49.945 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_ttt7JduZRkx3WbSihq85qZY_LQxk6eFg1R_2dPatx8qL0ZOCAycY7Mn1ptaUrZsjskaLX2za4958_0DhjCNSSyZMFUgHWRVaPZgk31Y2927DOAd6c-LD0YKrmzUi-l88wIxPvTJvsWp4f1OUIWFiACACQZ","expires_in":7200})
+2018/09/12 19:36:49.945 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_ttt7JduZRkx3WbSihq85qZY_LQxk6eFg1R_2dPatx8qL0ZOCAycY7Mn1ptaUrZsjskaLX2za4958_0DhjCNSSyZMFUgHWRVaPZgk31Y2927DOAd6c-LD0YKrmzUi-l88wIxPvTJvsWp4f1OUIWFiACACQZ expires_in:7200])
+2018/09/12 20:06:33.096 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:06:33.286 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_jowOHZpdhJSB_bllYRaB7Jkvc6MyxsgqlfRp0C-oByDnpV7HmJ97lrAb8OXzfFV8GOOyOFwooUK_UPrAQcUv7DUCeDuP_4VzAWelqmeIHmQOvmbPW7yilQRysAaXenwE3ltGt-JwX8NngZBCNJDiAJAJFZ","expires_in":7200})
+2018/09/12 20:06:33.286 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_jowOHZpdhJSB_bllYRaB7Jkvc6MyxsgqlfRp0C-oByDnpV7HmJ97lrAb8OXzfFV8GOOyOFwooUK_UPrAQcUv7DUCeDuP_4VzAWelqmeIHmQOvmbPW7yilQRysAaXenwE3ltGt-JwX8NngZBCNJDiAJAJFZ])
+2018/09/12 20:16:25.128 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:21:11.467 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:21:11.667 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_uwLg49l2gaES6fTjghR_fcN6dwBUGKeKYm2z-aGrutE7vCO6mC4u4u5EnBBsBhBTbjYw7icvva5NbEiFbJq0CPLJ6EhR9Ux2bd4Vm61TR8tFMs9S1BZBWjF4ZxV8YTV9wr7AukO0M72m-9a9WDQhAAAAHU","expires_in":7200})
+2018/09/12 20:21:11.667 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_uwLg49l2gaES6fTjghR_fcN6dwBUGKeKYm2z-aGrutE7vCO6mC4u4u5EnBBsBhBTbjYw7icvva5NbEiFbJq0CPLJ6EhR9Ux2bd4Vm61TR8tFMs9S1BZBWjF4ZxV8YTV9wr7AukO0M72m-9a9WDQhAAAAHU])
+2018/09/12 20:25:24.524 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:25:24.706 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_Qi8exKeQUlYZMxhhrp-05s91A_OyKOprrRPiKwkMYU_iQ1i2vzJ9DUIVn362oik9LiLfeMB0rrIdO72OvTKrrQ9Aq6BGfgimo_g0m4JDKr4S0DDg35r5-EznH2oGTQaAGAOBY","expires_in":7200})
+2018/09/12 20:25:24.706 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Qi8exKeQUlYZMxhhrp-05s91A_OyKOprrRPiKwkMYU_iQ1i2vzJ9DUIVn362oik9LiLfeMB0rrIdO72OvTKrrQ9Aq6BGfgimo_g0m4JDKr4S0DDg35r5-EznH2oGTQaAGAOBY expires_in:7200])
+2018/09/12 20:27:40.192 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:27:40.345 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_Gr_xzkrwMY9Owh7OmRA0A7eEKAVkjlEdCs6Xwo_7dx7K7DWhiW_O6adzsPGD9kaDwDuNh5G4KxpXMa_VcdrJuPWEct9lSiwH29L1JFX5iGxrTWFVqL4mSZ9pB5N3IqklONRb8zWI7r2vJrjiFWLaAEABSH","expires_in":7200})
+2018/09/12 20:27:40.345 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Gr_xzkrwMY9Owh7OmRA0A7eEKAVkjlEdCs6Xwo_7dx7K7DWhiW_O6adzsPGD9kaDwDuNh5G4KxpXMa_VcdrJuPWEct9lSiwH29L1JFX5iGxrTWFVqL4mSZ9pB5N3IqklONRb8zWI7r2vJrjiFWLaAEABSH expires_in:7200])
+2018/09/12 20:38:35.088 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 20:38:35.423 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_VBLJ2ZI63Z_GqjHA44juSW3IbMMwrE7an78sFbjqNGfokbduEJ_YfGZZVgRllhk3Pk_oYOgXQzu5o9oA8FyxSvoNNiqhUCa4imIuGj4GnbexVf_yNNMN8G9Cb_y8kKjKjJ8m3E9kCPKJNQ7TWMSaADABRX","expires_in":7200})
+2018/09/12 20:38:35.423 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_VBLJ2ZI63Z_GqjHA44juSW3IbMMwrE7an78sFbjqNGfokbduEJ_YfGZZVgRllhk3Pk_oYOgXQzu5o9oA8FyxSvoNNiqhUCa4imIuGj4GnbexVf_yNNMN8G9Cb_y8kKjKjJ8m3E9kCPKJNQ7TWMSaADABRX expires_in:7200])
+2018/09/12 21:01:57.320 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 21:01:57.510 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_ecPBDEhlO6m4omc8QOS6uPUvYLON3hDKHhqdyiNZl3RuZpvUWddC3Or86HQh35nSCAUHB_A3s1xqrQfhVozc3_ZEcRwy4k8s3-SYZgLAMDwscSMLpBKTxCYRx9SK6c36bww_kwRcJlh6pLNLMTSdAEAVCB","expires_in":7200})
+2018/09/12 21:01:57.510 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_ecPBDEhlO6m4omc8QOS6uPUvYLON3hDKHhqdyiNZl3RuZpvUWddC3Or86HQh35nSCAUHB_A3s1xqrQfhVozc3_ZEcRwy4k8s3-SYZgLAMDwscSMLpBKTxCYRx9SK6c36bww_kwRcJlh6pLNLMTSdAEAVCB expires_in:7200])
+2018/09/12 21:05:57.741 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 21:05:57.913 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_w1Z_-_bleur2StWqP6ax0v74Pd4-MNknt-PKREyIAmMXyIfXWkxfOQ5tvVYDBV96KVI_qfabjELAf-iMiYlRzzlmTKkbP7URdnTXOVTMhZOl3OKCkYDem6vO4uVENW74InrDFL1HKvuHNSLfLZPhADAPDT","expires_in":7200})
+2018/09/12 21:05:57.913 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_w1Z_-_bleur2StWqP6ax0v74Pd4-MNknt-PKREyIAmMXyIfXWkxfOQ5tvVYDBV96KVI_qfabjELAf-iMiYlRzzlmTKkbP7URdnTXOVTMhZOl3OKCkYDem6vO4uVENW74InrDFL1HKvuHNSLfLZPhADAPDT expires_in:7200])
+2018/09/12 21:07:12.677 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 21:07:12.846 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_xl0qjFDl6yCB_62vzuHQhZ73GnK1IL_KpzT9EtMHMILYo7e0W6zLFFxCEGmVDAIicxSxuShZ-dQFK3SZyXwd9csNoN6ByGj8HjZGzUGajQ1QnjJFlXGORVbURVZM-LwqXM0JqtKd4Y3Qw7EdMEUaAJAFXN","expires_in":7200})
+2018/09/12 21:07:12.846 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_xl0qjFDl6yCB_62vzuHQhZ73GnK1IL_KpzT9EtMHMILYo7e0W6zLFFxCEGmVDAIicxSxuShZ-dQFK3SZyXwd9csNoN6ByGj8HjZGzUGajQ1QnjJFlXGORVbURVZM-LwqXM0JqtKd4Y3Qw7EdMEUaAJAFXN expires_in:7200])
+2018/09/12 21:08:50.894 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 21:08:51.060 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_SBhXgDAd8H2ajjRAoZsOY0ry0MQT6q58n0lig9Dy_ggEdthgASMi7oCKyC_3vFKqJyRWchtPXQJPzMavaiEYRTmBj8WMCajc_CcRc7VKaeut0e4p_8yQACyhwcVbGmQZpAAhpe7PJhA_EsjOIDYjAFAMHC","expires_in":7200})
+2018/09/12 21:08:51.060 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_SBhXgDAd8H2ajjRAoZsOY0ry0MQT6q58n0lig9Dy_ggEdthgASMi7oCKyC_3vFKqJyRWchtPXQJPzMavaiEYRTmBj8WMCajc_CcRc7VKaeut0e4p_8yQACyhwcVbGmQZpAAhpe7PJhA_EsjOIDYjAFAMHC expires_in:7200])
+2018/09/12 21:11:36.031 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/12 21:11:36.426 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_6y8HKomS21P-EZOYKvLRHiorDM-9wwzYsyPyvnxdd8rqRUfHQ76IsqvojF4cEzeg6BVYIHkmUpfq-bOtJirfyXbXpugr0WiJ-EyVyYgTAJBymUM1_3Ooar_spTlpi-e93HQbYOHc6c3i-Z8-PWScABAYFB","expires_in":7200})
+2018/09/12 21:11:36.426 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_6y8HKomS21P-EZOYKvLRHiorDM-9wwzYsyPyvnxdd8rqRUfHQ76IsqvojF4cEzeg6BVYIHkmUpfq-bOtJirfyXbXpugr0WiJ-EyVyYgTAJBymUM1_3Ooar_spTlpi-e93HQbYOHc6c3i-Z8-PWScABAYFB expires_in:7200])
+2018/09/13 09:18:12.174 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:18:12.537 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_2p-fjFvXgtMQUtK84086B3EM6kLFogtl3F9p9oir9h3G9rl3jeUZmrAX74VibH_VO_iMqgyGT1YUDcJ3X6v4cDCfRnI0lRRmFfH1vOKzXDfMrfmdRbT_KFl_4dTV3LG_8Xc4GGRnOqXxGYt-PCPjABAZMZ","expires_in":7200})
+2018/09/13 09:18:12.537 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_2p-fjFvXgtMQUtK84086B3EM6kLFogtl3F9p9oir9h3G9rl3jeUZmrAX74VibH_VO_iMqgyGT1YUDcJ3X6v4cDCfRnI0lRRmFfH1vOKzXDfMrfmdRbT_KFl_4dTV3LG_8Xc4GGRnOqXxGYt-PCPjABAZMZ expires_in:7200])
+2018/09/13 09:33:38.984 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:33:39.554 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_UZAHbHZRTX8sjwUtWBMNgMuHx4Y6f7UP5MD90Owuwo3ytJcVTkU52wBPpEI7TuON3-R5O7ueTHxBC7Nzl8EXrejMkDtQChVJ7EL4PxBGyaKeOjPVRxrBs_fGNcEZWBjAFAIFK","expires_in":7200})
+2018/09/13 09:33:39.554 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_UZAHbHZRTX8sjwUtWBMNgMuHx4Y6f7UP5MD90Owuwo3ytJcVTkU52wBPpEI7TuON3-R5O7ueTHxBC7Nzl8EXrejMkDtQChVJ7EL4PxBGyaKeOjPVRxrBs_fGNcEZWBjAFAIFK])
+2018/09/13 09:34:17.191 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:34:17.953 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:34:18.590 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_R8EmJdc_iP0-XGdCHVkpAEoVbGIifaXXK3ADfe3LV79HVxzfA2TmrrRdd2REE4t9rjvMJyyT94ouOtXljMMLXV9x1deYLfP_PitzQwXgPqJh3-zYJC9Jlt7mbVVQWycC2cMF6baYIfsNv_HkBEPdAAAGJU","expires_in":7200})
+2018/09/13 09:34:18.590 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_R8EmJdc_iP0-XGdCHVkpAEoVbGIifaXXK3ADfe3LV79HVxzfA2TmrrRdd2REE4t9rjvMJyyT94ouOtXljMMLXV9x1deYLfP_PitzQwXgPqJh3-zYJC9Jlt7mbVVQWycC2cMF6baYIfsNv_HkBEPdAAAGJU expires_in:7200])
+2018/09/13 09:34:56.048 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:34:56.797 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:18.305 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:18.998 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_5ujXGFxce-e8Z6SorXoiFovHm3AB4oMLcMxVYMVCMkcINpXedMkZ8Bqjp2Vn5eFhMvcRLZOIV03qEKlkwn8ms2wLDCT7lRM3GMaINj64p178_MQpETcs5aZfKhShRB-geElEkosuAoT4ITNuOXHcADAVEO","expires_in":7200})
+2018/09/13 09:35:18.998 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_5ujXGFxce-e8Z6SorXoiFovHm3AB4oMLcMxVYMVCMkcINpXedMkZ8Bqjp2Vn5eFhMvcRLZOIV03qEKlkwn8ms2wLDCT7lRM3GMaINj64p178_MQpETcs5aZfKhShRB-geElEkosuAoT4ITNuOXHcADAVEO expires_in:7200])
+2018/09/13 09:35:25.154 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:25.831 [I]  远程请求结果:%!(EXTRA string={"access_token":"13__m-3i5oyQnHyOOhxrXoiFovHm3AB4oMLcMxVYMVCMkcINpXedMkZ8Bqjp2UMwNuXc-P25YptrBeEqj0YGXsdt6VAa88yE_Shkxy5yYZ-lr4sLD0TPHI6-TLzDfScnFmlywrn65gRMsrG1Nq3ACRcADAFHW","expires_in":7200})
+2018/09/13 09:35:25.831 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13__m-3i5oyQnHyOOhxrXoiFovHm3AB4oMLcMxVYMVCMkcINpXedMkZ8Bqjp2UMwNuXc-P25YptrBeEqj0YGXsdt6VAa88yE_Shkxy5yYZ-lr4sLD0TPHI6-TLzDfScnFmlywrn65gRMsrG1Nq3ACRcADAFHW expires_in:7200])
+2018/09/13 09:35:30.522 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:31.382 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:51.116 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:51.754 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_ConqbMxtFrpLh4FT1lg7LOMBQUWZkpMdh44eZvDngQT_niUypY0-SdbHfUmyyGwf1awvn2zCYA1qUHrsznE_LAIOP014B9570FlRfkEYZ_xn1vsQkuHV4pWwcH8KUKaAEAOYO","expires_in":7200})
+2018/09/13 09:35:51.754 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_ConqbMxtFrpLh4FT1lg7LOMBQUWZkpMdh44eZvDngQT_niUypY0-SdbHfUmyyGwf1awvn2zCYA1qUHrsznE_LAIOP014B9570FlRfkEYZ_xn1vsQkuHV4pWwcH8KUKaAEAOYO expires_in:7200])
+2018/09/13 09:35:51.979 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:35:52.599 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_A9uo2Xx9BpOrghSx1lg7LOMBQUWZkpMdh44eZvDngQT_niUypY0-SdbHfUnz8UPao1leofWjNSJmjC-L5Yt5kkzgg8Cqsvpr2fcUMn7i0AujSA4dS6GUhnW-io8PVQaAEADJE","expires_in":7199})
+2018/09/13 09:35:52.599 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_A9uo2Xx9BpOrghSx1lg7LOMBQUWZkpMdh44eZvDngQT_niUypY0-SdbHfUnz8UPao1leofWjNSJmjC-L5Yt5kkzgg8Cqsvpr2fcUMn7i0AujSA4dS6GUhnW-io8PVQaAEADJE expires_in:7199])
+2018/09/13 09:36:04.582 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:36:05.368 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:36:42.544 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:36:43.288 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:37:00.107 [I]  请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/13 09:37:00.819 [I]  远程请求结果:%!(EXTRA string={"access_token":"13_TGtaPNWCynkwCJyg1lg7LOMBQUWZkpMdh44eZkx76m9fBz0OapxFC-y-3nwv0pdyCkOYRaqwUltEJeuQuiqW6Fo77YD6t_eJ6EXmpKnAzcGrJnI88Vk5TAQJixqa7jDZDBP44ScWk9MlZd94TSPaAAAMLI","expires_in":7200})
+2018/09/13 09:37:00.819 [I]  接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_TGtaPNWCynkwCJyg1lg7LOMBQUWZkpMdh44eZkx76m9fBz0OapxFC-y-3nwv0pdyCkOYRaqwUltEJeuQuiqW6Fo77YD6t_eJ6EXmpKnAzcGrJnI88Vk5TAQJixqa7jDZDBP44ScWk9MlZd94TSPaAAAMLI expires_in:7200])
+=======
 2018/09/12 18:34:04 [E] 用户没有设置默认案场
 2018/09/12 18:37:00 [E] 用户没有设置默认案场
 2018/09/12 18:37:01 [E] 用户没有设置默认案场
@@ -4330,6 +4420,9 @@
 2018/09/13 10:28:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
 2018/09/13 10:28:32 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_qTd81arrjL3zUZbFm64pd7NjpuQF7JyWKwJqk8OWq5W25wwRPIlBlRO2uLHpJ7PAp9N4h2y1mIRzvNf4J5IsvwCDSyV2P7flFytQwxQ8YkXKM0DY78zusB83JhNQxTGAAMsSjOH7u0U6FK9JDWYhAIAPIK","expires_in":7200})
 2018/09/13 10:28:32 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_qTd81arrjL3zUZbFm64pd7NjpuQF7JyWKwJqk8OWq5W25wwRPIlBlRO2uLHpJ7PAp9N4h2y1mIRzvNf4J5IsvwCDSyV2P7flFytQwxQ8YkXKM0DY78zusB83JhNQxTGAAMsSjOH7u0U6FK9JDWYhAIAPIK expires_in:7200])
+<<<<<<< HEAD
+>>>>>>> df8fdc312e946064f7c7a78650e712b1337abe9b
+=======
 2018/09/13 10:32:26 [E] 用户没有设置默认案场
 2018/09/13 10:32:26 [E] 用户没有设置默认案场
 2018/09/13 10:32:27 [E] 用户没有设置默认案场
@@ -4597,8 +4690,12 @@
 2018/09/13 14:12:56 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
 2018/09/13 14:12:57 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_rbMlpYLMXD8zkQZeTmi9TkQvj1AiAe3lQIQWndOa3BDv6A_8uw26KdCwpD7b4ld0zAgEmdbYuUJFj8FxrjSui0lRRg4zsGfmmXaevhBhrGzpvZTzEoxuUqR_a5wK-9i28PYj96G1SJbO6uxkEUVeAHAHXY","expires_in":7200})
 2018/09/13 14:12:57 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_rbMlpYLMXD8zkQZeTmi9TkQvj1AiAe3lQIQWndOa3BDv6A_8uw26KdCwpD7b4ld0zAgEmdbYuUJFj8FxrjSui0lRRg4zsGfmmXaevhBhrGzpvZTzEoxuUqR_a5wK-9i28PYj96G1SJbO6uxkEUVeAHAHXY expires_in:7200])
+<<<<<<< HEAD
 2018/09/13 14:13:25 [E] 用户没有设置默认案场
 2018/09/13 14:13:27 [E] 用户没有设置默认案场
 2018/09/13 14:14:20 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
 2018/09/13 14:14:20 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_63KBvUCgOIJctKvV0yd2aut_EFTLarqBafPHq2RGACuuiaAuey0gnye9uOPmdg-3Zn2xfE6jz0DY2-9voY5YmZlO3okS6_ViGOSuUVonKvVC_qcHrK01mdxQdvEmvGzkaXJYz6jl2A69LViaWMJeAJAAQN","expires_in":7200})
 2018/09/13 14:14:20 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_63KBvUCgOIJctKvV0yd2aut_EFTLarqBafPHq2RGACuuiaAuey0gnye9uOPmdg-3Zn2xfE6jz0DY2-9voY5YmZlO3okS6_ViGOSuUVonKvVC_qcHrK01mdxQdvEmvGzkaXJYz6jl2A69LViaWMJeAJAAQN expires_in:7200])
+=======
+>>>>>>> 99bd76ff4677c5c1b8378bae3c19291d7fb32b2e
+>>>>>>> 1be15f011173acdd126eec5c0e7a937bfa8134c1

models/bodychecklist/bodychecklist.go

@@ -0,0 +1,35 @@
+package bodychecklist
+
+import (
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+
+	"github.com/go-xorm/xorm"
+)
+
+// BodychecklistDAO 当前数据库操作对象
+type BodychecklistDAO struct {
+	ctx *utils.Context
+	db  *xorm.Session
+}
+
+// NewBodychecklistDAO New Inst
+func NewBodychecklistDAO(ctx *utils.Context) *BodychecklistDAO {
+	return &BodychecklistDAO{
+		ctx: ctx,
+		db:  ctx.DB,
+	}
+}
+
+type BodyCheck struct {
+	model.TaBodyCheck `xorm:"extends"`
+	CaseName          string
+	Sex               string
+	CustomerName      string
+	Phone             string
+}
+
+// func (m *BodychecklistDAO) GetBodychecklist(caseid, phone, customerName string, page, pageSize int) ([]BodyCheck, error) {
+// 	var bodycheck []BodyCheck
+// 	sql:=``
+// }

models/constant.go

@@ -138,3 +138,10 @@ const (
 	SYS_RESOURCE_COURSE = "course"
 	SYS_RESOURCE_GOODS  = "goods"
 )
+
+// 卡券状态
+const (
+	CARD_COUPON_RECEIVED = "received"
+	CARD_COUPON_USED     = "used"
+	CARD_COUPON_EXPIRE   = "expire"
+)

models/gymcard/gymcard.go

@@ -31,6 +31,7 @@ type CustomerGym struct {
 	CardShareInfo       string
 	CardUseInstruction  string
 	CardUseRule         string
+	Price               string
 }
 
 type Gymcard struct {
@@ -39,6 +40,7 @@ type Gymcard struct {
 	CardShareInfo      string
 	CardUseInstruction string
 	CardUseRule        string
+	ChannelId          string
 }
 
 // GetGymcard 根据案场id获取游泳健身卡列表
@@ -54,9 +56,11 @@ FROM
 	ta_gym_card a
 	INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 	INNER JOIN ta_card_share c ON a.gym_card_id = c.gym_card_id
+	INNER JOIN ta_card_coupon_channel d ON a.gym_card_id = d.card_coupon_id
 	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `')
-	and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	and  a.status > ` + strconv.Itoa(models.STATUS_DEL) + `
+	and d.card_coupon_type = '` + models.GIVE_GIFT_GYM + `'`
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&gymcard)
 	return gymcard, err
 }
@@ -116,6 +120,19 @@ func (m *GymcardDAO) AddGymcard(gymcard model.TaGymCard) (model.TaGymCard, error
 	return gymcard, err
 }
 
+// AddCardChannel 新增游泳健身卡渠道
+func (m *GymcardDAO) AddCardChannel(gymcardId, channelId string) error {
+	var cardChannel model.TaCardCouponChannel
+	cardChannel.CardCouponChannelId = utils.GetGUID()
+	cardChannel.CardCouponId = gymcardId
+	cardChannel.CardCouponType = models.GIVE_GIFT_GYM
+	cardChannel.ChannelId = channelId
+	cardChannel.Status = models.STATUS_NORMAL
+	_, err := m.db.Insert(cardChannel)
+	return err
+
+}
+
 // AddGymcardImg 新增游泳健身卡图片
 func (m *GymcardDAO) AddGymcardImg(gymcardId, imgUrl string) error {
 	var cardImg model.TaCardImage
@@ -168,6 +185,19 @@ func (m *GymcardDAO) DeleteCardImg(gymcardId string) error {
 
 }
 
+// DeleteCardChannel 删除健身卡渠道对应
+func (m *GymcardDAO) DeleteCardChannel(gymcardId string) error {
+	var cardChannel = model.TaCardCouponChannel{
+		CardCouponId: gymcardId,
+		Status:       models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("gym_card_id = ?", cardChannel.CardCouponId).Update(cardChannel)
+	return err
+}
+
 // DeleteCardImg 删除健身卡分享信息
 func (m *GymcardDAO) DeleteCardShare(gymcardId string) error {
 	var cardShare = model.TaCardShare{
@@ -271,14 +301,16 @@ func (m *GymcardDAO) GetCustomerGymByCustomerId(customerId string, page, pageSiz
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 FROM
 	ta_customer_gym a
 INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
+INNER JOIN ta_gym_card d ON a.gym_card_id = d.gym_card_id
 WHERE
 	a.customer_id = '` + customerId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	sql += ` order by a.receive_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&customerGym)
 	return customerGym, err
 }
@@ -291,12 +323,14 @@ func (m *GymcardDAO) GetCustomerGymByPhone(phone string) ([]CustomerGym, error)
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 FROM
 	ta_customer_gym a
 INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
 INNER JOIN ta_customer d ON a.customer_id = d.customer_id
+INNER JOIN ta_gym_card e ON a.gym_card_id = e.gym_card_id
 Where d.phone = '` + phone + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&customerGym)
 	return customerGym, err
@@ -330,11 +364,13 @@ func (m *GymcardDAO) GetCustomerGymById(customerCardId string) (CustomerGym, err
 	b.card_image_url,
 	c.card_share_info,
 	c.card_use_instruction,
-	c.card_use_rule
+	c.card_use_rule,
+	d.price
 FROM
 	ta_customer_gym a
 INNER JOIN ta_card_image b ON a.gym_card_id = b.gym_card_id
 INNER JOIN ta_card_share C oN a.gym_card_id = c.gym_card_id
+INNER JOIN ta_gym_card d ON a.gym_card_id = d.gym_card_id
 WHERE
 	a.customer_gym_id = '` + customerCardId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&customerGym)

models/model/ta_body_check.go

@@ -0,0 +1,15 @@
+package model
+
+import (
+	"time"
+)
+
+type TaBodyCheck struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	UserId      int       `xorm:"not null INT(11)"`
+	EquipmentId string    `xorm:"not null VARCHAR(100)"`
+	CreateDate  time.Time `xorm:"not null DATETIME"`
+	Status      int       `xorm:"not null comment('1为正常') INT(11)"`
+	CaseId      int       `xorm:"INT(11)"`
+	ReportUrl   string    `xorm:"TEXT"`
+}

models/model/ta_case_equipment.go

@@ -0,0 +1,13 @@
+package model
+
+import (
+	"time"
+)
+
+type TaCaseEquipment struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	CaseId      int       `xorm:"not null INT(11)"`
+	EquipmentId string    `xorm:"VARCHAR(200)"`
+	Status      int       `xorm:"INT(11)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
+}

models/model/ta_customer_gym.go

@@ -13,6 +13,7 @@ type TaCustomerGym struct {
 	SalesName       string    `xorm:"VARCHAR(32)"`
 	StartDate       time.Time `xorm:"DATETIME"`
 	EndDate         time.Time `xorm:"DATETIME"`
+	CardStatus      string    `xorm:"VARCHAR(32)"`
 	Status          int       `xorm:"SMALLINT(6)"`
 	ReceiveDate     time.Time `xorm:"DATETIME"`
 	GymType         string    `xorm:"VARCHAR(64)"`

models/model/ta_luckdraw.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdraw struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	Name         string    `xorm:"VARCHAR(50)"`
+	ThemeId      int       `xorm:"INT(11)"`
+	LuckdrawRule string    `xorm:"TEXT"`
+	BeginDate    time.Time `xorm:"DATETIME"`
+	EndDate      time.Time `xorm:"DATETIME"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	CreateUser   string    `xorm:"VARCHAR(64)"`
+	Remark       string    `xorm:"TEXT"`
+	Status       int       `xorm:"SMALLINT(6)"`
+}

models/model/ta_luckdraw_prize.go

@@ -0,0 +1,21 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawPrize struct {
+	Id                int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId        int       `xorm:"INT(11)"`
+	PrizeName         string    `xorm:"VARCHAR(50)"`
+	PrizeImg          string    `xorm:"TEXT"`
+	Stock             int       `xorm:"INT(11)"`
+	Remainder         int       `xorm:"INT(11)"`
+	Probability       int       `xorm:"INT(11)"`
+	PrizeDesc         string    `xorm:"TEXT"`
+	PrizeLink         string    `xorm:"TEXT"`
+	Status            int       `xorm:"SMALLINT(6)"`
+	IsReality         int       `xorm:"SMALLINT(6)"`
+	VerificationStart time.Time `xorm:"DATETIME"`
+	VerificationEnd   time.Time `xorm:"DATETIME"`
+}

models/model/ta_luckdraw_record.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawRecord struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId   int       `xorm:"INT(11)"`
+	PrizeId      int       `xorm:"INT(11)"`
+	PrizeName    string    `xorm:"VARCHAR(50)"`
+	UserId       int       `xorm:"INT(11)"`
+	UserName     string    `xorm:"VARCHAR(50)"`
+	UserHeadImg  string    `xorm:"TEXT"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	WriteoffDate time.Time `xorm:"DATETIME"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+}

models/model/ta_luckdraw_writeoff.go

@@ -0,0 +1,16 @@
+package model
+
+import (
+	"time"
+)
+
+type TaLuckdrawWriteoff struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	LuckdrawId   int       `xorm:"INT(11)"`
+	RecordId     int       `xorm:"INT(11)"`
+	WriteoffDate time.Time `xorm:"DATETIME"`
+	WriteoffUser int       `xorm:"INT(11)"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       int       `xorm:"INT(11)"`
+}

models/model/ta_presentation.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaPresentation struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	CheckId     int       `xorm:"not null INT(11)"`
+	CheckType   int       `xorm:"SMALLINT(6)"`
+	CheckDate   time.Time `xorm:"DATETIME"`
+	CheckResult string    `xorm:"TEXT"`
+	ReportUrl   string    `xorm:"TEXT"`
+}

models/model/ta_presentation_detail.go

@@ -0,0 +1,10 @@
+package model
+
+type TaPresentationDetail struct {
+	Id             int    `xorm:"not null pk autoincr INT(11)"`
+	PresentationId int    `xorm:"not null INT(11)"`
+	CheckName      string `xorm:"VARCHAR(50)"`
+	CheckVal       string `xorm:"VARCHAR(500)"`
+	SpecName       string `xorm:"VARCHAR(50)"`
+	Remark         string `xorm:"TEXT"`
+}

models/model/ta_prize_detail.go

@@ -0,0 +1,14 @@
+package model
+
+import (
+	"time"
+)
+
+type TaPrizeDetail struct {
+	Id          int       `xorm:"not null pk autoincr INT(11)"`
+	PrizeId     int       `xorm:"INT(11)"`
+	Url         string    `xorm:"TEXT"`
+	Status      int       `xorm:"SMALLINT(6)"`
+	ReceiveId   int       `xorm:"INT(11)"`
+	ReceiveDate time.Time `xorm:"DATETIME"`
+}

models/model/ta_share_lucky_record.go

@@ -0,0 +1,22 @@
+package model
+
+import (
+	"time"
+)
+
+type TaShareLuckyRecord struct {
+	Id                 int       `xorm:"not null pk autoincr INT(11)"`
+	FromCustomerId     int       `xorm:"INT(11)"`
+	FromCustomerName   string    `xorm:"VARCHAR(32)"`
+	FromCustomerWxname string    `xorm:"VARCHAR(64)"`
+	FromCustomerTel    string    `xorm:"VARCHAR(32)"`
+	ToCustomerId       int       `xorm:"INT(11)"`
+	ToCustomerName     string    `xorm:"VARCHAR(32)"`
+	ToCustomerWxname   string    `xorm:"VARCHAR(64)"`
+	ToCustomerTel      string    `xorm:"VARCHAR(32)"`
+	CreateDate         time.Time `xorm:"DATETIME"`
+	CaseId             int       `xorm:"INT(11)"`
+	Status             int       `xorm:"SMALLINT(6)"`
+	LuckydrawId        int       `xorm:"INT(11)"`
+	LuckydrawName      string    `xorm:"VARCHAR(128)"`
+}

models/model/td_check_spec.go

@@ -0,0 +1,8 @@
+package model
+
+type TdCheckSpec struct {
+	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	Name     string `xorm:"not null VARCHAR(50)"`
+	SortName string `xorm:"not null VARCHAR(50)"`
+	Standard string `xorm:"VARCHAR(50)"`
+}

models/model/td_check_type.go

@@ -0,0 +1,6 @@
+package model
+
+type TdCheckType struct {
+	Id       int    `xorm:"not null pk autoincr INT(11)"`
+	TypeName string `xorm:"VARCHAR(50)"`
+}

models/model/td_luckdraw_theme.go

@@ -0,0 +1,8 @@
+package model
+
+type TdLuckdrawTheme struct {
+	Id        int    `xorm:"not null pk autoincr INT(11)"`
+	ThemeName string `xorm:"VARCHAR(50)"`
+	Status    int    `xorm:"SMALLINT(6)"`
+	OrgId     string `xorm:"VARCHAR(64)"`
+}

models/model/td_wechat_conf.go

@@ -0,0 +1,11 @@
+package model
+
+type TdWechatConf struct {
+	Appid        string `xorm:"not null pk VARCHAR(100)"`
+	Secret       string `xorm:"VARCHAR(100)"`
+	Token        string `xorm:"VARCHAR(100)"`
+	Aeskey       string `xorm:"VARCHAR(100)"`
+	Wxid         string `xorm:"VARCHAR(100)"`
+	MessageTplId string `xorm:"VARCHAR(200)"`
+	Menu         string `xorm:"TEXT"`
+}

service/gymcard/gymcard.go

@@ -112,9 +112,11 @@ func (s *GymcardServ) SaveGymcard(newGym gymcard.Gymcard) (*gymcard.Gymcard, err
 	if newGym.GymCardId == "" {
 		newGymCard = newGym.TaGymCard
 		cardGym, err = s.dao.AddGymcard(newGymCard)
-		err = s.dao.AddGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
-		newGym.TaGymCard = cardGym
-		err = s.dao.AddGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+		err = s.dao.AddGymcardImg(newGymCard.GymCardId, newGym.CardImageUrl)
+		err = s.dao.AddGymcardShare(newGymCard.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
+		if newGym.SentType == 1 {
+			err = s.dao.AddCardChannel(cardGym.GymCardId, newGym.ChannelId)
+		}
 	} else {
 		err = s.dao.EditGymcardImg(newGym.GymCardId, newGym.CardImageUrl)
 		err = s.dao.EditGymcardShare(newGym.GymCardId, newGym.CardShareInfo, newGym.CardUseRule, newGym.CardUseInstruction)
@@ -138,8 +140,8 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 	}
 	sysuser, err = s.cdao.GetUserByID(sysuserId)
 	if err != nil {
-		utils.LogError("记录发健身卡记录失败" + err.Error())
-		return nil, errors.New("记录发健身卡记录失败")
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
 	gymCard.SentCount = gymCard.SentCount + 1
 	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId, sysuserId, sysuser.RealName)
@@ -150,8 +152,8 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 
 	err = s.dao.EditGymcard(&gymCard.TaGymCard)
 	if err != nil {
-		utils.LogError("记录发健身卡记录失败" + err.Error())
-		return nil, errors.New("记录发健身卡记录失败")
+		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
+		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
 	return customerGym, nil
 }
@@ -175,6 +177,7 @@ func (s *GymcardServ) UpdateCustomerGym(customerGymId, caseid string) error {
 	}
 	if gymCard.GymTypeId == "once" {
 		customerGym.Status = models.STATUS_DEL
+		customerGym.CardStatus = models.CARD_COUPON_USED
 		gymCard.UsedCount = gymCard.UsedCount + 1
 	} else {
 		if customerGym.StartDate.IsZero() {
@@ -211,3 +214,34 @@ func (s *GymcardServ) UpdateCustomerGym(customerGymId, caseid string) error {
 	return err
 
 }
+func (s *GymcardServ) deleteGymCard(gymcardId string) error {
+	gymCard, err := s.dao.GetGymcardById(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteGymcard(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteCardImg(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	err = s.dao.DeleteCardShare(gymcardId)
+	if err != nil {
+		utils.LogError("删除健身卡失败" + err.Error())
+		return errors.New("删除健身卡失败")
+	}
+	if gymCard.SentType == 1 {
+		err = s.dao.DeleteCardChannel(gymcardId)
+		if err != nil {
+			utils.LogError("删除健身卡失败" + err.Error())
+			return errors.New("删除健身卡失败")
+		}
+	}
+	return err
+
+}