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

aa

Browse Source
This commit is contained in:
suyl
2021-05-31 09:57:12 +08:00
parent 16aab5156c
commit 28040a7b8b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -747,10 +747,10 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
return err return err
} }
func (s *DefScheduler) sendCourierOrderSMS(bill *model.Waybill) (err error) { //func (s *DefScheduler) sendCourierOrderSMS(bill *model.Waybill) (err error) {
err = smsmsg.NotifyNewCourierOrder(bill) // err = smsmsg.NotifyNewCourierOrder(bill)
return err // return err
} //}
func (s *DefScheduler) isWaybillCourierSame(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { func (s *DefScheduler) isWaybillCourierSame(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool {
return savedOrderInfo.waybills[bill.WaybillVendorID] != nil && savedOrderInfo.waybills[bill.WaybillVendorID].CourierMobile == bill.CourierMobile return savedOrderInfo.waybills[bill.WaybillVendorID] != nil && savedOrderInfo.waybills[bill.WaybillVendorID].CourierMobile == bill.CourierMobile
@@ -1589,7 +1589,7 @@ func (s *DefScheduler) notifyOrderCanceled(order *model.GoodsOrder) {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
// order = setFakeActualPayPrice(order) // order = setFakeActualPayPrice(order)
weixinmsg.NotifyOrderCanceled(order) weixinmsg.NotifyOrderCanceled(order)
smsmsg.NotifyOrderCanceled(order) //smsmsg.NotifyOrderCanceled(order)
push.NotifyOrderCanceled(order) push.NotifyOrderCanceled(order)
}) })
} }

2
business/jxstore/cms/store.go
View File

@@ -4717,6 +4717,8 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
panic(r) panic(r)
} }
}() }()
fmt.Println(sql)
fmt.Println(sqlParams)
if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount2(db, txDB), TotalCount: dao.GetLastTotalRowCount2(db, txDB),