diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go index 1bab6363c..c3aea01ba 100644 --- a/business/jxutils/weixinmsg/weixinmsg.go +++ b/business/jxutils/weixinmsg/weixinmsg.go @@ -138,16 +138,10 @@ func SendMsgToStore(storeID int, templateID, downloadURL, miniPageURL string, da openIDs := GetWeixinOpenIDsFromStoreID(storeID) successCount := 0 for _, openID := range openIDs { - if storeID == 668202 { - globals.SugarLogger.Debugf("--------:openId := %s", openID) - } realMiniPageURL := miniPageURL if err2 := SmartMessageTemplateSend(openID, templateID, downloadURL, realMiniPageURL, data); err2 == nil { successCount++ } else { - if storeID == 668202 { - globals.SugarLogger.Debugf("-----------SendMsgToStore:err := %v", err2) - } err = err2 } } diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go index f23ed0437..ce49d2003 100644 --- a/business/partner/printer/feie/feie.go +++ b/business/partner/printer/feie/feie.go @@ -99,7 +99,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin for _, sku := range order.Skus { orderFmt += `%s
` orderFmt += `%8s%10s%10s
` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s
` @@ -186,7 +186,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st for _, sku := range order.Skus { orderFmt += `%s
` orderFmt += `%s %s %s

` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s
` diff --git a/business/partner/printer/jxprint/jxprint_const.go b/business/partner/printer/jxprint/jxprint_const.go index 4842a5d31..2810cac7c 100644 --- a/business/partner/printer/jxprint/jxprint_const.go +++ b/business/partner/printer/jxprint/jxprint_const.go @@ -102,8 +102,8 @@ func ManagerOrderPrint(order *model.GoodsOrder, storeTel string, storeDetail *da skuList = append(skuList, &SkuListPrintOrder{ SkuName: sku.SkuName, SkuCount: "X" + utils.Int2Str(sku.Count), - SalePrice: jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), - TotalCountPrice: jxutils.IntPrice2StandardCurrencyString(sku.SalePrice * int64(sku.Count)), + SalePrice: jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), + TotalCountPrice: jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice * int64(sku.Count)), Upc: sku.Upc, }) } diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go index 2d67ebf6f..a3f6d02d4 100644 --- a/business/partner/printer/trendit/trendit.go +++ b/business/partner/printer/trendit/trendit.go @@ -361,7 +361,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin ) for _, sku := range order.Skus { - orderFmt += trenditapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.SalePrice)) + orderFmt += trenditapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice)) } orderFmt += ` 共%d种%d件商品 @@ -430,7 +430,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for k, sku := range order.Skus { - orderFmt += trenditapi.FormatPrintOrderItemBig(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.SalePrice)) + orderFmt += trenditapi.FormatPrintOrderItemBig(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice)) if k != len(order.Skus) { orderFmt += `
` } diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index 824cd34c3..913c3a5cd 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -83,7 +83,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin for _, sku := range order.Skus { orderFmt += `%s*` orderFmt += `%8s%10s%10s*` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) } orderFmt += ` * @@ -156,7 +156,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st for _, sku := range order.Skus { orderFmt += `%s*` orderFmt += `%s %s %s*` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) } orderFmt += ` 共%d种%d件商品* diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index 1a27bd09a..56be13d93 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -353,7 +353,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin ) for _, sku := range order.Skus { - orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.SalePrice)) + orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice)) } orderFmt += ` 共%d种%d件商品 @@ -422,7 +422,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for _, sku := range order.Skus { - orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.SalePrice)) + orderFmt += xpyunapi.FormatPrintOrderItem(sku.SkuName, sku.Count, utils.Int64ToFloat64(sku.VendorPrice)) } orderFmt += `共%d种%d件商品 实际支付: %s diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 7906020f0..576dce97b 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -95,7 +95,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin //orderFmt += `%8s%10s%10s\n` orderFmt += `%20s%8s\n` //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s\n` @@ -176,7 +176,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st //orderFmt += `%s %s %s\n\n` orderFmt += `%15s%8s\n` //orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count))) + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) //标品需要打印条形码 if sku.Upc != "" { orderFmt += `upc码: %s\n`