Merge branch '2.0.1' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.0.1

models/cases/record.go

@@ -26,7 +26,7 @@ const (
 // GetCaseRecord 获取案场月记录
 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)
+	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 {
@@ -34,7 +34,7 @@ func (m *CaseDAO) GetCaseRecord(caseids string, page, pageSize int) ([]CaseRecor
 	}
 	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 in ('"+goods.USERTPE_SALES+"','"+goods.USERTYPE_MANAGER+"')").And("date_format(create_date,'%Y-%m')=?", record.Month).And("make_status !=?", "cancel").Sums(orders, "orders_num")
+		total, err := m.db.Where("case_id=?", record.CaseId).And("status=?", models.STATUS_NORMAL).And("user_type in ('"+goods.USERTPE_SALES+"','"+goods.USERTYPE_MANAGER+"')").And("date_format(create_date,'%Y-%m')=?", record.Month).And("make_status !=?", "cancel").And("pay_type = ?", models.CONSUME_INNER).Sums(orders, "orders_num")
 		if err != nil {
 			return nil, err
 		}

models/goods/orders.go

@@ -243,7 +243,7 @@ func (m *GoodsDAO) GetOrdersByRecord(recordid string) ([]OrdersWithGoods, error)
 	sql := `select a.*, c.case_name 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
 	inner join sys_case c on a.case_id=c.case_id
 	where b.record_id='` + recordid +
-		`' and a.user_type != '` + USERTYPE_CUSTOMER + `' and b.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` order by a.create_date desc`
+		`' and a.user_type != '` + USERTYPE_CUSTOMER + `' and b.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + `and a.pay_type = '` + models.CONSUME_INNER + `' order by a.create_date desc`
 	err := m.db.Sql(sql).Find(&orderList)
 	if err != nil {
 		return nil, err