bug修改

controllers/customer/customer.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/customer"
 	"spaceofcheng/services/utils"
@@ -72,6 +73,13 @@ func (c *CustomerController) GetCustWXByID() {
 		c.ResponseError(errors.New("获取用户信息失败, 请重试"))
 	}
 
+	if cust.MapUser != "" && cust.BelongCaseStatus != models.STATUS_NORMAL {
+		c.ResponseError(
+			errors.New("案场状态异常！"),
+			http.StatusMethodNotAllowed,
+		)
+	}
+
 	c.ResponseJSON(map[string]interface{}{
 		"customer": cust,
 	})

controllers/statistics/goods.go

@@ -132,14 +132,13 @@ func (c *StatisticsController) GetGoodsOrdersStatisticsExcel() {
 		"订单状态",
 		"商品",
 		"数量",
-		"金额",
+		"单价",
 		"桌位",
 		"下单人",
 		"电话",
 	})
 
 	for _, item := range list {
-		row := excel.InsertRow()
 		usertype := ""
 		switch item.UserType {
 		case "customer":
@@ -160,10 +159,16 @@ func (c *StatisticsController) GetGoodsOrdersStatisticsExcel() {
 			orderStatus = "已取消"
 		}
 		for _, detail := range item.Details {
+			row := excel.InsertRow()
 			name := detail.GoodsName
 			if detail.SpecName != "" {
 				name = name + "(" + detail.SpecName + ")"
 			}
+			// price, err := strconv.ParseFloat(detail.Price, 64)
+			// if err != nil {
+			// 	c.ResponseError(errors.New("金额类型不正确！"))
+			// }
+			// amount := price * float64(detail.Number)
 			excel.SetCell(row, []string{
 				item.OrdersNo,
 				item.CaseName,
@@ -172,6 +177,7 @@ func (c *StatisticsController) GetGoodsOrdersStatisticsExcel() {
 				orderStatus,
 				name,
 				strconv.Itoa(detail.Number),
+				detail.Price,
 				item.AreaName + item.TableNo,
 				item.CustomerName,
 				item.Phone,

log/common.log

@@ -1301,3 +1301,219 @@ SELECT
 2018/09/20 21:59:29 [E] 用户没有设置默认案场
 2018/09/20 21:59:30 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
 2018/09/20 21:59:30 [E] 用户没有设置默认案场
+2018/09/20 22:01:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:01:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:01:50 [E] 用户没有设置默认案场
+2018/09/20 22:01:50 [E] 用户没有设置默认案场
+2018/09/20 22:01:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:01:50 [E] 用户没有设置默认案场
+2018/09/20 22:03:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:03:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:03:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:04:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:04:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:04:04 [E] 用户没有设置默认案场
+2018/09/20 22:04:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:04:21 [E] 用户没有设置默认案场
+2018/09/20 22:06:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:06:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:06:44 [E] 用户没有设置默认案场
+2018/09/20 22:06:44 [E] 用户没有设置默认案场
+2018/09/20 22:07:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:07:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:07:42 [E] 用户没有设置默认案场
+2018/09/20 22:07:42 [E] 用户没有设置默认案场
+2018/09/20 22:08:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:08:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:08:36 [E] 用户没有设置默认案场
+2018/09/20 22:08:36 [E] 用户没有设置默认案场
+2018/09/20 22:09:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:09:39 [E] 用户没有设置默认案场
+2018/09/20 22:10:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:15 [E] 用户没有设置默认案场
+2018/09/20 22:10:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:17 [E] 用户没有设置默认案场
+2018/09/20 22:10:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:21 [E] 用户没有设置默认案场
+2018/09/20 22:10:21 [E] 用户没有设置默认案场
+2018/09/20 22:10:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:40 [E] 用户没有设置默认案场
+2018/09/20 22:10:40 [E] 用户没有设置默认案场
+2018/09/20 22:10:50 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:51 [E] 用户没有设置默认案场
+2018/09/20 22:10:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:10:51 [E] 用户没有设置默认案场
+2018/09/20 22:11:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:01 [E] 用户没有设置默认案场
+2018/09/20 22:11:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:03 [E] 用户没有设置默认案场
+2018/09/20 22:11:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:03 [E] 用户没有设置默认案场
+2018/09/20 22:11:06 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:06 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:06 [E] 用户没有设置默认案场
+2018/09/20 22:11:06 [E] 用户没有设置默认案场
+2018/09/20 22:11:07 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:07 [E] 用户没有设置默认案场
+2018/09/20 22:11:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:09 [E] 用户没有设置默认案场
+2018/09/20 22:11:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:11:09 [E] 用户没有设置默认案场
+2018/09/20 22:12:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:12:03 [E] 用户没有设置默认案场
+2018/09/20 22:12:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:12:03 [E] 用户没有设置默认案场
+2018/09/20 22:12:20 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:12:20 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:12:20 [E] 用户没有设置默认案场
+2018/09/20 22:12:20 [E] 用户没有设置默认案场
+2018/09/20 22:13:06 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:18:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:09 [E] 用户没有设置默认案场
+2018/09/20 22:18:14 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:14 [E] 用户没有设置默认案场
+2018/09/20 22:18:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:15 [E] 用户没有设置默认案场
+2018/09/20 22:18:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:21 [E] 用户没有设置默认案场
+2018/09/20 22:18:21 [E] 用户没有设置默认案场
+2018/09/20 22:18:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:21 [E] 用户没有设置默认案场
+2018/09/20 22:18:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:36 [E] 用户没有设置默认案场
+2018/09/20 22:18:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:36 [E] 用户没有设置默认案场
+2018/09/20 22:18:47 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:18:47 [E] 用户没有设置默认案场
+2018/09/20 22:19:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:19:03 [E] 用户没有设置默认案场
+2018/09/20 22:28:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:17 [E] 用户没有设置默认案场
+2018/09/20 22:28:52 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:53 [E] 用户没有设置默认案场
+2018/09/20 22:28:53 [E] 用户没有设置默认案场
+2018/09/20 22:28:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:57 [E] 用户没有设置默认案场
+2018/09/20 22:28:58 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:58 [E] 用户没有设置默认案场
+2018/09/20 22:28:59 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:28:59 [E] 用户没有设置默认案场
+2018/09/20 22:29:22 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:23 [E] 用户没有设置默认案场
+2018/09/20 22:29:43 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:43 [E] 用户没有设置默认案场
+2018/09/20 22:29:43 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:43 [E] 用户没有设置默认案场
+2018/09/20 22:29:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:51 [E] 用户没有设置默认案场
+2018/09/20 22:29:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:56 [E] 用户没有设置默认案场
+2018/09/20 22:29:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:29:56 [E] 用户没有设置默认案场
+2018/09/20 22:30:05 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:30:05 [E] 用户没有设置默认案场
+2018/09/20 22:30:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:30:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:30:33 [E] 用户没有设置默认案场
+2018/09/20 22:30:33 [E] 用户没有设置默认案场
+2018/09/20 22:32:47 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:32:47 [E] 用户没有设置默认案场
+2018/09/20 22:32:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:32:56 [E] 用户没有设置默认案场
+2018/09/20 22:32:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:32:56 [E] 用户没有设置默认案场
+2018/09/20 22:33:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:33:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:33:00 [E] 用户没有设置默认案场
+2018/09/20 22:33:00 [E] 用户没有设置默认案场
+2018/09/20 22:33:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:33:01 [E] 用户没有设置默认案场
+2018/09/20 22:33:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:33:07 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:33:14 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:33:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:33:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:33:19 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:34:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:34:36 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:34:36 [E] 用户没有设置默认案场
+2018/09/20 22:34:36 [E] 用户没有设置默认案场
+2018/09/20 22:34:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:34:37 [E] 用户没有设置默认案场
+2018/09/20 22:35:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:35:44 [E] 用户没有设置默认案场
+2018/09/20 22:35:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:35:45 [E] 用户没有设置默认案场
+2018/09/20 22:35:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:35:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:35:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:35:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:35:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:35:54 [E] 用户没有设置默认案场
+2018/09/20 22:35:54 [E] 用户没有设置默认案场
+2018/09/20 22:35:55 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:35:55 [E] 用户没有设置默认案场
+2018/09/20 22:36:32 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:32 [E] 用户没有设置默认案场
+2018/09/20 22:36:32 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:32 [E] 用户没有设置默认案场
+2018/09/20 22:36:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:39 [E] 用户没有设置默认案场
+2018/09/20 22:36:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:42 [E] 用户没有设置默认案场
+2018/09/20 22:36:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:44 [E] 用户没有设置默认案场
+2018/09/20 22:36:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:36:44 [E] 用户没有设置默认案场
+2018/09/20 22:38:52 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:38:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:38:55 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:38:57 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:39:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:01 [E] 用户没有设置默认案场
+2018/09/20 22:39:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:01 [E] 用户没有设置默认案场
+2018/09/20 22:39:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:02 [E] 用户没有设置默认案场
+2018/09/20 22:39:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:11 [E] 用户没有设置默认案场
+2018/09/20 22:39:11 [E] 用户没有设置默认案场
+2018/09/20 22:39:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:17 [E] 用户没有设置默认案场
+2018/09/20 22:39:17 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:39:17 [E] 用户没有设置默认案场
+2018/09/20 22:41:26 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:41:26 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:41:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:42:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:42:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:42:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:42:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:42:34 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:43:27 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:46:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
+2018/09/20 22:50:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:50:24 [E] 用户没有设置默认案场
+2018/09/20 22:50:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:50:29 [E] 用户没有设置默认案场
+2018/09/20 22:50:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
+2018/09/20 22:50:35 [E] 用户没有设置默认案场
+2018/09/20 23:00:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:00:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:00:46 [E] 用户没有设置默认案场
+2018/09/20 23:00:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:00:46 [E] 用户没有设置默认案场
+2018/09/20 23:00:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:00:46 [E] 用户没有设置默认案场
+2018/09/20 23:02:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:02:10 [E] 用户没有设置默认案场
+2018/09/20 23:02:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:02:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; wow64) applewebkit/537.36 (khtml, like gecko) chrome/63.0.3239.132 safari/537.36
+2018/09/20 23:02:10 [E] 用户没有设置默认案场
+2018/09/20 23:02:10 [E] 用户没有设置默认案场

models/customer/types.go

@@ -12,4 +12,5 @@ type CustWithWX struct {
 	Points              int
 	MapUser             string
 	BelongCaseId        string
+	BelongCaseStatus    int
 }

models/goods/orders.go

@@ -222,7 +222,7 @@ func (m *GoodsDAO) GetCustomerOrders(custID string, page, pageSize int) ([]Order
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
-		`' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
+		`' and a.status=` + strconv.Itoa(models.STATUS_NORMAL)
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
@@ -244,7 +244,7 @@ func (m *GoodsDAO) GetCustomerOrdersCount(custID string) (int, error) {
 	sql := `select a.*, c.case_name from ta_goods_orders a 
 	inner join sys_case c on a.case_id=c.case_id
 	where a.user_id='` + custID +
-		`' and c.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.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 0, err

models/statistics/goods.go

@@ -167,8 +167,7 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 		return nil, err
 	}
 	for inx, item := range orders {
-		var details []model.TaGoodsOrdersDetail
-		err := m.db.Where("orders_id=?", item.OrdersId).Find(&details)
+		details, err := m.GetGoodsOrderDetailByOrderId(item.OrdersId)
 		if err != nil {
 			return nil, err
 		}
@@ -177,6 +176,13 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 	return orders, err
 }
 
+// GetGoodsOrderDetailByOrderId 获取商品详情
+func (m *StatisticsDAO) GetGoodsOrderDetailByOrderId(ordersid string) ([]model.TaGoodsOrdersDetail, error) {
+	var details []model.TaGoodsOrdersDetail
+	err := m.db.Where("orders_id=?", ordersid).Find(&details)
+	return details, err
+}
+
 // GetGoodsOrderStatisticsCount 获取商品订单Count
 func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids, begindate, enddate string) ([]GoodsOrdersStatistics, error) {
 	var orders []GoodsOrdersStatistics
@@ -213,7 +219,6 @@ func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids,
 	if status != "" {
 		sql = sql + ` and a.make_status='` + status + `'`
 	}
-
 	err := m.db.Sql(sql).Find(&orders)
 	return orders, err
 }

service/customer/customer.go

@@ -74,6 +74,7 @@ func (s *CustomerServ) GetCustUserByOpenID(openid string) (*customer.CustWithWX,
 			return nil, err
 		}
 		cust.BelongCaseId = caseinfo.CaseId
+		cust.BelongCaseStatus = caseinfo.Status
 	}
 
 	return cust, nil

service/statistics/goods.go

@@ -92,6 +92,12 @@ func (s *StatisticsServ) GetGoodsOrdersStatisticsExcel(status, usertype, caseids
 		utils.LogError("获取商品订单统计数据失败: " + err.Error())
 		return nil, errors.New("获取商品订单统计数据失败")
 	}
-
+	for inx, item := range all {
+		details, err := s.dao.GetGoodsOrderDetailByOrderId(item.OrdersId)
+		if err != nil {
+			return nil, err
+		}
+		all[inx].Details = details
+	}
 	return all, nil
 }