Merge remote-tracking branch 'origin/jdshop' into jxact

business/model/dao/dao_order.go

@@ -787,7 +787,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	}
 	sql += `
 	FROM goods_order t1
-	LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id
+	LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id AND t1.vendor_order_id = t2.vendor_order_id
 	LEFT JOIN store t5 ON t5.id = IF(t1.jx_store_id <> 0, t1.jx_store_id, t1.store_id)
 	LEFT JOIN place city ON city.code = t5.city_code
 	LEFT JOIN place district ON district.code = t5.district_code`

business/model/dao/sku.go

@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"fmt"
 	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
@@ -231,8 +230,6 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 		sqlParams = append(sqlParams, parentCatID)
 	}
 	sql += " ORDER BY t1.seq"
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	err = GetRows(db, &catList, sql, sqlParams...)
 	return catList, err
 }

business/model/dao/store.go

@@ -813,3 +813,103 @@ func DeleteStoreCategroies(db *DaoDB, userName string, storeID int) (err error)
 	_, err = ExecuteSQL(db, sql, sqlParams)
 	return err
 }
+
+func GetStorePushClient(db *DaoDB, storeID int, cID string) (storePushClient []*model.StorePushClient, err error) {
+	sql := `
+		SELECT * 
+		FROM store_push_client
+		WHERE deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if storeID > 0 {
+		sql += " AND store_id = ?"
+		sqlParams = append(sqlParams, storeID)
+	}
+	if cID != "" {
+		sql += " AND client_id = ?"
+		sqlParams = append(sqlParams, cID)
+	}
+	err = GetRows(db, &storePushClient, sql, sqlParams)
+	if err != nil {
+		return nil, err
+	}
+	return storePushClient, err
+}
+
+func GetStoreAudit(db *DaoDB, auditStatuss []int, userID, keyword string) (storeAudit []*model.StoreAudit, err error) {
+	sql := `
+		SELECT * 
+		FROM store_audit
+		WHERE deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if len(auditStatuss) > 0 {
+		sql += " AND audit_status IN (" + GenQuestionMarks(len(auditStatuss)) + ")"
+		sqlParams = append(sqlParams, auditStatuss)
+	}
+	if userID != "" {
+		sql += " AND user_id = ?"
+		sqlParams = append(sqlParams, userID)
+	}
+	if keyword != "" {
+		sql += " AND (user_id LIKE ? OR name LIKE ? OR tel1 LIKE ? OR tel2 LIKE ? OR address LIKE ?)"
+		sqlParams = append(sqlParams, "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%")
+	}
+	err = GetRows(db, &storeAudit, sql, sqlParams)
+	if err != nil {
+		return nil, err
+	}
+	return storeAudit, err
+}
+
+type tStoreAudit struct {
+	model.StoreAudit
+	UserName string `json:"userName"`
+	CityName string `json:"cityName"`
+}
+
+func GetStoreAuditPage(db *DaoDB, statuss []int, keyword string, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
+	var requestList []*tStoreAudit
+	sql := `
+		SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, b.name user_name, c.name city_name
+		FROM store_audit a 
+		JOIN user b ON b.user_id = a.user_id 
+		JOIN place c ON c.code = a.city_code 
+		WHERE a.deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if len(statuss) > 0 {
+		sql += " AND a.audit_status IN (" + GenQuestionMarks(len(statuss)) + ")"
+		sqlParams = append(sqlParams, statuss)
+	}
+	if applyTimeStart != utils.ZeroTimeValue && applyTimeEnd != utils.ZeroTimeValue {
+		sql += " AND a.created_at BETWEEN ? AND ?"
+		sqlParams = append(sqlParams, applyTimeStart, applyTimeEnd)
+	}
+	if auditTimeStart != utils.ZeroTimeValue && auditTimeEnd != utils.ZeroTimeValue {
+		sql += " AND a.updated_at BETWEEN ? AND ?"
+		sqlParams = append(sqlParams, auditTimeStart, auditTimeEnd)
+	}
+	if keyword != "" {
+		sql += " AND (a.user_id LIKE ? OR a.name LIKE ? OR a.tel1 LIKE ? OR a.tel2 LIKE ? OR a.address LIKE ?)"
+		sqlParams = append(sqlParams, "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%")
+	}
+	sql += " ORDER BY a.updated_at LIMIT ? OFFSET ?"
+	pageSize = jxutils.FormalizePageSize(pageSize)
+	sqlParams = append(sqlParams, pageSize, offset)
+	Begin(db)
+	defer Commit(db)
+	if err = GetRows(db, &requestList, sql, sqlParams...); err == nil {
+		return &model.PagedInfo{
+			TotalCount: GetLastTotalRowCount(db),
+			Data:       requestList,
+		}, nil
+	}
+	return pagedInfo, err
+}