resultURL

controllers/cases/key.go

@@ -29,11 +29,11 @@ func (c *CaseController) GetKeyList() {
 // AddKeys 新增钥匙
 func (c *CaseController) AddKeys() {
 	caseid := c.GetString("caseid")
-	orgid := c.GetString("orgid")
+	org := c.Context.Get("org").(model.SysOrg)
 	beginnum, _ := c.GetInt("beginnum")
 	endnum, _ := c.GetInt("endnum")
 
-	err := c.dao.AddKeys(orgid, caseid, beginnum, endnum)
+	err := c.dao.AddKeys(org.OrgId, caseid, beginnum, endnum)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/statistics/cardcoupon.go

@@ -293,5 +293,5 @@ func (c *StatisticsController) CardCouponVerifyStatisticsExcel() {
 			verifystatus,
 		})
 	}
-	c.SaveToExcel("卡券核销列表.xlsx", excel)
+	c.SaveToExcel("课程核销列表.xlsx", excel)
 }

models/goods/goods.go

@@ -54,8 +54,7 @@ func (m *GoodsDAO) GetGoodsListPageNavi(name, typeID, caseID string, limit []int
 	sql += `		
 		AND status > ` + strconv.Itoa(models.STATUS_DEL) + `
 		ORDER BY
-			type_id,
-			create_date
+			create_date desc
 	`
 
 	// sql += ` limit ` + strconv.Itoa(limit[0]) + ` OFFSET ` + strconv.Itoa(limit[1])

models/statistics/cardcoupon.go

@@ -5,8 +5,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/astaxie/beego"
 )
 
 // CardCouponStatistics 商品统计信息
@@ -403,7 +401,6 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 	if enddate != "" {
 		sql = sql + ` and DATE_FORMAT(tab.receive_date, '%Y-%m-%d') <= '` + enddate + `'`
 	}
-	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&cardCoupons)
 	return cardCoupons, err
 }

models/statistics/goods.go

@@ -133,19 +133,27 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 						d.case_name,
 						a.user_type,
 						a.create_date,
-						a.status,
+						a. STATUS,
 						a.make_status,
 						a.area_name,
 						a.table_no,
-						c.customer_name,
-						c. NAME,
-						c.phone,
+						b.customer_name,
+						(
+							CASE
+							WHEN c.real_name IS NULL
+							OR c.real_name = '' THEN
+								b. NAME
+							ELSE
+								c.real_name
+							END
+						) AS NAME,
+						b.phone,
 						a.remark
 					FROM
 						ta_goods_orders a
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
-					INNER JOIN ta_customer c ON b.customer_id = c.customer_id
 					INNER JOIN sys_case d ON a.case_id = d.case_id
+					LEFT JOIN sys_user c ON b.user_id = c.user_id
 					where d.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	if usertype != "" {
@@ -192,19 +200,27 @@ func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids,
 						d.case_name,
 						a.user_type,
 						a.create_date,
-						a.status,
+						a. STATUS,
 						a.make_status,
 						a.area_name,
 						a.table_no,
-						c.customer_name,
-						c. NAME,
-						c.phone,
+						b.customer_name,
+						(
+							CASE
+							WHEN c.real_name IS NULL
+							OR c.real_name = '' THEN
+								b. NAME
+							ELSE
+								c.real_name
+							END
+						) AS NAME,
+						b.phone,
 						a.remark
 					FROM
 						ta_goods_orders a
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
-					INNER JOIN ta_customer c ON b.customer_id = c.customer_id
 					INNER JOIN sys_case d ON a.case_id = d.case_id
+					LEFT JOIN sys_user c ON b.user_id = c.user_id
 					where d.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	if usertype != "" {
@@ -219,6 +235,7 @@ func (m *StatisticsDAO) GetGoodsOrderStatisticsCount(status, usertype, caseids,
 	if status != "" {
 		sql = sql + ` and a.make_status='` + status + `'`
 	}
+	sql += ` order by a.create_date desc `
 	err := m.db.Sql(sql).Find(&orders)
 	return orders, err
 }

models/vipcard/vipcard.go

@@ -59,7 +59,7 @@ WHERE
 	if userName != "" {
 		sql = sql + ` and tc.customer_name like '%` + userName + `%'`
 	}
-	sql = sql + " order by vc.create_date, vip_card_child_code desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql = sql + " order by vc.create_date desc limit " + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }
@@ -168,7 +168,6 @@ func (m *VipcardDAO) GenerateChildCode() string {
 	return code
 }
 
-
 // GetVipCardListExcel 获取VIP卡列表 excel
 func (m *VipcardDAO) GetVipCardListExcel(caseids, cardNo, sellerName, userName string) ([]VipChild, error) {
 	var vipcards []VipChild
@@ -200,5 +199,3 @@ WHERE
 	err := m.db.Sql(sql).Find(&vipcards)
 	return vipcards, err
 }
-
-

service/card/card.go

@@ -289,7 +289,7 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
 		GiftId:     card.CardId,
 		GiftName:   card.CardName,
 		FromId:     from.UserId,
-		FromName:   from.UserName,
+		FromName:   from.RealName,
 		ToId:       to.CustomerId,
 		ToName:     to.CustomerName,
 		CreateDate: time.Now().Local(),

service/cases/key.go

@@ -52,6 +52,9 @@ func (s *CaseServ) GetKeysByCase(caseids, num string, page, pageSize int) (map[s
 
 // AddKeys 保存钥匙
 func (s *CaseServ) AddKeys(orgid, caseid string, beginnum, endnum int) error {
+	if caseid == "" {
+		return utils.LogError("请先选择案场！")
+	}
 	if endnum < beginnum {
 		return utils.LogError("锁柜编号起始编号不能大于截止编号！")
 	}

service/coupon/coupon.go

@@ -318,7 +318,7 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 		GiftId:     cp.CouponId,
 		GiftName:   cp.CouponName,
 		FromId:     from.UserId,
-		FromName:   from.UserName,
+		FromName:   from.RealName,
 		ToId:       to.CustomerId,
 		ToName:     to.CustomerName,
 		CreateDate: now,