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

up

Browse Source
This commit is contained in:
gazebo
2019-12-02 14:23:14 +08:00
parent dc881a2acc
commit 351551bfe1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,15 +923,22 @@ func GetMyOrderCountInfo(db *DaoDB, userID string, fromDate, toDate time.Time, s
if utils.IsTimeZero(fromDate) { if utils.IsTimeZero(fromDate) {
return nil, fmt.Errorf("必须指定开始日期") return nil, fmt.Errorf("必须指定开始日期")
} }
if !utils.IsTimeZero(fromDate) {
fromDate = utils.Time2Date(fromDate)
if utils.IsTimeZero(toDate) { if utils.IsTimeZero(toDate) {
toDate = fromDate toDate = fromDate
} }
}
if !utils.IsTimeZero(toDate) {
toDate = utils.Time2Date(toDate)
toDate = toDate.Add(24 * time.Hour)
}
sql := ` sql := `
SELECT t1.lock_status, t1.status, COUNT(*) count SELECT t1.lock_status, t1.status, COUNT(*) count
FROM goods_order t1 FROM goods_order t1
WHERE t1.user_id = ? AND t1.vendor_id = ? WHERE t1.user_id = ? AND t1.vendor_id = ?
AND t1.order_created_at >= ? AND t1.order_created_at <= ? AND t1.order_created_at >= ? AND t1.order_created_at < ?
` `
sqlParams := []interface{}{ sqlParams := []interface{}{
userID, userID,

4
business/partner/purchase/mtwm/order_afs.go
View File

@@ -42,9 +42,9 @@ func (c *PurchaseHandler) isAfsMsg(msg *mtwmapi.CallbackMsg) bool {
if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund { if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
// refundData := msg.Data.(*mtwmapi.CallbackRefundInfo) // refundData := msg.Data.(*mtwmapi.CallbackRefundInfo)
orderID := utils.Str2Int64(GetOrderIDFromMsg(msg)) orderID := utils.Str2Int64(GetOrderIDFromMsg(msg))
orderInfo, err := api.MtwmAPI.OrderGetOrderDetail2(orderID, false) status, err := api.MtwmAPI.OrderViewStatus(orderID)
if err == nil { if err == nil {
return orderInfo.Status == int(utils.Str2Int64(mtwmapi.OrderStatusFinished)) return utils.Int2Str(status) == mtwmapi.OrderStatusFinished
} }
globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err) globals.SugarLogger.Warnf("mtwm isAfsMsg OrderGetOrderDetail2 orderID:%d failed with error:%v", orderID, err)
} }