From 53bd1ecb43793d981eb7409b5acb916bcf37413e Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Dec 2019 11:33:17 +0800 Subject: [PATCH] fk --- business/jxcallback/scheduler/defsch/defsch.go | 6 +++--- business/jxutils/weixinmsg/weixinmsg.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 4f1c53477..85e109f5d 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1273,7 +1273,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder) func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) { if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { - order = setFakeActualPayPrice(order) + // order = setFakeActualPayPrice(order) netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) weixinmsg.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) { utils.CallFuncAsync(func() { - order = setFakeActualPayPrice(order) + // order = setFakeActualPayPrice(order) weixinmsg.NotifyUserApplyCancel(order, cancelReason) }) } @@ -1291,7 +1291,7 @@ func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReas func (s *DefScheduler) notifyOrderCanceled(order *model.GoodsOrder) { if order.Flag&model.OrderFlagMaskFake == 0 { utils.CallFuncAsync(func() { - order = setFakeActualPayPrice(order) + // order = setFakeActualPayPrice(order) weixinmsg.NotifyOrderCanceled(order) smsmsg.NotifyOrderCanceled(order) }) diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index ab9c99af2..0e6299c4e 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -197,7 +197,7 @@ func getOrderDetailBrief(order *model.GoodsOrder) (brief string) { sb.WriteString(utils.Int2Str(order.Skus[0].Count)) sb.WriteString("份（") sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice)) - sb.WriteString("元/份）等，预计收入") + sb.WriteString("元/份）等，总计") sb.WriteString(jxutils.IntPrice2StandardString(order.ActualPayPrice)) sb.WriteString("元") return sb.String()