liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改反馈

Browse Source
This commit is contained in:
Rosy-zhudan
2019-10-10 09:42:41 +08:00
parent de617fbc49
commit 1c5c0bbbcc
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/misc/Store_Alert_Inform.go
View File

@@ -96,8 +96,6 @@ func (s *StoreAlertDataWrapper) SetData(storeID int, valueName string, value int
data.AlertDate = utils.GetCurDate() data.AlertDate = utils.GetCurDate()
s.storeAlertList[storeID] = data s.storeAlertList[storeID] = data
} }
// valueInfo := reflect.ValueOf(data).Elem()
// valueInfo.FieldByName(valueName).SetInt(int64(value))
if s.IsStatusField(valueName) { if s.IsStatusField(valueName) {
srcFieldValue := refutil.GetObjFieldByName(data, valueName).(int) srcFieldValue := refutil.GetObjFieldByName(data, valueName).(int)
value |= srcFieldValue value |= srcFieldValue

4
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -644,8 +644,6 @@ func NotifyStoreStatusChanged(openUserID, title, content string) (err error) {
func NotifyStoreAlertMessage(storeID int, storeName, title, content string) (err error) { func NotifyStoreAlertMessage(storeID int, storeName, title, content string) (err error) {
globals.SugarLogger.Debugf("NotifyStoreAlertMessage storeID:%d, storeName:%d, title:%s, content:%s", storeID, storeName, title, content) globals.SugarLogger.Debugf("NotifyStoreAlertMessage storeID:%d, storeName:%d, title:%s, content:%s", storeID, storeName, title, content)
templateID := WX_STORE_ALERT_TEMPLATE_ID templateID := WX_STORE_ALERT_TEMPLATE_ID
msgID, msgStatusID := -1, -1
fileURL := globals.WxBackstageHost + fmt.Sprintf(WX_TO_SHOW_MSG, msgID, msgStatusID)
data := map[string]interface{}{ data := map[string]interface{}{
"first": map[string]interface{}{ "first": map[string]interface{}{
"value": "", "value": "",
@@ -667,5 +665,5 @@ func NotifyStoreAlertMessage(storeID int, storeName, title, content string) (err
"value": "", "value": "",
}, },
} }
return SendMsgToStore(storeID, templateID, fileURL, fmt.Sprintf(WX_MINI_TO_SHOW_MSG, msgID, msgStatusID), data) return SendMsgToStore(storeID, templateID, "", "", data)
} }

7
business/model/dao/Store_Alert_Inform.go
View File

@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"time" "time"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
) )
@@ -18,10 +19,12 @@ func GetStoreAlertList(db *DaoDB, storeIDList []int, cityCode int, keyWord strin
FROM store_alert t1 FROM store_alert t1
JOIN store t2 ON t1.store_id = t2.id JOIN store t2 ON t1.store_id = t2.id
JOIN place t3 ON t2.city_code = t3.code JOIN place t3 ON t2.city_code = t3.code
WHERE DATE(t1.alert_date) = DATE(?) WHERE t1.alert_date >= ? AND t1.alert_date <= ?
` `
beginTime, endTime := utils.GetTimeRange(dateTime, 1, true)
sqlParams := []interface{}{ sqlParams := []interface{}{
dateTime, beginTime,
endTime,
} }
if len(storeIDList) > 0 { if len(storeIDList) > 0 {
sql += ` sql += `

10
business/model/dao/dao_order.go
View File

@@ -444,8 +444,8 @@ func GetStandardPickTimeOrderCountByDaDa(db *DaoDB, dayNum int, includeToday boo
sql := ` sql := `
SELECT t1.jx_store_id store_id, COUNT(*) count SELECT t1.jx_store_id store_id, COUNT(*) count
FROM goods_order t1 FROM goods_order t1
JOIN order_status t2 ON t2.vendor_order_id = t1.vendor_order_id JOIN order_status t2 ON t1.vendor_order_id = t2.vendor_order_id AND t1.vendor_id = t2.vendor_id
where t1.order_finished_at >= ? AND t1.order_finished_at <= ? WHERE t1.order_finished_at >= ? AND t1.order_finished_at <= ?
AND t1.status = ? AND t1.status = ?
AND t1.waybill_vendor_id = ? AND t1.waybill_vendor_id = ?
AND t2.order_type = ? AND t2.order_type = ?
@@ -471,7 +471,7 @@ func GetStandardFinishTimeOrderCountBySelfDelivery(db *DaoDB, dayNum int, includ
sql := ` sql := `
SELECT jx_store_id store_id, order_created_at, order_finished_at SELECT jx_store_id store_id, order_created_at, order_finished_at
FROM goods_order FROM goods_order
where order_finished_at >= ? AND order_finished_at <= ? WHERE order_finished_at >= ? AND order_finished_at <= ?
AND status = ? AND status = ?
AND waybill_vendor_id = ? AND waybill_vendor_id = ?
` `
@@ -506,8 +506,8 @@ func GetStandardPickUpTimeOrderCountByDaDa(db *DaoDB, dayNum int, includeToday b
sql := ` sql := `
SELECT t1.jx_store_id store_id, t1.vendor_order_id, t2.status_time, t2.status SELECT t1.jx_store_id store_id, t1.vendor_order_id, t2.status_time, t2.status
FROM goods_order t1 FROM goods_order t1
JOIN order_status t2 ON t2.vendor_order_id = t1.vendor_order_id JOIN order_status t2 ON t1.vendor_order_id = t2.vendor_order_id AND t1.vendor_id = t2.vendor_id
where t1.order_finished_at >= ? AND t1.order_finished_at <= ? WHERE t1.order_finished_at >= ? AND t1.order_finished_at <= ?
AND t1.status = ? AND t1.status = ?
AND t1.waybill_vendor_id = ? AND t1.waybill_vendor_id = ?
AND t2.status in (?, ?) AND t2.status in (?, ?)