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

1

Browse Source
This commit is contained in:
邹宗楠
2026-03-02 14:11:05 +08:00
parent 535ed6677d
commit 563ef89dfd
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -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,

5
business/jxstore/cms/store.go
View File

@@ -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 != "" {

2
business/model/dao/store.go
View File

@@ -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,

1
business/model/dao/store_model.go
View File

@@ -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"`

8
business/model/store.go
View File

@@ -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 {

3
business/partner/purchase/jx/localjx/order.go
View File

@@ -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)