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

1

Browse Source
This commit is contained in:
邹宗楠
2025-08-22 12:45:33 +08:00
parent 4b234723f9
commit 125dc3a77d
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,6 +327,7 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
var idList []int
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -339,7 +340,6 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, syncStatus int, keywo
return pagedInfo, err
}
pagedInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
Commit(db, txDB)
sql = `
SELECT
@@ -784,6 +784,7 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
`
sqlParams = append(sqlParams, pageSize, (offset-1)*pageSize)
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -795,7 +796,6 @@ func GetActMtwmVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
pageInfo.TotalCount = GetLastTotalRowCount2(db, txDB)
pageInfo.Data = acts
}
Commit(db, txDB)
return pageInfo, err
}
@@ -848,6 +848,7 @@ func GetActMtwmVendorSkuPage(db *DaoDB, storeID int, keyword string, actType, of
`
sqlParams = append(sqlParams, (offset-1)*pageSize, pageSize)
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -858,7 +859,6 @@ func GetActMtwmVendorSkuPage(db *DaoDB, storeID int, keyword string, actType, of
page.TotalCount = GetLastTotalRowCount2(db, txDB)
page.Data = acts
}
Commit(db, txDB)
return page, err
}
@@ -903,6 +903,7 @@ func GetActEbaiVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
`
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -913,7 +914,6 @@ func GetActEbaiVendorPage(db *DaoDB, storeIDs, skuIDs []int, keyword string, beg
page.TotalCount = GetLastTotalRowCount2(db, txDB)
page.Data = acts
}
Commit(db, txDB)
return page, err
}
@@ -936,6 +936,7 @@ func GetActEbaiVendorSkuPage(db *DaoDB, actID, keyword string, offset, pageSize
`
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -946,6 +947,5 @@ func GetActEbaiVendorSkuPage(db *DaoDB, actID, keyword string, offset, pageSize
page.TotalCount = GetLastTotalRowCount2(db, txDB)
page.Data = acts
}
Commit(db, txDB)
return page, err
}

5
business/model/dao/lakala.go
View File

@@ -127,6 +127,7 @@ func GetEwalletWithDraw(db *DaoDB, mercId, drawJnl string) (*model.LakalaWithdra
func GetIncoming(storeID int, merchantNo string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
db := GetDB()
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -167,6 +168,7 @@ func GetIncoming(storeID int, merchantNo string, offset, pageSize int) (pagedInf
func GetRecipientList(orgCode, receiverNo, receiverName string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
db := GetDB()
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -230,6 +232,7 @@ func GetSeparateAmtByOrderID(vendorOrderID string, cmdType string, logNo string)
func GetSeparateAmt(merchantNo, cmdType, status, separateNo, vendorOrderID string, storeId int, separateTimeStart, separateTimeEnd time.Time, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
db := GetDB()
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -293,6 +296,7 @@ func GetSeparateAmt(merchantNo, cmdType, status, separateNo, vendorOrderID strin
func WithdrawalList(merchantNo, drawJnl, acctName string, startTime, endTime time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
db := GetDB()
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)
@@ -346,6 +350,7 @@ func WithdrawalList(merchantNo, drawJnl, acctName string, startTime, endTime tim
func QueryApplyContractList(orderNo string, storeID, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
db := GetDB()
txDB, _ := Begin(db)
defer Commit(db, txDB)
defer func() {
if r := recover(); r != nil {
Rollback(db, txDB)

1
business/partner/purchase/ebai/order.go
View File

@@ -360,7 +360,6 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
// 包装袋金额+服务费
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDEBAI, order.VendorOrgCode)
if store != nil {
order.StoreName = store.Name // 真实门店名称
order.PackagePrice = store.PackageSetting
}
jxutils.RefreshOrderSkuRelated(order)

1
business/partner/purchase/mtwm/order.go
View File

@@ -322,7 +322,6 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
// 包装袋金额
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDMTWM, order.VendorOrgCode)
if store != nil {
order.StoreName = store.Name // 真实门店名称
order.PackagePrice = store.PackageSetting
}

2
controllers/ebai_callback.go
View File

@@ -36,9 +36,7 @@ func (c *EbaiController) Msg() {
case model.ServerTypeFruits:
callbackResponse = c.EBaiMsgPush2FruitsOrPet(model.ServerTypePet, utils.Struct2Map(obj, "", false))
case model.ServerTypePet:
//ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "47B1E94E8D2411EFB666525400E86DC0", "饿了么菜市推果园,果园退超市未找到门店", fmt.Sprintf("饿了么菜市推果园cmd:%s,storeId:%s", obj.Cmd, vendorStoreId))
callbackResponse = api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), nil, nil) // api.EbaiAPI.Err2CallbackResponse(ebaiapi.GetCmd(c.Ctx.Request), fmt.Errorf("饿了么菜市推果园,果园退超市未找到门店cmd:%s,storeId:%s", obj.Cmd, vendorStoreId), nil)
return
}
c.Data["json"] = callbackResponse
c.ServeJSON()