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

- only send ebai order info

Browse Source
This commit is contained in:
gazebo
2018-11-22 10:28:41 +08:00
parent 3835a47c71
commit 334db9d62b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/orderman/orderman_ext.go
View File

@@ -48,7 +48,7 @@ func (c *OrderManager) GetStoreOrderInfo(ctx *jxcontext.Context, storeID string,
t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at
FROM goods_order t1 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
WHERE t1.vendor_id <> 3 AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) = ? WHERE t1.vendor_id <> 2 AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) = ?
AND t1.order_created_at >= ? AND t1.order_created_at >= ?
AND t1.Status >= ? AND t1.Status <= ? AND t1.Status >= ? AND t1.Status <= ?
ORDER BY t1.status, t1.order_created_at ORDER BY t1.status, t1.order_created_at
@@ -73,7 +73,7 @@ func (c *OrderManager) GetStoreOrderCountInfo(ctx *jxcontext.Context, storeID st
_, err = db.Raw(` _, err = db.Raw(`
SELECT t1.status, COUNT(*) count SELECT t1.status, COUNT(*) count
FROM goods_order t1 FROM goods_order t1
WHERE t1.vendor_id <> 3 AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) = ? WHERE t1.vendor_id <> 2 AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) = ?
AND t1.order_created_at >= ? AND t1.order_created_at >= ?
GROUP BY 1 GROUP BY 1
ORDER BY 1 ORDER BY 1

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

@@ -113,7 +113,7 @@ func SendMsgToStore(storeID int, templateID, downloadURL string, data interface{
func NotifyNewOrder(order *model.GoodsOrder) (err error) { func NotifyNewOrder(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Debugf("NotifyNewOrder orderID:%s", order.VendorOrderID) globals.SugarLogger.Debugf("NotifyNewOrder orderID:%s", order.VendorOrderID)
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDELM {
return nil return nil
} }
@@ -165,7 +165,7 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
func NotifyWaybillStatus(bill *model.Waybill, order *model.GoodsOrder) error { func NotifyWaybillStatus(bill *model.Waybill, order *model.GoodsOrder) error {
globals.SugarLogger.Debugf("NotifyWaybillStatus orderID:%s bill:%v", order.VendorOrderID, bill) globals.SugarLogger.Debugf("NotifyWaybillStatus orderID:%s bill:%v", order.VendorOrderID, bill)
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDELM {
return nil return nil
} }