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] 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 }