diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 9144ff648..bc099c570 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1034,6 +1034,9 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID if len(skuList) > 0 { flagVendorOrderID = skuList[0].VendorOrderID } + if storeIDList[0] == 805178 { + globals.SugarLogger.Debugf("-------skuList := %s", utils.Format4Output(skuList, false)) + } for k, v := range skuList { storeDetail, _ := dao.GetStoreDetail(db, v.StoreID, v.VendorID, "") if v.EarningPrice == 0 { diff --git a/business/partner/printer/xiaowm/xiaowm.go b/business/partner/printer/xiaowm/xiaowm.go index cfea5a3b5..5390d0137 100644 --- a/business/partner/printer/xiaowm/xiaowm.go +++ b/business/partner/printer/xiaowm/xiaowm.go @@ -68,12 +68,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin %s* 商品明细: * ` - priceQuote := `品名 数量 ---------------------------------* -` - pricePoints := `品名 数量 单价 小计 + orderFmt += `品名 数量 --------------------------------* ` + // pricePoints := `品名 数量 单价 小计 + //--------------------------------* + //` // 实际支付: %s* orderParams := []interface{}{ globals.StoreName, @@ -89,23 +89,24 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin buyerComment, // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), } - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += pricePoints - case model.EarningTypeQuote: // 报价 - orderFmt += priceQuote - } + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += pricePoints + //case model.EarningTypeQuote: // 报价 + // orderFmt += priceQuote + //} for _, sku := range order.Skus { - - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += `%s*` - orderFmt += `%8s%10s%10s*` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) - case model.EarningTypeQuote: // 报价 - orderFmt += `%s %25s*` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) - } + orderFmt += `%s %25s*` + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += `%s*` + // orderFmt += `%8s%10s%10s*` + // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + //case model.EarningTypeQuote: // 报价 + // orderFmt += `%s %25s*` + // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + //} } orderFmt += ` diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 10fce0339..031a1dcd5 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -80,18 +80,18 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin \n \n 商品明细: \n` - points := ` + orderFmt += ` 品名 数量 小计\n --------------------------------\n` - quote := ` -品名 数量 \n ---------------------------------\n` - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += points - case model.EarningTypeQuote: // 报价 - orderFmt += quote - } + // quote := ` + //品名 数量 \n + //--------------------------------\n` + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += points + //case model.EarningTypeQuote: // 报价 + // orderFmt += quote + //} orderParams = append(orderParams, jxutils.GetVendorName(order.VendorID), order.OrderSeq, @@ -107,15 +107,17 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin ) for _, sku := range order.Skus { - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += `%s\n` - orderFmt += `%20s%8s\n` - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) - case model.EarningTypeQuote: // 报价 - orderFmt += `%s%25s\n` - orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) - } + orderFmt += `%s,%s\n` + orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += `%s\n` + // orderFmt += `%20s%8s\n` + // orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + //case model.EarningTypeQuote: // 报价 + // orderFmt += `%s%25s\n` + // orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) + //} //标品需要打印条形码 if sku.Upc != "" { @@ -188,17 +190,14 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st \n 商品明细: \n` - points := `品名 数量 小计\n + orderFmt += `品名 小计\n --------------------------------\n` - - quote := `品名 小计\n ---------------------------------\n` - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += points - case model.EarningTypeQuote: // 报价 - orderFmt += quote - } + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += points + //case model.EarningTypeQuote: // 报价 + // orderFmt += quote + //} orderParams = append(orderParams, jxutils.GetVendorName(order.VendorID), @@ -215,15 +214,17 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for _, sku := range order.Skus { - switch order.EarningType { - case model.EarningTypePoints: // 扣点 - orderFmt += `%s\n` - orderFmt += `%15s%8s\n` - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) - case model.EarningTypeQuote: // 报价 - orderFmt += `%s%25s\n` - orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count)) - } + orderFmt += `%s,%s\n` + orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count)) + //switch order.EarningType { + //case model.EarningTypePoints: // 扣点 + // orderFmt += `%s\n` + // orderFmt += `%15s%8s\n` + // orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count))) + //case model.EarningTypeQuote: // 报价 + // orderFmt += `%s%25s\n` + // orderParams = append(orderParams, sku.SkuName, "X"+utils.Int2Str(sku.Count)) + //} //标品需要打印条形码 if sku.Upc != "" { diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go index b4d1d1ca4..688bf6b0b 100644 --- a/business/partner/printer/zhongwu/zhongwu.go +++ b/business/partner/printer/zhongwu/zhongwu.go @@ -95,8 +95,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin ) for _, sku := range order.Skus { - orderFmt += `%s` - orderFmt += `%8s` + orderFmt += `%s %s` orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) //jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)) } @@ -179,8 +178,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st ) for _, sku := range order.Skus { - orderFmt += `%s` - orderFmt += `%s` + orderFmt += `%s %s` orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count)) //jxutils.IntPrice2StandardCurrencyString(sku.SalePrice), jxutils.IntPrice2StandardCurrencyString(sku.SalePrice*int64(sku.Count)) }