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

haocaixians

Browse Source
This commit is contained in:
苏尹岚
2020-12-02 10:01:52 +08:00
parent 9404bb53b7
commit 9eb51d0748
6 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/orderman/order.go
View File

@@ -1260,6 +1260,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
DeliveryType: model.OrderDeliveryTypeStoreSelf, DeliveryType: model.OrderDeliveryTypeStoreSelf,
StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"), StatusTime: utils.Str2Time(jdsOrder.OrderCreateTime + ":00"),
OrderSeq: 0, OrderSeq: 0,
VendorOrgCode: "1",
} }
//获取真实手机号 //获取真实手机号
fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey) fakeMobile, err := api.JdShopAPI.PhoneSensltiveInfo(order.VendorOrderID2, orderDetail.MobileKey)

22
business/partner/printer/feie/feie.go
View File

@@ -32,10 +32,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
if utils.IsTimeZero(expectedDeliveryTime) { if utils.IsTimeZero(expectedDeliveryTime) {
expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour) expectedDeliveryTime = order.OrderCreatedAt.Add(1 * time.Hour)
} }
orderParams := []interface{}{}
getCode := "" getCode := ""
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
} }
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
orderFmt := ` orderFmt := `
<CB>%s</CB><BR><BR> <CB>%s</CB><BR><BR>
<C>手机买菜上京西</C><BR> <C>手机买菜上京西</C><BR>
@@ -62,8 +68,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
品名 数量 单价 小计<BR> 品名 数量 单价 小计<BR>
--------------------------------<BR>` --------------------------------<BR>`
// <BOLD>实际支付:</BOLD>%s<BR> // <BOLD>实际支付:</BOLD>%s<BR>
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -75,7 +80,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `%s<BR>` orderFmt += `%s<BR>`
@@ -110,6 +115,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<B>饿百取货码:%s</B><BR><BR>\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderParams := []interface{}{}
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
orderFmt := ` orderFmt := `
<CB>%s</CB><BR><BR> <CB>%s</CB><BR><BR>
<C>手机买菜上京西</C><BR> <C>手机买菜上京西</C><BR>
@@ -136,8 +147,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
<B>品名数量单价小计<BR></B> <B>品名数量单价小计<BR></B>
--------------------------------<BR>` --------------------------------<BR>`
// <B><BOLD>实际支付:</BOLD></B><B>%s<BR></B> // <B><BOLD>实际支付:</BOLD></B><B>%s<BR></B>
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -149,7 +159,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `<B>%s<BR></B>` orderFmt += `<B>%s<BR></B>`

22
business/partner/printer/yilianyun/yilianyun.go
View File

@@ -36,6 +36,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderParams := []interface{}{}
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
//TODO 去掉单价和小计，2020-06-18 //TODO 去掉单价和小计，2020-06-18
orderFmt := ` orderFmt := `
<FS2><center>%s</center></FS2>\n\n <FS2><center>%s</center></FS2>\n\n
@@ -61,8 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
品名 数量 单价 小计\n 品名 数量 单价 小计\n
--------------------------------\n` --------------------------------\n`
// <FB>实际支付:</FB>%s\n // <FB>实际支付:</FB>%s\n
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -74,7 +79,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `%s\n` orderFmt += `%s\n`
@@ -105,6 +110,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<FS2>饿百取货码:%s</FS2>\\n\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderParams := []interface{}{}
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
orderFmt := ` orderFmt := `
<FS2><center>%s</center></FS2>\n\n <FS2><center>%s</center></FS2>\n\n
<center>手机买菜上京西</center> <center>手机买菜上京西</center>
@@ -129,8 +140,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
<FS2>品名数量单价小计\n</FS2> <FS2>品名数量单价小计\n</FS2>
--------------------------------\n` --------------------------------\n`
// <FS2><FB>实际支付:</FB>%s\n</FS2> // <FS2><FB>实际支付:</FB>%s\n</FS2>
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -142,7 +152,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `<FS2>%s\n</FS2>` orderFmt += `<FS2>%s\n</FS2>`

