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

- fix bug in updateBillsInfo

Browse Source
This commit is contained in:
gazebo
2019-02-19 12:10:53 +08:00
parent eebf5f863d
commit c18a522132
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -795,7 +795,7 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
func (s *DefScheduler) updateBillsInfo(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) {
if savedOrderInfo != nil {
if savedBill := savedOrderInfo.waybills[savedOrderInfo.order.WaybillVendorID]; savedBill != nil {
if savedBill := savedOrderInfo.waybills[bill.WaybillVendorID]; savedBill != nil {
if savedBill.Status > bill.Status {
bill.Status = savedBill.Status
} else if bill.Status > savedBill.Status {

2
business/partner/purchase/jd/order_legacy_comment.go
View File

@@ -91,8 +91,8 @@ func (c *PurchaseHandler) onOrderComment(msg *jdapi.CallbackOrderMsg) (err error
}
}
if score <= JX_BAD_COMMENTS_MAX_LEVEL || !isNewComment { // 如果是直接非差评，忽略
comment.Createtime = utils.Timestamp2Str(utils.MustInterface2Int64(result["createTime"].(map[string]interface{})["time"]) / 1000)
if isNewComment || score <= JX_BAD_COMMENTS_MAX_LEVEL {
comment.Createtime = utils.Timestamp2Str(utils.MustInterface2Int64(result["createTime"].(map[string]interface{})["time"]) / 1000)
comment.Msg = string(utils.MustMarshal(result))
comment.Score = score
comment.Scorecontent = utils.Interface2String(result["score4Content"])