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-07 14:50:20 +08:00
parent c844176703
commit 4024f62a6c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/order.go
View File

@@ -217,6 +217,7 @@ func NewUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrderSt
dao.Rollback(db, txDB)
return err
}
dao.WrapAddIDCULEntity(orderStatus, jxcontext.AdminCtx.GetUserName())
if err = dao.CreateEntityTx(txDB, orderStatus); err != nil {
dao.Rollback(db, txDB)
return err
@@ -233,7 +234,7 @@ func ChangeUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrde
var (
db = dao.GetDB()
)
globals.SugarLogger.Debugf("ChangeUnionOrder, unionorder:", utils.Format4Output(unionOrder, true))
globals.SugarLogger.Debugf("ChangeUnionOrder1, unionorder: %v", utils.Format4Output(unionOrder, true))
txDB, _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil {
@@ -242,10 +243,12 @@ func ChangeUnionOrder(unionOrder *model.UnionOrder, orderStatus *model.UnionOrde
}
}()
unionOrder.Status = orderStatus.Status
globals.SugarLogger.Debugf("ChangeUnionOrder2, unionorder: %v", utils.Format4Output(unionOrder, true))
if _, err = dao.UpdateEntityTx(txDB, unionOrder, "Status"); err != nil {
dao.Rollback(db, txDB)
return err
}
dao.WrapAddIDCULEntity(orderStatus, jxcontext.AdminCtx.GetUserName())
if err = dao.CreateEntityTx(txDB, orderStatus); err != nil {
dao.Rollback(db, txDB)
return err

1
business/jxstore/partner/pdd/union.go
View File

@@ -238,6 +238,7 @@ func GetUnionOrders() {
orderStatus.Comment = "售后中"
} else if detail.ReturnStatus == 2 {
orderStatus.Comment = "售后完成"
orderStatus.Status = model.UnionOrderStatusFail
}
//change
jxutils.CallMsgHandler(func() {