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

fk

Browse Source
This commit is contained in:
gazebo
2019-12-20 11:33:17 +08:00
parent 015e098a6c
commit 53bd1ecb43
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1273,7 +1273,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder)
func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) { func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
if order.Flag&model.OrderFlagMaskFake == 0 { if order.Flag&model.OrderFlagMaskFake == 0 {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
order = setFakeActualPayPrice(order) // order = setFakeActualPayPrice(order)
netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
weixinmsg.NotifyNewOrder(order) weixinmsg.NotifyNewOrder(order)
smsmsg.NotifyNewOrder(order) smsmsg.NotifyNewOrder(order)
@@ -1283,7 +1283,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) { func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
order = setFakeActualPayPrice(order) // order = setFakeActualPayPrice(order)
weixinmsg.NotifyUserApplyCancel(order, cancelReason) weixinmsg.NotifyUserApplyCancel(order, cancelReason)
}) })
} }
@@ -1291,7 +1291,7 @@ func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReas
func (s *DefScheduler) notifyOrderCanceled(order *model.GoodsOrder) { func (s *DefScheduler) notifyOrderCanceled(order *model.GoodsOrder) {
if order.Flag&model.OrderFlagMaskFake == 0 { if order.Flag&model.OrderFlagMaskFake == 0 {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
order = setFakeActualPayPrice(order) // order = setFakeActualPayPrice(order)
weixinmsg.NotifyOrderCanceled(order) weixinmsg.NotifyOrderCanceled(order)
smsmsg.NotifyOrderCanceled(order) smsmsg.NotifyOrderCanceled(order)
}) })

2
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -197,7 +197,7 @@ func getOrderDetailBrief(order *model.GoodsOrder) (brief string) {
sb.WriteString(utils.Int2Str(order.Skus[0].Count)) sb.WriteString(utils.Int2Str(order.Skus[0].Count))
sb.WriteString("份（") sb.WriteString("份（")
sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice)) sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice))
sb.WriteString("元/份）等，预计收入") sb.WriteString("元/份）等，总计")
sb.WriteString(jxutils.IntPrice2StandardString(order.ActualPayPrice)) sb.WriteString(jxutils.IntPrice2StandardString(order.ActualPayPrice))
sb.WriteString("元") sb.WriteString("元")
return sb.String() return sb.String()