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

将京西菜市名字（及其它一些硬编码）做成配置项目

Browse Source
This commit is contained in:
gazebo
2020-02-18 19:11:47 +08:00
parent ae2056c64e
commit b935ef3462
12 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/ebai/store.go
View File

@@ -18,10 +18,6 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
)
const (
VendorStorePrefix = "好菜鲜生"
)
type tEbaiStoreInfo struct {
model.Store
VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
@@ -96,7 +92,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
},
}
retVal.OriginalName = utils.Interface2String(result["name"])
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreNameEbai)
retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"]))
retVal.SetOpTime(ebaiOpTime2Jx(result["business_time"]))

3
business/partner/purchase/elm/order_legacy_urge.go
View File

@@ -10,7 +10,6 @@ import (
)
const (
ELM_SMS_SIGN_NAME = "京西菜市" //饿了么短信推送的签名
ELM_SMS_REMINDERS_DAIPEISHONG_TEMPLATECODE = "SMS_175573181" //饿了么待配送模板ID
ELM_SMS_REMINDERS_PEISHOGNZHONG_TEMPLATECODE = "SMS_175583155" //饿了么配送中模板ID
)
@@ -41,7 +40,7 @@ func (c *PurchaseHandler) ClientUrgeOrder(orderID string) (err error) {
if templateCode != "" {
smsClient := aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
if globals.ReallyCallPlatformAPI {
_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, order.ConsigneeMobile, ELM_SMS_SIGN_NAME, templateCode, string(utils.MustMarshal(templateParams)))
_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, order.ConsigneeMobile, globals.SMSSignName, templateCode, string(utils.MustMarshal(templateParams)))
}
}
}

6
business/partner/purchase/jd/store.go
View File

@@ -20,10 +20,6 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
)
const (
VendorStorePrefix = "京西菜市"
)
type tJdStoreInfo struct {
model.Store
VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
@@ -66,7 +62,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
retVal.IsAutoOrder = -1
}
retVal.OriginalName = result.StationName
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreName)
retVal.DeliveryType = JdDeliveryType2Jx(result.CarrierNo)
tel2 := result.Mobile

6
business/partner/purchase/mtwm/store.go
View File

@@ -20,10 +20,6 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
)
const (
VendorStorePrefix = "美好菜市"
)
var (
opTimeErrReg = regexp.MustCompile(`当前配送营业时间为:([\d:~,]*)`)
)
@@ -51,7 +47,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
},
}
retVal.OriginalName = result.Name
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix)
_, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreNameMtwm)
retVal.SetOpTime(openTimeMtwm2JX(result.ShippingTime))
retVal.Status = bizStatusMtwm2JX(result.OpenLevel, result.IsOnline)