From c68e02b4092f4eb251179cef764da9201d75bc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 11:09:19 +0800
Subject: [PATCH 1/7] aa
---
business/partner/purchase/ebai/store_sku2.go | 31 ++++++++++++--------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go
index e75d5c60d..9bd96fbf8 100644
--- a/business/partner/purchase/ebai/store_sku2.go
+++ b/business/partner/purchase/ebai/store_sku2.go
@@ -433,24 +433,31 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE
if !isExd {
var categoryID = utils.Str2Int64(storeSku.VendorCatID)
if ebaiExSkuCatMap[storeSku.SkuID] != 0 {
- store, _ := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, "")
- if store.CityCode == 510100 {
- s, _ := dao.GetStoreSkuCategoryMap(dao.GetDB(), 439, storeSku.StoreID)
- categoryID = s.EbaiID
+ if store, err := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, ""); err == nil && store != nil {
+ if store.CityCode == 510100 {
+ if s, err2 := dao.GetStoreSkuCategoryMap(dao.GetDB(), 439, storeSku.StoreID); err2 == nil && s != nil {
+ categoryID = s.EbaiID
+ }
+ }
}
+
}
if ebaiExSkuCatMap2[storeSku.SkuID] != 0 {
- store, _ := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, "")
- if store.CityCode == 510100 {
- s, _ := dao.GetStoreSkuCategoryMap(dao.GetDB(), 440, storeSku.StoreID)
- categoryID = s.EbaiID
+ if store, err := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, ""); err == nil && store != nil {
+ if store.CityCode == 510100 {
+ if s, err2 := dao.GetStoreSkuCategoryMap(dao.GetDB(), 440, storeSku.StoreID); err2 == nil && s != nil {
+ categoryID = s.EbaiID
+ }
+ }
}
}
if ebaiExSkuCatMap3[storeSku.SkuID] != 0 {
- store, _ := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, "")
- if store.CityCode == 510100 {
- s, _ := dao.GetStoreSkuCategoryMap(dao.GetDB(), 175, storeSku.StoreID)
- categoryID = s.EbaiID
+ if store, err := dao.GetStoreDetail(dao.GetDB(), storeSku.StoreID, model.VendorIDEBAI, ""); err == nil && store != nil {
+ if store.CityCode == 510100 {
+ if s, err2 := dao.GetStoreSkuCategoryMap(dao.GetDB(), 175, storeSku.StoreID); err2 == nil && s != nil {
+ categoryID = s.EbaiID
+ }
+ }
}
}
params["category_id"] = categoryID
From 0ce761b01e98416adaf3c66630b139453abdbfd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 11:22:58 +0800
Subject: [PATCH 2/7] aa
---
business/partner/purchase/ebai/ebai.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go
index 681458988..04d3de1ff 100644
--- a/business/partner/purchase/ebai/ebai.go
+++ b/business/partner/purchase/ebai/ebai.go
@@ -14,7 +14,7 @@ import (
)
const (
- EbaiSupplierIDsc = "1486975681715"
+ EbaiSupplierIDsc = "1921188187760"
EbaiSupplierIDc4 = "22267134648"
EbaiSupplierIDhc = "2233065879"
EbaiSupplierIDgy = "2267230126"
From 1f82ec3f0d2956da84b9a07f8a3a1f780b131fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 11:31:29 +0800
Subject: [PATCH 3/7] aa
---
business/jxutils/netprinter/netprinter.go | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go
index 8f558ec9b..f4f57530b 100644
--- a/business/jxutils/netprinter/netprinter.go
+++ b/business/jxutils/netprinter/netprinter.go
@@ -82,6 +82,12 @@ func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, st
}, nil
}
storeDetail, _ := dao.GetStoreDetail(db, storeID, order.VendorID, order.VendorOrgCode)
+ if storeDetail == nil && order.VendorOrderID == testVendorOrderID {
+ storeDetail = &dao.StoreDetail{
+ BrandName: testVendorOrderID,
+ BrandIsPrint: model.NO,
+ }
+ }
printResult, err = handler.PrintOrder(ctx, store, storeDetail, order)
if err == nil {
dao.SetOrderPrintFlag(db, ctx.GetUserName(), order.VendorOrderID, order.VendorID, true)
From 5cb65919c2b01c5931583bc07ab23eb9cb2dfe66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 11:37:07 +0800
Subject: [PATCH 4/7] aa
---
business/partner/printer/feie/feie.go | 28 +++++++++-------
.../partner/printer/yilianyun/yilianyun.go | 32 +++++++++++--------
business/partner/printer/zhongwu/zhongwu.go | 15 +++++----
3 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 57757624f..c940f9b23 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -40,14 +40,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
getCode = fmt.Sprintf("饿百取货码:%s
\n", jxutils.GetEbaiOrderGetCode(order))
}
orderFmt := ``
- if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
%s
`
- if order.VendorOrgCode == "34665" {
- orderParams = append(orderParams, globals.StoreNameEbai2)
- } else {
- orderParams = append(orderParams, storeDetail.BrandName)
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
}
}
orderFmt += `
@@ -124,14 +126,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
}
orderParams := []interface{}{}
orderFmt := ``
- if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
%s
`
- if order.VendorOrgCode == "34665" {
- orderParams = append(orderParams, globals.StoreNameEbai2)
- } else {
- orderParams = append(orderParams, storeDetail.BrandName)
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
}
}
orderFmt += `
diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go
index 26bb599da..1241812aa 100644
--- a/business/partner/printer/yilianyun/yilianyun.go
+++ b/business/partner/printer/yilianyun/yilianyun.go
@@ -39,14 +39,16 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
}
orderParams := []interface{}{}
orderFmt := ``
- if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
- %s\n\n
- `
- if order.VendorOrgCode == "34665" {
- orderParams = append(orderParams, globals.StoreNameEbai2)
- } else {
- orderParams = append(orderParams, storeDetail.BrandName)
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
+ %s\n\n
+ `
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
}
}
orderFmt += `
@@ -117,14 +119,16 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
}
orderParams := []interface{}{}
orderFmt := ``
- if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
+ if storeDetail != nil {
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
%s\n\n
`
- if order.VendorOrgCode == "34665" {
- orderParams = append(orderParams, globals.StoreNameEbai2)
- } else {
- orderParams = append(orderParams, storeDetail.BrandName)
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
}
}
orderFmt += `
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index f9a453bb8..2ebce40b6 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -40,14 +40,17 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
}
orderParams := []interface{}{}
orderFmt := ``
- if storeDetail.BrandIsPrint == model.NO {
- orderFmt += `
+ if storeDetail != nil {
+
+ if storeDetail.BrandIsPrint == model.NO {
+ orderFmt += `
%s
`
- if order.VendorOrgCode == "34665" {
- orderParams = append(orderParams, globals.StoreNameEbai2)
- } else {
- orderParams = append(orderParams, storeDetail.BrandName)
+ if order.VendorOrgCode == "34665" {
+ orderParams = append(orderParams, globals.StoreNameEbai2)
+ } else {
+ orderParams = append(orderParams, storeDetail.BrandName)
+ }
}
}
orderFmt += `
From 52a3d02eac1765436c8dc7d191ec2045fcf25eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 13:52:59 +0800
Subject: [PATCH 5/7] aa
---
business/partner/purchase/ebai/store.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 3bcb8ecaf..b48985dae 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -38,7 +38,7 @@ var (
},
},
BusinessFormID: 1672214913,
- BrandName: "京西到家便利店",
+ BrandName: "京西到家",
},
EbaiSupplierIDhc: &tEbaiSupplierInfo{
SupplierID: EbaiSupplierIDhc,
From 67f1333ef37e8ed8d1d177f6296b6957aa066568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 16:18:58 +0800
Subject: [PATCH 6/7] aa
---
business/partner/printer/zhongwu/zhongwu.go | 1 -
business/partner/purchase/mtwm/store.go | 78 ++++++++++++++++++---
2 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/business/partner/printer/zhongwu/zhongwu.go b/business/partner/printer/zhongwu/zhongwu.go
index 2ebce40b6..c16bb59bc 100644
--- a/business/partner/printer/zhongwu/zhongwu.go
+++ b/business/partner/printer/zhongwu/zhongwu.go
@@ -41,7 +41,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderParams := []interface{}{}
orderFmt := ``
if storeDetail != nil {
-
if storeDetail.BrandIsPrint == model.NO {
orderFmt += `
%s
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index 747841839..dcf28e7ec 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -24,10 +24,28 @@ import (
var (
opTimeErrReg = regexp.MustCompile(`当前配送营业时间为:([\d:~,]*)`)
- storeVendorOrgCodeMap = map[string]string{
- "589": mtwmapi.MtwmC4Tag,
- "5873": mtwmapi.MtwmSCTag,
- "4123": mtwmapi.MtwmSGTag,
+ storeVendorOrgCodeMap = map[string]map[string]string{
+ "589": map[string]string{
+ "firstTag": mtwmapi.MtwmC4Tag, //经营品类
+ "settlementID": "", //结算ID
+ "poiCert": "1,5", //资质列表
+ },
+ "5873": map[string]string{
+ "firstTag": mtwmapi.MtwmSCTag,
+ "settlementID": "",
+ "poiCert": "1,2,5,6",
+ },
+ "4123": map[string]string{
+ "firstTag": mtwmapi.MtwmSGTag,
+ "settlementID": "",
+ "poiCert": "1,5",
+ },
+ }
+ poiCertMap = map[string]string{
+ "1": "门脸图",
+ "2": "环境图",
+ "5": "营业执照",
+ "6": "食品经营许可证",
}
)
@@ -124,24 +142,24 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
shippingTime += jxutils.JxOperationTime2StrTime(storeDetail.CloseTime2)
}
}
-
+ vendorInfoMap := storeVendorOrgCodeMap[vendorOrgCode]
poiSettleSaveParam := &mtwmapi.PoiSettleSaveParam{
Type: 0, //创建
ApplyInfos: []*mtwmapi.ApplyInfo{
&mtwmapi.ApplyInfo{
AppPoiCode: utils.Int2Str(storeDetail.ID),
- SettlementID: 0, //结算ID，暂时还没得
+ SettlementID: utils.Str2Int(vendorInfoMap["settlementID"]), //结算ID，暂时还没得
MultiPoiBasicInfo: &mtwmapi.MultiPoiBasicInfo{
Name: params["vendorStoreName"].(string),
City: cityName,
Address: storeDetail.Address,
Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)),
Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)),
- FirstTag: storeVendorOrgCodeMap[vendorOrgCode],
+ FirstTag: vendorInfoMap["firstTag"],
CallCenter: storeDetail.Tel1,
ContactPhone: storeDetail.Tel1,
ContactName: storeDetail.IDName,
- EcommerceAccountPhone: "18048531223",
+ EcommerceAccountPhone: "18048531223", //石总的手机
ShippingTime: shippingTime,
},
MultiPoiShippingInfo: &mtwmapi.MultiPoiShippingInfo{
@@ -153,8 +171,50 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
},
},
}
+ switchCertType := func(certType string) (licensePic, licenseSocialCreditCode, licenseNumber, licenseLegalPerson, licenseAddress, licenseValidStartDate, licenseValidity string, isLongTime int) {
+ switch certType {
+ case "1":
+ licensePic = storeDetail.StoreFrontPic
+ case "2":
+ licensePic = storeDetail.StoreInPic
+ case "5":
+ licensePic = storeDetail.Licence
+ licenseSocialCreditCode = storeDetail.LicenceCode
+ licenseNumber = storeDetail.LicenceCode
+ licenseLegalPerson = storeDetail.LicenceOwnerName
+ licenseAddress = storeDetail.LicenceAddress
+ licenseValidStartDate = storeDetail.LicenceValid
+ if storeDetail.LicenceExpire == "" {
+ isLongTime = 1
+ } else {
+ licenseValidity = storeDetail.LicenceExpire
+ }
+ case "6":
+ licensePic = storeDetail.Licence2Image
+ licenseSocialCreditCode = storeDetail.Licence2Code
+ licenseNumber = storeDetail.Licence2Code
+ licenseLegalPerson = storeDetail.LicenceOwnerName
+ licenseAddress = storeDetail.LicenceAddress
+ licenseValidStartDate = storeDetail.Licence2Valid
+ if storeDetail.Licence2Expire == "" {
+ isLongTime = 1
+ } else {
+ licenseValidity = storeDetail.Licence2Expire
+ }
+ }
+ return licensePic, licenseSocialCreditCode, licenseNumber, licenseLegalPerson, licenseAddress, licenseValidStartDate, licenseValidity, isLongTime
+ }
+ var certs []*mtwmapi.MultiPoiCertInfo
+ for _, v := range strings.Split(vendorInfoMap["poiCert"], ",") {
+ cert := &mtwmapi.MultiPoiCertInfo{
+ Type: utils.Str2Int(v),
+ LicenseName: poiCertMap[v],
+ }
+ cert.LicensePic, cert.LicenseSocialCreditCode, cert.LicenseNumber, cert.LicenseLegalPerson, cert.LicenseAddress, cert.LicenseValidStartDate, cert.LicenseValidity, cert.IsLongTime = switchCertType(v)
+ certs = append(certs, cert)
+ }
mtapi := getAPIWithoutToken(storeDetail.VendorOrgCode)
- mtapi.PoiSettleSave(poiSettleSaveParam)
+ vendorStoreID, err = mtapi.PoiSettleSave(poiSettleSaveParam)
return vendorStoreID, err
}
From cfb02afc840b23a0ced4f36c372fec9c81e6cd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 2 Mar 2021 16:42:59 +0800
Subject: [PATCH 7/7] aa
---
business/partner/purchase/mtwm/store.go | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index dcf28e7ec..44b283022 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -27,7 +27,7 @@ var (
storeVendorOrgCodeMap = map[string]map[string]string{
"589": map[string]string{
"firstTag": mtwmapi.MtwmC4Tag, //经营品类
- "settlementID": "", //结算ID
+ "settlementID": "7030017", //结算ID
"poiCert": "1,5", //资质列表
},
"5873": map[string]string{
@@ -37,7 +37,7 @@ var (
},
"4123": map[string]string{
"firstTag": mtwmapi.MtwmSGTag,
- "settlementID": "",
+ "settlementID": "6572945",
"poiCert": "1,5",
},
}
@@ -214,7 +214,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
certs = append(certs, cert)
}
mtapi := getAPIWithoutToken(storeDetail.VendorOrgCode)
- vendorStoreID, err = mtapi.PoiSettleSave(poiSettleSaveParam)
+ if vendorStoreID, err = mtapi.PoiSettleSave(poiSettleSaveParam); err == nil {
+ err = mtapi.PoiSettleAuditSubmit([]string{vendorStoreID})
+ }
return vendorStoreID, err
}