From db37338060ed5e4993df4f12f084efd418de58b0 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Dec 2019 11:23:40 +0800 Subject: [PATCH 1/4] up --- business/jxutils/weixinmsg/weixinmsg.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index c23d6ec36..ab9c99af2 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() From 015e098a6c0cc469c447c27320eda48ad336bfb4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Dec 2019 11:28:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8E=BB=E6=8E=89ActualPayPrice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/printer/feie/feie.go | 8 ++++---- business/partner/printer/xiaowm/xiaowm.go | 14 +++++++------- business/partner/printer/yilianyun/yilianyun.go | 8 ++++---- business/partner/printer/zhongwu/zhongwu.go | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index af0bc73b5..6333de9ad 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -57,11 +57,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin %s

-实际支付:%s

商品明细:
品名 数量 单价 小计
--------------------------------
` + // 实际支付:%s
orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -74,7 +74,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { @@ -131,11 +131,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st %s

-实际支付:%s
商品明细:
品名数量单价小计
 --------------------------------
` + // 实际支付:%s
 orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -148,7 +148,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index 179c3828f..350ba923e 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -59,11 +59,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin * 客户备注: * %s* -实际支付: %s* 商品明细: * 品名 数量 单价 小计 --------------------------------* ` + // 实际支付: %s* orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -76,7 +76,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin order.ConsigneeMobile, order.ConsigneeAddress, buyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { orderFmt += `%s*` @@ -128,17 +128,17 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st %s\#%d* %s* ` + getCode + -`客户: %s* + `客户: %s* 电话: %s* 地址: %s* * 客户备注: * %s* -实际支付: %s* 商品明细: * 品名数量单价小计* --------------------------------* ` + // 实际支付: %s* orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -151,7 +151,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st order.ConsigneeMobile, order.ConsigneeAddress, buyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { orderFmt += `%s*` @@ -209,12 +209,12 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri |5客户备注: |7%s |5 -|6实际支付: %s |5 |5商品明细: |5品名 数量 单价 小计 |5-------------------------------- ` + // |6实际支付: %s orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -227,7 +227,7 @@ func (c *PrinterHandler) getOrderContent2(order *model.GoodsOrder, storeTel stri order.ConsigneeMobile, order.ConsigneeAddress, buyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { orderFmt += `|5%s` diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 2f4009abd..1bb0a12f6 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -55,11 +55,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin 客户备注: \n %s\n \n -实际支付:%s\n \n 商品明细: \n 品名 数量 单价 小计\n --------------------------------\n` + // 实际支付:%s\n orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -72,7 +72,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { @@ -123,11 +123,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st 客户备注: \n %s\n \n -实际支付:%s\n \n 商品明细: \n 品名数量单价小计\n --------------------------------\n` + // 实际支付:%s\n orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -140,7 +140,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index c434f0739..9db201d8e 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -56,11 +56,11 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin 客户备注: %s -实际支付:%s 商品明细: 品名 数量 单价 小计 ********************************` + // 实际支付:%s orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -73,7 +73,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { @@ -124,11 +124,11 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st 客户备注: %s -实际支付:%s 商品明细: 品名数量单价小计 ********************************` + // 实际支付:%s orderParams := []interface{}{ globals.StoreName, utils.Time2Str(order.OrderCreatedAt), @@ -141,7 +141,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st order.ConsigneeMobile, order.ConsigneeAddress, order.BuyerComment, - jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), + // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } for _, sku := range order.Skus { From 53bd1ecb43793d981eb7409b5acb916bcf37413e Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Dec 2019 11:33:17 +0800 Subject: [PATCH 3/4] 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() From 41f0d1fa3ddf430f2765594c986631ec8f3d4473 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 20 Dec 2019 11:44:09 +0800 Subject: [PATCH 4/4] up --- 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 85e109f5d..4f1c53477 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 0e6299c4e..ab9c99af2 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()