22
business/partner/printer/zhongwu/zhongwu.go
View File

@@ -37,6 +37,12 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderParams := []interface{}{}
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
orderFmt := ` orderFmt := `
<S2><C>%s</C></S2><RN><RN> <S2><C>%s</C></S2><RN><RN>
<C>手机买菜上京西</C> <C>手机买菜上京西</C>
@@ -61,8 +67,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
品名 数量 <RN> 品名 数量 <RN>
********************************<RN>` ********************************<RN>`
// <B1>实际支付:</B1>%s<RN> // <B1>实际支付:</B1>%s<RN>
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -74,7 +79,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `%s<RN>` orderFmt += `%s<RN>`
@@ -106,6 +111,12 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDEBAI {
getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order)) getCode = fmt.Sprintf("<S2>饿百取货码:%s</S2><RN>\n", jxutils.GetEbaiOrderGetCode(order))
} }
orderParams := []interface{}{}
if order.VendorOrgCode == "34665" {
orderParams = append(orderParams, globals.StoreNameEbai2)
} else {
orderParams = append(orderParams, globals.StoreName)
}
orderFmt := ` orderFmt := `
<S2><C>%s</C></S2><RN><RN> <S2><C>%s</C></S2><RN><RN>
<C>手机买菜上京西</C> <C>手机买菜上京西</C>
@@ -130,8 +141,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
<S2>品名 数量<RN></S2> <S2>品名 数量<RN></S2>
********************************<RN>` ********************************<RN>`
// <S2><B1>实际支付:</B1>%s<RN></S2> // <S2><B1>实际支付:</B1>%s<RN></S2>
orderParams := []interface{}{ orderParams = append(orderParams,
globals.StoreName,
utils.Time2Str(order.OrderCreatedAt), utils.Time2Str(order.OrderCreatedAt),
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.VendorOrderID, order.VendorOrderID,
@@ -143,7 +153,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
order.ConsigneeAddress, order.ConsigneeAddress,
order.BuyerComment, order.BuyerComment,
// jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), // jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice),
} )
for _, sku := range order.Skus { for _, sku := range order.Skus {
orderFmt += `<S2>%s<RN></S2>` orderFmt += `<S2>%s<RN></S2>`

1
conf/app.conf
View File

@@ -123,6 +123,7 @@ getWeixinTokenKey = "c928ed0d-87a3-441a-8517-f92f0167296f"
storeName = "京西菜市" storeName = "京西菜市"
storeNameMtwm = "京西菜市" storeNameMtwm = "京西菜市"
storeNameEbai = "饿鲜达" storeNameEbai = "饿鲜达"
storeNameEbai2 = "好菜鲜生"
smsSignName = "京西菜市" smsSignName = "京西菜市"
smsMobileVerifyTemplate = "SMS_175583158" smsMobileVerifyTemplate = "SMS_175583158"

8
globals/globals.go
View File

@@ -41,9 +41,10 @@ var (
GetPushTokenURL string GetPushTokenURL string
GetWeimobTokenURL string GetWeimobTokenURL string
StoreName string StoreName string
StoreNameMtwm string StoreNameMtwm string
StoreNameEbai string StoreNameEbai string
StoreNameEbai2 string
SMSSignName string SMSSignName string
SMSMobileVerifyTemplate string SMSMobileVerifyTemplate string
@@ -118,6 +119,7 @@ func Init() {
StoreName = beego.AppConfig.String("storeName") StoreName = beego.AppConfig.String("storeName")
StoreNameMtwm = beego.AppConfig.String("storeNameMtwm") StoreNameMtwm = beego.AppConfig.String("storeNameMtwm")
StoreNameEbai = beego.AppConfig.String("storeNameEbai") StoreNameEbai = beego.AppConfig.String("storeNameEbai")
StoreNameEbai2 = beego.AppConfig.String("storeNameEbai2")
SMSSignName = beego.AppConfig.String("smsSignName") SMSSignName = beego.AppConfig.String("smsSignName")
SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate") SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate")