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:
邹宗楠
2024-01-19 09:39:50 +08:00
parent 3c7928b152
commit d4fccba75e
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/orderman/order.go
View File

@@ -259,6 +259,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
order.OrderFinishedAt = time.Now() order.OrderFinishedAt = time.Now()
dao.UpdateEntity(db, order, "OrderFinishedAt") dao.UpdateEntity(db, order, "OrderFinishedAt")
} else if orderStatus.Status == model.OrderStatusCanceled { } else if orderStatus.Status == model.OrderStatusCanceled {
globals.SugarLogger.Debugf("==============orderStatus := %s", utils.Format4Output(orderStatus, false))
order2, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单 order2, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID) // 订单被取消,则取消三方运单
if orderStatus.OrderType == model.OrderTypeOrder { if orderStatus.OrderType == model.OrderTypeOrder {
waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS}) waybill, _ := dao.GetWaybills(db, order2.VendorOrderID, []int64{model.VendorIDMTPS, model.VendorIDDada, model.VendorIDFengNiao, model.VendorIDUUPT, model.VendorIDSFPS})
@@ -278,7 +279,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
if err2 == nil { if err2 == nil {
// 判断是否需要打印取消订单 // 判断是否需要打印取消订单
storeDetail, err := c.LoadStoreDetail(order2.StoreID, order2.VendorID) storeDetail, err := c.LoadStoreDetail(order2.StoreID, order2.VendorID)
globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output(storeDetail, false))
if err == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请 if err == nil && storeDetail.IsPrintCancelOrder == model.YES { // 取消申请
globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("222222222222222", false))
_, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID) _, err = netprinter.PrintRefundOrCancelOrder(jxcontext.AdminCtx, model.YES, order2, order2.StoreID)
} }
if err != nil { if err != nil {

2
business/model/legacymodel/jxbadcomments.go
View File

@@ -14,7 +14,7 @@ type JxBadComments struct {
Createtime string `json:"createTime" orm:"column(createtime);size(255);null;index" description:"评论的创建时间"` Createtime string `json:"createTime" orm:"column(createtime);size(255);null;index" description:"评论的创建时间"`
Score int `json:"score4" orm:"column(score)" description:"评论的星级"` Score int `json:"score4" orm:"column(score)" description:"评论的星级"`
Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(512);null" description:"评论的内容"` Scorecontent string `json:"score4Content" orm:"column(scorecontent);size(1024);null" description:"评论的内容"`
Vendertags string `json:"venderTags" orm:"column(vendertags);size(255);null" description:"评论的标签"` Vendertags string `json:"venderTags" orm:"column(vendertags);size(255);null" description:"评论的标签"`
Msg string `json:"-" orm:"column(msg);type(text)" description:"未解决差评的原始信息"` Msg string `json:"-" orm:"column(msg);type(text)" description:"未解决差评的原始信息"`

1
business/partner/printer/trendit/trendit.go
View File

@@ -131,6 +131,7 @@ func (p PrinterHandler) PrintStore(ctx *jxcontext.Context, store *model.Store, s
} }
func (p PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) { func (p PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printType int, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder) (printerStatus *partner.PrinterStatus, err error) {
globals.SugarLogger.Debugf("==============storeDetail := %s", utils.Format4Output("=====================kkk", false))
if len(order.Skus) == 0 { if len(order.Skus) == 0 {
return return
} }