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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-07-18 10:50:17 +08:00
parent e3ae0daa76 d32e9dd2db
commit 25770265f5
8 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
if err == nil || dao.IsNoRowsError(err) {
isNewComment := false
if dao.IsNoRowsError(err) {
globals.SugarLogger.Debugf("========dao.IsNoRowsError= :%s", utils.Format4Output(orderComment, false))
err = nil
isNewComment = true
if orderComment.IsReplied == 0 && time.Now().Sub(orderComment.CommentCreatedAt) < time.Duration(orderComment.ModifyDuration)*time.Hour {
@@ -157,6 +158,9 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
}
}
}
globals.SugarLogger.Debugf("========comment2= :%s", utils.Format4Output(comment2, false))
globals.SugarLogger.Debugf("========isNewComment= :%s", utils.Format4Output(isNewComment, false))
if err == nil {
if isNewComment {
err = dao.CreateEntity(db, comment2)

16
business/model/dao/act.go
View File

@@ -707,10 +707,13 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
var (
acts []*model.ActMtwmVendor
)
pageInfo := &model.PagedInfo{}
sql := `
SELECT SQL_CALC_FOUND_ROWS b.name store_name ,a.*
FROM act_mtwm_vendor a
LEFT JOIN store b ON a.store_id = b.id
WHERE 1 = 1
`
sqlParams := []interface{}{}
if len(storeIDs) > 0 {
@@ -726,11 +729,11 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
sqlParams = append(sqlParams, keyword, keyword, "%"+keyword+"%", "%"+keyword+"%")
}
if !utils.IsTimeZero(beginAt) {
sql += " AND a.begin_at <= ?"
sql += " AND a.begin_at >= ?"
sqlParams = append(sqlParams, beginAt)
}
if !utils.IsTimeZero(endAt) {
sql += " AND a.end_at >= ?"
sql += " AND a.end_at <= ?"
sqlParams = append(sqlParams, endAt)
}
if actType != 0 {
@@ -749,12 +752,13 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
panic(r)
}
}()
if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil {
page.TotalCount = GetLastTotalRowCount2(db, txDB)
page.Data = acts
if err = GetRowsTx(txDB, &acts, sql, sqlParams...); err == nil && len(acts) != 0 {
pageInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
pageInfo.Data = acts
}
Commit(db, txDB)
return page, err
return pageInfo, err
}
// GetDontHaveSku 获取不存在此商品活动的门店

1
business/partner/delivery/mtps/waybill.go
View File

@@ -104,7 +104,6 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
}
}
globals.SugarLogger.Debugf("===========msg := %s", utils.Format4Output(msg, false))
store, _ := dao.GetStoreDetail(dao.GetDB(), goodsOrder.JxStoreID, goodsOrder.VendorID, goodsOrder.VendorOrgCode)
switch msg.Status {
case mtpsapi.OrderStatusWaitingForSchedule:

9
business/partner/purchase/mtwm/order_comment.go
View File

@@ -29,6 +29,7 @@ func (c *PurchaseHandler) StartRefreshComment() {
}
func (c *PurchaseHandler) refreshCommentOnce() {
globals.SugarLogger.Debugf("refreshCommentOnce = %s", utils.Format4Output(time.Now(), false))
c.RefreshComment(time.Now().Add(-RefreshCommentTime), time.Now())
utils.AfterFuncWithRecover(RefreshCommentTimeInterval, func() {
c.refreshCommentOnce()
@@ -54,10 +55,10 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error)
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeID := batchItemList[0].(int)
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDMTWM, "")
commentList, err2 := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied)
commentList, _ := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).CommentQuery(storeDetail.VendorStoreID, startDateStr, endDateStr, 0, 0, mtwmapi.CommentReplyStatusNotReplied)
var orderCommentList []*model.OrderComment
if err = err2; err != nil {
return nil, err
if len(commentList) == model.NO || commentList == nil {
return nil, nil
}
for _, mtwmComment := range commentList {
createdTime, err := utils.TryStr2Time(mtwmComment.CommentTime)
@@ -90,6 +91,8 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error)
}, storeIDs)
task.Run()
resultList, err2 := task.GetResult(0)
globals.SugarLogger.Debugf("resultList := %s", utils.Format4Output(resultList, false))
globals.SugarLogger.Debugf("err2 := %s", utils.Format4Output(err2, false))
if err = err2; err != nil {
return err
}

1
business/partner/purchase/tao_vegetable/store_sku2.go
View File

@@ -674,7 +674,6 @@ func updateStoreSkusStockByCreate(ctx *jxcontext.Context, api *tao_vegetable.API
globals.SugarLogger.Debugf("Updat stock err := %s", err.Error())
//failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "更新库存错误")...)
}
globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", failedList)
return failedList
}