From 563ef89dfd7e27b3fd6f080bd62401b38fc3578e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 2 Mar 2026 14:11:05 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/basesch/basesch_ext.go | 3 +++ business/jxstore/cms/store.go | 5 ++--- business/model/dao/store.go | 2 +- business/model/dao/store_model.go | 1 + business/model/store.go | 8 ++++---- business/partner/purchase/jx/localjx/order.go | 3 +++ 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index cc1429c5e..2d11b53aa 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -518,6 +518,9 @@ func (c *BaseScheduler) confirmSelfTake(ctx *jxcontext.Context, order *model.Goo } err = handler.ConfirmSelfTake(ctx, order, selfTakeCode) } else { + if selfTakeCode != order.ConsigneeMobile && selfTakeCode != order.VendorOrderID[len(order.VendorOrderID)-4:] { + return fmt.Errorf("京西平台自提单,自提码为订单后四位或完整的下单电话") + } orderStatus := &model.OrderStatus{ VendorOrderID: order.VendorOrderID, VendorID: model.VendorIDJX, diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 20e574d1c..def25b762 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -661,8 +661,6 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa //mapLimit := false txDB, _ := dao.Begin(db) - globals.SugarLogger.Debugf("--------sql := %s", utils.Format4Output(sql, false)) - globals.SugarLogger.Debugf("--------sqlParams := %s", utils.Format4Output(sqlParams, false)) if err = dao.GetRowsTx(txDB, &storeList, sql, sqlParams...); err == nil { retVal.Stores = storeList retVal.TotalCount = dao.GetLastTotalRowCount2(db, txDB) @@ -1417,6 +1415,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i } dao.WrapAddIDCULDEntity(store, userName) store.ID = existingID + store.SMSNotify = 0 // 禁止使用订单短信通知 if err = dao.CreateEntity(db, store); err == nil { if globals.IsAddEvent { err = AddEventDetail(db, ctx, model.OperateAdd, store.ID, model.ThingTypeStore, store.ID, "", "") @@ -1434,7 +1433,7 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i Status: model.StoreStatusOpened, PricePercentagePack: "无", VendorID: model.VendorIDJX, - //DeliverySelf: 0,liulei + DeliverySelf: 1, }, false) //尝试把平台负责人加到他自己的权限里 if store.MarketManPhone != "" { diff --git a/business/model/dao/store.go b/business/model/dao/store.go index c89be9455..5ff5324f7 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -22,7 +22,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID, vendorOrgCo SELECT t1.*, t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code, t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix, - t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, t2.mtwm_token, t2.ebai_supplier_id, t2.create_delivery_type,t2.is_service, + t2.jds_street_code, t2.jds_street_name, t2.is_supply_goods, t2.vendor_pay_percentage, t2.mtwm_token, t2.ebai_supplier_id, t2.create_delivery_type,t2.is_service,t2.delivery_self, t3.value price_percentage_pack_str, t4.value freight_deduction_pack_str, province.name province_name, diff --git a/business/model/dao/store_model.go b/business/model/dao/store_model.go index 94a69b48d..ffce07eb1 100644 --- a/business/model/dao/store_model.go +++ b/business/model/dao/store_model.go @@ -29,6 +29,7 @@ type StoreDetail struct { DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争 IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 IsService int `orm:"default(0)" json:"isService"` // 默认0非服务商，1服务商 + DeliverySelf int `orm:"default(0)" json:"deliverySelf"` // 是否支持自提[1-支持] DistrictName string `json:"districtName"` CityName string `json:"cityName"` diff --git a/business/model/store.go b/business/model/store.go index 6615950cb..b1ccae923 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -516,10 +516,10 @@ type StoreMap struct { MtwmRefreshToken string `orm:"size(255)" json:"mtwmRefreshToken"` //美团外卖商超refreshToken EbaiSupplierID string `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID BussinessStatus int `orm:"-" json:"bussinessStatus"` - VendorAccount string `orm:"size(255)" json:"vendorAccount"` //商户在平台上的账号（授权用 - VendorPasswaord string `orm:"size(255)" json:"vendorPasswaord"` //商户在平台上的密码（ aes cbc base64后的 - AuditStatus int `json:"auditStatus"` //审核状态（授权状态 - // DeliverySelf liulei int `orm:"column(delivery_self);size(48);default(0)" json:"deliverySelf"` // 是否支持自提(0-不支持,1-支持) + VendorAccount string `orm:"size(255)" json:"vendorAccount"` //商户在平台上的账号（授权用 + VendorPasswaord string `orm:"size(255)" json:"vendorPasswaord"` //商户在平台上的密码（ aes cbc base64后的 + AuditStatus int `json:"auditStatus"` //审核状态（授权状态 + DeliverySelf int `orm:"column(delivery_self);size(48);default(0)" json:"deliverySelf"` // 是否支持自提(0-不支持,1-支持) } func (*StoreMap) TableUnique() [][]string { diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 6d650e025..d13c53c71 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -690,6 +690,9 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 if err != nil { return nil, nil, err } + if IsDeliverySelf && storeDetail.DeliverySelf != model.YES { + return nil, nil, fmt.Errorf("门店暂不支持自提订单") + } var addressList []*dao.UserDeliveryAddressEx if userID == "" { addressList, _, err = dao.QueryUserDeliveryAddress(db, addressID, nil, 0, 0)