更新

controllers/cases/case.go

@@ -1,11 +1,9 @@
 package cases
 
 import (
-	"errors"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
-	"spaceofcheng/services/utils"
 )
 
 // CaseController 信息
@@ -71,12 +69,9 @@ func (c *CaseController) DelCase() {
 
 // GetOrgCases 获取机构案场
 func (c *CaseController) GetOrgCases() {
-	org := c.GetString(":org")
-	if org == "" {
-		c.ResponseError(errors.New("未确定机构"))
-	}
-	org = utils.DecodeBase64NoTail(org)
-	res, err := c.dao.GetAllCasesAndSales(org)
+	org := c.Context.Get("org").(model.SysOrg)
+
+	res, err := c.dao.GetAllCasesAndSales(org.OrgId)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/cases/record.go

@@ -0,0 +1,33 @@
+package cases
+
+import "spaceofcheng/services/models/model"
+
+// GetCaseRecordList 获取案场月记录列表
+func (c *CaseController) GetCaseRecordList() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+
+	list, err := c.dao.GetCaseRecord(caseids, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// SaveCaseRecord 保存案场月记录
+func (c *CaseController) SaveCaseRecord() {
+	info := model.SysCaseRecord{}
+	if err := c.ParseForm(&info); err != nil {
+		c.ResponseError(err)
+	}
+	newinfo, err := c.dao.AddRecord(info)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}

controllers/goods/order.go

@@ -124,3 +124,13 @@ func (c *GoodsController) PostOrder() {
 
 	c.ResponseJSON("ok")
 }
+
+// GetOrdersByRecord 根据月记录获取订单信息
+func (c *GoodsController) GetOrdersByRecord() {
+	recordid := c.GetString(":recordid")
+	orders, err := c.serv.GetOrdersByRecord(recordid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(orders)
+}

controllers/goods/type.go

@@ -20,6 +20,16 @@ func (c *GoodsController) GetGoodsType() {
 	c.ResponseJSON(goodstype)
 }
 
+// GetGoodsTypeByCase 获取商品分类列表
+func (c *GoodsController) GetGoodsTypeByCase() {
+	caseid := c.GetString("caseid")
+	goodstype, err := c.serv.GetGoodsTypeByCase(caseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(goodstype)
+}
+
 // GetGoodsTypeByID 根据ID获取商品分类
 func (c *GoodsController) GetGoodsTypeByID() {
 	typeid := c.GetString(":typeid")

log/common.log

@@ -172,3 +172,99 @@
 2018/09/06 14:45:48 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
 2018/09/06 14:45:49 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_0VUw4-tWyi8por1OWBMNgMuHx4Y6f7UP5MD90NkiA7tOW88bBvf-L817bgwBlkzhATlK-ufeG0tMtbTX_sXvWqhaxGBYVSdRrJjCUvgOUVeShhmzznp8r_gwBVs3mHVgd7TY1WMi1fsirFoIZARdAIARSJ","expires_in":7200})
 2018/09/06 14:45:49 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_0VUw4-tWyi8por1OWBMNgMuHx4Y6f7UP5MD90NkiA7tOW88bBvf-L817bgwBlkzhATlK-ufeG0tMtbTX_sXvWqhaxGBYVSdRrJjCUvgOUVeShhmzznp8r_gwBVs3mHVgd7TY1WMi1fsirFoIZARdAIARSJ expires_in:7200])
+2018/09/06 15:21:35 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:21:36 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_ouj4_K55PmZpfvSxZyjvca0UIbYlLWH2LICN3z-G8ohO6KqK_EC8EJkJGn_VNox_axkPZJES0OaWCbFnlcRNY-s_H4yKELcfAh0KlNm3pVg7TYaalm-eyyIOcMAFGCbACALMI","expires_in":7200})
+2018/09/06 15:21:36 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_ouj4_K55PmZpfvSxZyjvca0UIbYlLWH2LICN3z-G8ohO6KqK_EC8EJkJGn_VNox_axkPZJES0OaWCbFnlcRNY-s_H4yKELcfAh0KlNm3pVg7TYaalm-eyyIOcMAFGCbACALMI expires_in:7200])
+2018/09/06 15:23:52 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:23:53 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_uKWNPX0WbreBHN12QOS6uPUvYLON3hDKHhqdygDYxsHbhz19bjs3YNYlnM9l1xgXM1Jq1PWPPUghVcvS2cHE0MJ4KEqJk7RP3QPeqmctFSugSZ_jgyonSefT794alB1fkTsK6q8ujKfnamRwWNFfADARIA","expires_in":7200})
+2018/09/06 15:23:53 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_uKWNPX0WbreBHN12QOS6uPUvYLON3hDKHhqdygDYxsHbhz19bjs3YNYlnM9l1xgXM1Jq1PWPPUghVcvS2cHE0MJ4KEqJk7RP3QPeqmctFSugSZ_jgyonSefT794alB1fkTsK6q8ujKfnamRwWNFfADARIA expires_in:7200])
+2018/09/06 15:29:03 [E] 获取案场区域失败: needs a pointer to a slice or a map
+2018/09/06 15:31:24 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:31:24 [E] 获取案场区域失败: needs a pointer to a slice or a map
+2018/09/06 15:31:29 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:31:29 [E] 获取案场区域失败: needs a pointer to a slice or a map
+2018/09/06 15:31:29 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_rFUWOD-3FztWzC9x44juSW3IbMMwrE7an78sFZCkxKwYrWi-qZ3MgRFBS7iSmp7Wn67r07Rgx2eh5u2l4oo8tZ-pCI93hsRYavEjkU397O9zaZdMPJr9Y8Bs0vaGAr7rWL2pBu18mPEwX00dYZYiADAKLK","expires_in":7200})
+2018/09/06 15:31:29 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_rFUWOD-3FztWzC9x44juSW3IbMMwrE7an78sFZCkxKwYrWi-qZ3MgRFBS7iSmp7Wn67r07Rgx2eh5u2l4oo8tZ-pCI93hsRYavEjkU397O9zaZdMPJr9Y8Bs0vaGAr7rWL2pBu18mPEwX00dYZYiADAKLK expires_in:7200])
+2018/09/06 15:32:07 [E] 获取案场区域失败: needs a pointer to a slice or a map
+2018/09/06 15:32:15 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:32:15 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_NxGCIitkWMK_dIle0lgtJdXg2jhOl0C7CwvXGNqzmQ05qIDEW-GPugLWAzIRus5Dud7ppZeebCTYiFKKsA_PJTmS9jij7WC8oU0LX4yHHh2BoEAjwmkj5sXeqZAw46bXSlKvJ7CwBNT1Vtz-COOcAHAMYY","expires_in":7200})
+2018/09/06 15:32:15 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_NxGCIitkWMK_dIle0lgtJdXg2jhOl0C7CwvXGNqzmQ05qIDEW-GPugLWAzIRus5Dud7ppZeebCTYiFKKsA_PJTmS9jij7WC8oU0LX4yHHh2BoEAjwmkj5sXeqZAw46bXSlKvJ7CwBNT1Vtz-COOcAHAMYY expires_in:7200])
+2018/09/06 15:34:09 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:34:10 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_tnIzQW6lnLfOKGxURouc5sin8BHZTUcYQXNEZj5te9MW4W3QfOZ4uvOcXGbfOJ0WGDMqgUyna0UccSwWpt2ulgdNj3myp74NK2cw5_6CALP1m5miwnDYANU0lsg_EXDVQLEtENTOcd2NuHTGWAPaAGAPTI","expires_in":7200})
+2018/09/06 15:34:10 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_tnIzQW6lnLfOKGxURouc5sin8BHZTUcYQXNEZj5te9MW4W3QfOZ4uvOcXGbfOJ0WGDMqgUyna0UccSwWpt2ulgdNj3myp74NK2cw5_6CALP1m5miwnDYANU0lsg_EXDVQLEtENTOcd2NuHTGWAPaAGAPTI expires_in:7200])
+2018/09/06 15:40:29 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:40:30 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_dFgyYxk5BUmjAUyNC2O48zkgOyeNJXc6fggGtlS-e7m8xyFbkpewsMMF_BcgCzlC7EEhXzqvzt5o1OB2UFpdiA1OVuwG50bUY45UgYAZAnwaDnY3uCr6frJzXLKsoIeOr0IY8fJkZ_N_QtA5UJVhABAYNZ","expires_in":7200})
+2018/09/06 15:40:30 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_dFgyYxk5BUmjAUyNC2O48zkgOyeNJXc6fggGtlS-e7m8xyFbkpewsMMF_BcgCzlC7EEhXzqvzt5o1OB2UFpdiA1OVuwG50bUY45UgYAZAnwaDnY3uCr6frJzXLKsoIeOr0IY8fJkZ_N_QtA5UJVhABAYNZ expires_in:7200])
+2018/09/06 15:41:21 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:41:22 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_CIn1WpIOQuevhkwRHVkpAEoVbGIifaXXK3ADfSQWWEJ6vy-nyJlcJf1isK8xd_Lomq-ROdLh-579kgnQpx2y8BEzIuYVjafXdNfJO0xGy_JDHkmh9PcykQhfcNHEIptnseT4X9ac2_GjQxp1IBJjABATMU","expires_in":7200})
+2018/09/06 15:41:22 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_CIn1WpIOQuevhkwRHVkpAEoVbGIifaXXK3ADfSQWWEJ6vy-nyJlcJf1isK8xd_Lomq-ROdLh-579kgnQpx2y8BEzIuYVjafXdNfJO0xGy_JDHkmh9PcykQhfcNHEIptnseT4X9ac2_GjQxp1IBJjABATMU expires_in:7200])
+2018/09/06 15:43:48 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 15:43:49 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_wHxYp5X8il4PrIs1nJDeSpgzotgSdNS5Vf2aZYEQtIC6vtwpISc-H_Gxug-l_HDtDZdWljB9WVZhj_sAw46KfGTzJqG6R39Y7BIB6hIyOHcQdVb5cUJJgNKMEVaOpEsOD_IkIE1q1qWRWmIVHEHbABAWTW","expires_in":7200})
+2018/09/06 15:43:49 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_wHxYp5X8il4PrIs1nJDeSpgzotgSdNS5Vf2aZYEQtIC6vtwpISc-H_Gxug-l_HDtDZdWljB9WVZhj_sAw46KfGTzJqG6R39Y7BIB6hIyOHcQdVb5cUJJgNKMEVaOpEsOD_IkIE1q1qWRWmIVHEHbABAWTW expires_in:7200])
+2018/09/06 16:06:07 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:06:07 [E] 获取商品列表失败: Error 1054: Unknown column 't.type_id' in 'order clause'
+2018/09/06 16:06:08 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_kGnjZf_nK3M9joZD8GD-PnVSIp_DijxIy5_Gnrf6VGro0iJqpWqLSnmoyY4-JCgRaanWvljYQc3pvr8dNIAFKKOVbjW5aAfvnxFurZijMCLIXhkBKflEaDG-07AnpP6ioQOcPwKq_qEXqco3WEIgADAQYC","expires_in":7200})
+2018/09/06 16:06:08 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_kGnjZf_nK3M9joZD8GD-PnVSIp_DijxIy5_Gnrf6VGro0iJqpWqLSnmoyY4-JCgRaanWvljYQc3pvr8dNIAFKKOVbjW5aAfvnxFurZijMCLIXhkBKflEaDG-07AnpP6ioQOcPwKq_qEXqco3WEIgADAQYC expires_in:7200])
+2018/09/06 16:10:15 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:10:15 [E] 获取商品列表失败: Error 1054: Unknown column 't.type_id' in 'order clause'
+2018/09/06 16:10:16 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_j4zAG2y3A8VpK7FwNBGC_qtw_355bEssFUDvtNmhaTsGU1YU_HEAiSFZvh3yjrd3PQKQ2T_gmos_sh7ZoX9fH9HmOVHw04Gp-OvY5sPmaH7_rjYG9EbB1WVv2G1c2AMz_0souzehPWRL_0rMUJCdAAAXMF","expires_in":7200})
+2018/09/06 16:10:16 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_j4zAG2y3A8VpK7FwNBGC_qtw_355bEssFUDvtNmhaTsGU1YU_HEAiSFZvh3yjrd3PQKQ2T_gmos_sh7ZoX9fH9HmOVHw04Gp-OvY5sPmaH7_rjYG9EbB1WVv2G1c2AMz_0souzehPWRL_0rMUJCdAAAXMF])
+2018/09/06 16:10:27 [E] 获取商品列表失败: Error 1054: Unknown column 't.type_id' in 'order clause'
+2018/09/06 16:11:18 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:11:19 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_OFNzrMe3DbbapoAxC2O48zkgOyeNJXc6fggGtsd61AeMpMMeuJboDune44qAoCp7aq6pjQyLXHgNm9qUaDBsK_S0E9NA4mUx-aac60blp3gXFfaq9VW4d0_Yot8UAn9B5bk64DRabf0aWPBiHPMdAFAMUR","expires_in":7200})
+2018/09/06 16:11:19 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_OFNzrMe3DbbapoAxC2O48zkgOyeNJXc6fggGtsd61AeMpMMeuJboDune44qAoCp7aq6pjQyLXHgNm9qUaDBsK_S0E9NA4mUx-aac60blp3gXFfaq9VW4d0_Yot8UAn9B5bk64DRabf0aWPBiHPMdAFAMUR expires_in:7200])
+2018/09/06 16:18:08 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:18:09 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_0YRn0wzfSh1VqNA-vPUKsXFboY53Pzr-yYZPCE-dX86kaLfftPgcSuFqqmnmv7aluyotX3eH0KXFlsypxnBJbvyJeqN-pQfi_jCysL8nmKnpTaEhBpZezkegBhzvXBsO4MatDkGhmCrsVMl-BQDeAIANCP","expires_in":7200})
+2018/09/06 16:18:09 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_0YRn0wzfSh1VqNA-vPUKsXFboY53Pzr-yYZPCE-dX86kaLfftPgcSuFqqmnmv7aluyotX3eH0KXFlsypxnBJbvyJeqN-pQfi_jCysL8nmKnpTaEhBpZezkegBhzvXBsO4MatDkGhmCrsVMl-BQDeAIANCP expires_in:7200])
+2018/09/06 16:18:13 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:18:14 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_JTkulfbehGKX7AQuvPUKsXFboY53Pzr-yYZPCE-dX86kaLfftPgcSuFqqmlE6fulJE5jUt7Vs1fn1u_WPqyHOEsmXmZFWtik5-ddKagdi0IEw7ZOnb5ez7N02Nd6tDr7_BGHc8DK38I8viWQNAUeAIAERL","expires_in":7200})
+2018/09/06 16:18:14 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_JTkulfbehGKX7AQuvPUKsXFboY53Pzr-yYZPCE-dX86kaLfftPgcSuFqqmlE6fulJE5jUt7Vs1fn1u_WPqyHOEsmXmZFWtik5-ddKagdi0IEw7ZOnb5ez7N02Nd6tDr7_BGHc8DK38I8viWQNAUeAIAERL expires_in:7200])
+2018/09/06 16:20:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:20:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_uzKiyXnM_V8IjetrvPUKsXFboY53Pzr-yYZPCLIr1EVdyq7iUYGIKvw5g_0XM4gVk4XoiAQwK1ut56oqfQGvcRPkTUH8EhF3706g79Vhf2_3sC7L-iTquMdvfb0VJWaAGAHVI","expires_in":7200})
+2018/09/06 16:20:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_uzKiyXnM_V8IjetrvPUKsXFboY53Pzr-yYZPCLIr1EVdyq7iUYGIKvw5g_0XM4gVk4XoiAQwK1ut56oqfQGvcRPkTUH8EhF3706g79Vhf2_3sC7L-iTquMdvfb0VJWaAGAHVI])
+2018/09/06 16:23:32 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:23:33 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_owzcgZYyP5k3E7kgl4gAV2gKPLRLidrUUL9zrKHFaPhKes7KPZR41WDNQR4bM4LJKeXNvAYFKow7onowlxjHIHMe0dI13l5irIqY1Jc7YGEUKc_uZpBEsKpun17mngFgG7W4zi_CFpYkOD4pHOCaADAUBP","expires_in":7200})
+2018/09/06 16:23:33 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_owzcgZYyP5k3E7kgl4gAV2gKPLRLidrUUL9zrKHFaPhKes7KPZR41WDNQR4bM4LJKeXNvAYFKow7onowlxjHIHMe0dI13l5irIqY1Jc7YGEUKc_uZpBEsKpun17mngFgG7W4zi_CFpYkOD4pHOCaADAUBP expires_in:7200])
+2018/09/06 16:24:24 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:24:25 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_7rGfTIx8GFnxFgJ3vH8fFbF4uxuLd_wX0frUbFytGT2wzeA3ibxrxnBOJizS3d6J5PvmWkaoi0wDGUriDgpK8Tu8ObfZ7gjjjwHYtBRzAkmQMSaGbrzTu9G8gSQ_TEiUGnSr2yLLc6aZFxF6XPMiAEAMEB","expires_in":7200})
+2018/09/06 16:24:25 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_7rGfTIx8GFnxFgJ3vH8fFbF4uxuLd_wX0frUbFytGT2wzeA3ibxrxnBOJizS3d6J5PvmWkaoi0wDGUriDgpK8Tu8ObfZ7gjjjwHYtBRzAkmQMSaGbrzTu9G8gSQ_TEiUGnSr2yLLc6aZFxF6XPMiAEAMEB expires_in:7200])
+2018/09/06 16:46:28 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:46:29 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_641JBYA6lRcjzpQlR8XrOWIrmE3-ZsK0ek_a8AcfH2t7SDkihjjxoOx5MWcLcs0CuGwgDQqTtaPB3HOhRzL9Qt4tdd4zlpEfkfFIIRHLZpXjkVCADG4bYB89Te31nRpxuSE5kFl0rVHPrjbLQLVeAFAKFP","expires_in":7200})
+2018/09/06 16:46:29 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_641JBYA6lRcjzpQlR8XrOWIrmE3-ZsK0ek_a8AcfH2t7SDkihjjxoOx5MWcLcs0CuGwgDQqTtaPB3HOhRzL9Qt4tdd4zlpEfkfFIIRHLZpXjkVCADG4bYB89Te31nRpxuSE5kFl0rVHPrjbLQLVeAFAKFP expires_in:7200])
+2018/09/06 16:50:18 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:50:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 16:50:35 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_3BtETq3_c_TCyYP1HOWBitCSCEVtszw8dcgnh-_ozBziAfQ883Y5ehzz-FrpyfuSMHMA2JR0w3GoD875z9P4IdSkzpmmelKVzDQ5-rIm6By7TyTE2NOt4egQqUoSGNGsgr8Xxcj9pFofQE1mXNEdAHABRI","expires_in":7200})
+2018/09/06 16:50:35 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_3BtETq3_c_TCyYP1HOWBitCSCEVtszw8dcgnh-_ozBziAfQ883Y5ehzz-FrpyfuSMHMA2JR0w3GoD875z9P4IdSkzpmmelKVzDQ5-rIm6By7TyTE2NOt4egQqUoSGNGsgr8Xxcj9pFofQE1mXNEdAHABRI expires_in:7200])
+2018/09/06 17:10:41 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 17:10:42 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_N66r4MsV5U4FVP08oZsOY0ry0MQT6q58n0lig-pIDodRLYDerwT6Y_Vy4EvimEgkrrEGUNynTqzuzIn3tKgIpG3om_IICCZR51eds7bwlHFhaerPYbSgqpGP0CtOp2a8hj950pemb6SU0CzHGKCbABAKOG","expires_in":7200})
+2018/09/06 17:10:42 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[expires_in:7200 access_token:13_N66r4MsV5U4FVP08oZsOY0ry0MQT6q58n0lig-pIDodRLYDerwT6Y_Vy4EvimEgkrrEGUNynTqzuzIn3tKgIpG3om_IICCZR51eds7bwlHFhaerPYbSgqpGP0CtOp2a8hj950pemb6SU0CzHGKCbABAKOG])
+2018/09/06 17:39:15 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 17:39:16 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_fMXnyoI7g3UhrfJOIhfOemZ8x2JZqaVEC0HLn6wIflVhjbZVYgB7sg93DAMVrmWJ3awsSuoDaxH0E07PvMpFcbMISGfestxS67uv_Q8vXBdmTMGtS_HcV6mbiQiOLI7KWia3m2N-nJauhXpUINSjAFADIN","expires_in":7200})
+2018/09/06 17:39:16 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_fMXnyoI7g3UhrfJOIhfOemZ8x2JZqaVEC0HLn6wIflVhjbZVYgB7sg93DAMVrmWJ3awsSuoDaxH0E07PvMpFcbMISGfestxS67uv_Q8vXBdmTMGtS_HcV6mbiQiOLI7KWia3m2N-nJauhXpUINSjAFADIN expires_in:7200])
+2018/09/06 18:04:06 [E] 获取案场月记录失败: Error 1054: Unknown column 'create_date' in 'order clause'
+2018/09/06 18:05:28 [E] 获取案场月记录失败: sql: statement expects 0 inputs; got 1
+2018/09/06 18:05:34 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 18:05:34 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_18w8rh_Y29L6PAlCg982DKn7EJUbs4o04CLUqFPdlwXvFKt3bRu4FZ1EsSu86Vk7DhNP1ybwpW6S0rwQbmCRzAmEH5pwDF-_EjgQ_E5UX0c4uwRDjbADxWM9wRDci9azRXz2vw1Rp41AZLuvNIVcAIAWRE","expires_in":7200})
+2018/09/06 18:05:34 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_18w8rh_Y29L6PAlCg982DKn7EJUbs4o04CLUqFPdlwXvFKt3bRu4FZ1EsSu86Vk7DhNP1ybwpW6S0rwQbmCRzAmEH5pwDF-_EjgQ_E5UX0c4uwRDjbADxWM9wRDci9azRXz2vw1Rp41AZLuvNIVcAIAWRE expires_in:7200])
+2018/09/06 18:09:51 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 18:09:51 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_erkHsatTGf2cYw9qchMU6PMLRKZH-euoblG5WZkwrnDIE07D3xaoi2g_OABVbZzN5BdubdK_8m_SYtp6hsKuILHZAuy2NpzrDD0coSfLdduFX9VtzWTCyVeaz93e8L6z_fNrF0mwt0OdcK0fNHTcAJAWQC","expires_in":7200})
+2018/09/06 18:09:51 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_erkHsatTGf2cYw9qchMU6PMLRKZH-euoblG5WZkwrnDIE07D3xaoi2g_OABVbZzN5BdubdK_8m_SYtp6hsKuILHZAuy2NpzrDD0coSfLdduFX9VtzWTCyVeaz93e8L6z_fNrF0mwt0OdcK0fNHTcAJAWQC expires_in:7200])
+2018/09/06 18:14:10 [E] 保存月记录失败: a pointer to a pointer is not allowed
+2018/09/06 18:16:11 [E] 保存月记录失败: sql: statement expects 3 inputs; got 2
+2018/09/06 18:17:53 [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 '?Sat Sep 01 2018 00:00:00 GMT+0800 (中国标准时间))' at line 1
+2018/09/06 18:21:50 [E] 保存月记录失败: Error 1054: Unknown column 'record.Month' in 'where clause'
+2018/09/06 18:43:49 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 18:43:50 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Nb3bPc5y0FqETM4707TwgL0liULpmiKC2LVmErTJQ5mbKTeTiQrX09NLREOIsXGpnoHVv6Y3XYrlsRdVd7MRwPd337Kl2kOoDxZGCxaQkbJuN3SdnSBscfbhNP3KrVVUZNu9Xq3UgQFaGEg5KXNfADAPCS","expires_in":7200})
+2018/09/06 18:43:50 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Nb3bPc5y0FqETM4707TwgL0liULpmiKC2LVmErTJQ5mbKTeTiQrX09NLREOIsXGpnoHVv6Y3XYrlsRdVd7MRwPd337Kl2kOoDxZGCxaQkbJuN3SdnSBscfbhNP3KrVVUZNu9Xq3UgQFaGEg5KXNfADAPCS expires_in:7200])
+2018/09/06 18:50:03 [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 '? and status=? and month=?' at line 1
+2018/09/06 19:27:25 [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 '? and b.status=? and a.status=?' at line 1
+2018/09/06 19:27:50 [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 '? and b.status=? and a.status=?' at line 1
+2018/09/06 19:28:03 [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 '? and b.status=? and a.status=?' at line 1
+2018/09/06 19:28:18 [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 '? and b.status=? and a.status=?' at line 1
+2018/09/06 19:57:42 [I] 请求远程接口: %!(EXTRA string=https://api.weixin.qq.com/cgi-bin/token?appid=wx7320287e057bbeee&grant_type=client_credential&secret=6e844dc2ade439545c47569ba1707673)
+2018/09/06 19:57:42 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
+2018/09/06 19:57:42 [I] 远程请求结果:%!(EXTRA string={"access_token":"13_Nl6Lwlwwv9P8ofsPue2JQajFisGyMCF98aO7nj_VvseQPyNuSZGAVA3b0G6Dt9y5wsI-OxOMTfXb0xfLFKVOn09eUd9e00wHooE2ciXPEBe6vX5SWo7bsX9X_8YuQMyG8NIhu7xpKpH8OGROKEHfABAEYB","expires_in":7200})
+2018/09/06 19:57:42 [I] 接口返回结果: %!(EXTRA map[string]interface {}=map[access_token:13_Nl6Lwlwwv9P8ofsPue2JQajFisGyMCF98aO7nj_VvseQPyNuSZGAVA3b0G6Dt9y5wsI-OxOMTfXb0xfLFKVOn09eUd9e00wHooE2ciXPEBe6vX5SWo7bsX9X_8YuQMyG8NIhu7xpKpH8OGROKEHfABAEYB expires_in:7200])
+2018/09/06 19:58:18 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
+2018/09/06 19:59:58 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string
+2018/09/06 20:00:48 [E] 下单转换JSON失败: json: cannot unmarshal number into Go struct field TaGoodsOrders.Amount of type string

models/cases/area.go

@@ -35,7 +35,7 @@ type AreaInfo struct {
 func (m *CaseDAO) GetCaseAreaByCase(caseid string) ([]AreaInfo, error) {
 	var areas []AreaInfo
 	sql := `select * from sys_case_area where status>` + strconv.Itoa(models.STATUS_DEL) + ` and case_id ='` + caseid + `'`
-	err := m.db.Sql(sql).Find(&sql)
+	err := m.db.Sql(sql).Find(&areas)
 	return areas, err
 }
 

models/cases/record.go

@@ -1,10 +1,86 @@
 package cases
 
-import "spaceofcheng/services/models/model"
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/goods"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// CaseRecord 月订单记录
+type CaseRecord struct {
+	model.SysCaseRecord `xorm:"extends"`
+	ActrualNum          int
+	OverNum             int
+	LeftNum             int
+}
 
 // GetCaseRecord 获取案场月记录
-func (m *CaseDAO) GetCaseRecord(caseid string) ([]model.SysCaseRecord, error) {
-	var records []model.SysCaseRecord
-	err := m.db.Where("case_id=?", caseid).Find(&records)
+func (m *CaseDAO) GetCaseRecord(caseids string, page, pageSize int) ([]CaseRecord, error) {
+	var records []CaseRecord
+	sql := `select * from sys_case_record where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL) + ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := m.db.Sql(sql).Find(&records)
+	if err != nil {
+		return nil, err
+	}
+	for inx, record := range records {
+		orders := new(model.TaGoodsOrders)
+		total, err := m.db.Where("case_id=?", record.CaseId).And("status=?", models.STATUS_NORMAL).And("user_type=?", goods.USERTPE_SALES).And("date_format(create_date,'%Y-%m')=?", record.Month).Sums(orders, "orders_num")
+		if err != nil {
+			return nil, err
+		}
+		records[inx].ActrualNum = int(total[0])
+		var overnum int
+		var leftnum int
+		if records[inx].ActrualNum > record.Num {
+			overnum = records[inx].ActrualNum - record.Num
+		} else {
+			leftnum = record.Num - records[inx].ActrualNum
+		}
+		records[inx].OverNum = overnum
+		records[inx].LeftNum = leftnum
+	}
+
 	return records, err
 }
+
+// GetCaseRecordCount 获取月记录
+func (m *CaseDAO) GetCaseRecordCount(caseids string) (int, error) {
+	var records []CaseRecord
+	sql := `select * from sys_case_record where case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
+
+	err := m.db.Sql(sql).Find(&records)
+	if err != nil {
+		return 0, err
+	}
+	return len(records), nil
+}
+
+// AddRecord 新增案场月记录信息
+func (m *CaseDAO) AddRecord(record model.SysCaseRecord) (*model.SysCaseRecord, error) {
+	record.CreateDate = time.Now()
+	record.RecordId = utils.GetGUID()
+	record.Status = models.STATUS_NORMAL
+	record.IsOver = 1
+	_, err := m.db.Insert(record)
+	return &record, err
+}
+
+// GetRecordByMonth 根据月份获取月记录信息
+func (m *CaseDAO) GetRecordByMonth(caseid, month string) (*model.SysCaseRecord, error) {
+	var record []model.SysCaseRecord
+	sql := `select * from sys_case_record where case_id=? and status=? and month=?`
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, month).Find(&record)
+
+	if err != nil {
+		return nil, err
+	}
+	if len(record) > 0 {
+		return &record[0], nil
+	}
+	return nil, nil
+}

models/goods/goods.go

@@ -87,7 +87,7 @@ func (m *GoodsDAO) GetGoodsListPageNavi(name, typeID, caseID string, limit []int
 func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 	var goodsList []GoodsWithSpec
 
-	sql := "select * from ta_goods where case_id = ? and status = ? order by t.type_id, t.create_date"
+	sql := "select * from ta_goods where case_id = ? and status = ? order by type_id, create_date"
 	if err := m.db.SQL(sql, caseID, models.STATUS_NORMAL).Find(&goodsList); err != nil {
 		return nil, err
 	}

models/goods/orders.go

@@ -12,6 +12,11 @@ import (
 	"github.com/yl10/kit/guid"
 )
 
+const (
+	USERTPE_SALES     = "sales"
+	USERTYPE_CUSTOMER = "customer"
+)
+
 // GetOrdersByCases 获取案场订单列表
 func (m *GoodsDAO) GetOrdersByCases() error {
 	return nil
@@ -167,3 +172,22 @@ func (m *GoodsDAO) GetOrdersByCaseID(caseID, userType string, makeStatus []strin
 
 	return orderList, cnt, nil
 }
+
+// GetOrdersByRecord 根据
+func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error) {
+	var orderList []OrdersWithGoods
+	sql := `select a.* from ta_goods_orders a inner join sys_case_record b on a.case_id=b.case_id and date_format(a.create_date,'%Y-%m')=b.month where b.record_id='` + recordid +
+		`' and a.user_type='` + USERTPE_SALES + `' and b.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+	err := m.db.Sql(sql).Find(&orderList)
+	if err != nil {
+		return nil, err
+	}
+	for i, o := range orderList {
+		var details []model.TaGoodsOrdersDetail
+		if err := m.db.Where("orders_id=?", o.OrdersId).Find(&details); err != nil {
+			return nil, err
+		}
+		orderList[i].Goods = details
+	}
+	return orderList, nil
+}

models/goods/type.go

@@ -16,6 +16,12 @@ func (m *GoodsDAO) GetGoodsTypeCount(caseids string) (int, error) {
 	return len(goodstype), err
 }
 
+func (m *GoodsDAO) GetGoodsTypeByCase(caseid string) ([]model.TdGoodsType, error) {
+	var goodstype []model.TdGoodsType
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("case_id=?", caseid).Find(&goodstype)
+	return goodstype, err
+}
+
 // GetGoodsType 根据案场获取商品类型
 func (m *GoodsDAO) GetGoodsType(caseids string, page int, pageSize int) ([]model.TdGoodsType, error) {
 	var goodstype []model.TdGoodsType
@@ -52,6 +58,7 @@ func (m *GoodsDAO) UpdateGoodsType(goodsType *model.TdGoodsType) error {
 	var cols = []string{
 		"type_name",
 		"case_id",
+		"english_name",
 	}
 	_, err := m.db.Cols(cols...).Where("type_id=?", goodsType.TypeId).Update(goodsType)
 	return err

models/goods/types.go

@@ -33,6 +33,6 @@ type GoodsWithPrice struct {
 
 // OrdersWithGoods 订单列表
 type OrdersWithGoods struct {
-	model.TaGoodsOrders
-	Goods []model.TaGoodsOrdersDetail
+	model.TaGoodsOrders `xorm:"extends"`
+	Goods               []model.TaGoodsOrdersDetail
 }

models/model/sys_case_record.go

@@ -7,6 +7,7 @@ type SysCaseRecord struct {
 	CaseId     string    `xorm:"not null VARCHAR(64)"`
 	Month      string    `xorm:"VARCHAR(20)"`
 	Num        int       `xorm:"INT(11)"`
+	IsOver     int       `xorm:"SMALLINT(6)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/model/td_goods_type.go

@@ -5,11 +5,12 @@ import (
 )
 
 type TdGoodsType struct {
-	TypeId     string    `xorm:"not null pk VARCHAR(64)"`
-	TypeName   string    `xorm:"VARCHAR(32)"`
-	CaseId     string    `xorm:"VARCHAR(64)"`
-	OrgId      string    `xorm:"VARCHAR(64)"`
-	CreateUser string    `xorm:"VARCHAR(64)"`
-	CreateDate time.Time `xorm:"DATETIME"`
-	Status     int       `xorm:"SMALLINT(6)"`
+	TypeId      string    `xorm:"not null pk VARCHAR(64)"`
+	TypeName    string    `xorm:"VARCHAR(32)"`
+	EnglishName string    `xorm:"VARCHAR(20)"`
+	CaseId      string    `xorm:"VARCHAR(64)"`
+	OrgId       string    `xorm:"VARCHAR(64)"`
+	CreateUser  string    `xorm:"VARCHAR(64)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
+	Status      int       `xorm:"SMALLINT(6)"`
 }

routers/common.go

@@ -7,12 +7,12 @@ import (
 	"spaceofcheng/services/controllers/course"
 	"spaceofcheng/services/controllers/customer"
 	"spaceofcheng/services/controllers/goods"
+	"spaceofcheng/services/controllers/marketing"
 	"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"
 )
@@ -141,6 +141,10 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/case/table", &cases.CaseController{}, "put:SaveCaseTable"),
 		beego.NSRouter("/case/table/:tableid", &cases.CaseController{}, "delete:DelCaseTable"),
 
+		// caserecord 案场月记录
+		beego.NSRouter("/case/record", &cases.CaseController{}, "get:GetCaseRecordList"),
+		beego.NSRouter("/case/record", &cases.CaseController{}, "post:SaveCaseRecord"),
+
 		// channel 渠道
 		beego.NSRouter("/channel", &channel.ChannelController{}, "get:GetChannelList"),
 		beego.NSRouter("/channel/:channelId", &channel.ChannelController{}, "get:GetChannelById"),
@@ -200,6 +204,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 商品订单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),
 		beego.NSRouter("/order/online/goods", &goods.GoodsController{}, "get:GetOnlineOrder"),
+		beego.NSRouter("/order/goods/record/:recordid", &goods.GoodsController{}, "get:GetOrdersByRecord"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
@@ -210,18 +215,16 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 系统相关
 		beego.NSRouter("/system/init", &user.UserController{}, "get:GetEnvVars"),
 
-
 		// 营销活动
-		beego.NSRouter("/marketing/list",&marketing.MarketingController{},"get:GetMarketingList"),
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"post:SaveMarketing"),
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"get:GetMarketingById"),
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"put:UpdateMarketing"),
-		beego.NSRouter("/marketing/normal/:activityId",&marketing.MarketingController{},"put:DelMarketingNormal"),
-		beego.NSRouter("/marketing/disable/:activityId",&marketing.MarketingController{},"put:DelMarketingDisable"),
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"delete:DelMarketing"),
+		beego.NSRouter("/marketing/list", &marketing.MarketingController{}, "get:GetMarketingList"),
+		beego.NSRouter("/marketing", &marketing.MarketingController{}, "post:SaveMarketing"),
+		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "get:GetMarketingById"),
+		beego.NSRouter("/marketing", &marketing.MarketingController{}, "put:UpdateMarketing"),
+		beego.NSRouter("/marketing/normal/:activityId", &marketing.MarketingController{}, "put:DelMarketingNormal"),
+		beego.NSRouter("/marketing/disable/:activityId", &marketing.MarketingController{}, "put:DelMarketingDisable"),
+		beego.NSRouter("/marketing/:activityId", &marketing.MarketingController{}, "delete:DelMarketing"),
 
 		// 签到
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
-
 	)
 }

routers/guest.go

@@ -30,12 +30,14 @@ func getGuestRoutes() beego.LinkNamespace {
 
 		// 案场
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
+		beego.NSRouter("/cms/area", &cases.CaseController{}, "get:GetAreaByCase"),
 
 		// 商品制作状态
 		beego.NSRouter("/dict/order/makestatus", &goods.GoodsController{}, "get:GetMakeStatus"),
 
 		// 商品
 		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListForWechat"),
+		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsTypeByCase"),
 
 		// 验证码 获取, 校验
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),

service/cases/record.go

@@ -0,0 +1,53 @@
+package cases
+
+import (
+	"errors"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
+)
+
+// GetCaseRecord 获取案场月记录列表
+func (s *CaseServ) GetCaseRecord(caseids string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	records, err := s.dao.GetCaseRecord(caseids, page, pageSize)
+	if err != nil {
+		utils.LogError("获取案场月记录失败: " + err.Error())
+		return nil, errors.New("获取案场月记录失败")
+	}
+	total, err := s.dao.GetCaseRecordCount(caseids)
+	if err != nil {
+		utils.LogError("获取案场月记录失败: " + err.Error())
+		return nil, errors.New("获取案场月记录失败")
+	}
+
+	return map[string]interface{}{
+		"list":     records,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// AddRecord 保存案场月记录信息
+func (s *CaseServ) AddRecord(record model.SysCaseRecord) (*model.SysCaseRecord, error) {
+	res, err := s.dao.GetRecordByMonth(record.CaseId, record.Month)
+	if err != nil {
+		utils.LogError("保存月记录失败: " + err.Error())
+		return nil, errors.New("保存月记录失败")
+	}
+	if res != nil {
+		return nil, errors.New("案场已存在选择月份的记录！不允许新增！")
+	}
+	newinfo, err := s.dao.AddRecord(record)
+	if err != nil {
+		utils.LogError("保存月记录失败: " + err.Error())
+		return nil, errors.New("保存月记录失败")
+	}
+	return newinfo, nil
+}

service/goods/orders.go

@@ -299,3 +299,14 @@ func (s *GoodsServ) GetOnLineOrders(caseID string) ([]goods.OrdersWithGoods, err
 
 	return orderList, nil
 }
+
+// GetOrdersByRecord 获取月订单
+// 管理端
+func (s *GoodsServ) GetOrdersByRecord(recordid string) ([]goods.OrdersWithGoods, error) {
+	orders, err := s.dao.GetOrdersByRecord(recordid)
+	if err != nil {
+		utils.LogError("获取订单列表失败： " + err.Error())
+		return nil, errors.New("获取订单列表失败")
+	}
+	return orders, nil
+}

service/goods/type.go

@@ -34,6 +34,19 @@ func (s *GoodsServ) GetGoodsType(caseids string, page int, pageSize int) (map[st
 	}, nil
 }
 
+// GetGoodsTypeByCase 获取商品类型
+func (s *GoodsServ) GetGoodsTypeByCase(caseid string) ([]model.TdGoodsType, error) {
+	if caseid == "" {
+		return nil, errors.New("请选选择对应案场！")
+	}
+	types, err := s.dao.GetGoodsTypeByCase(caseid)
+	if err != nil {
+		utils.LogError("获取商品类型失败: " + err.Error())
+		return nil, errors.New("获取商品类型失败")
+	}
+	return types, nil
+}
+
 // GetGoodsTypeByID 根据商品类型ID获取商品类型
 func (s *GoodsServ) GetGoodsTypeByID(typeid string) (*model.TdGoodsType, error) {
 	goodsType, err := s.dao.GetGoodsTypeByID(typeid)