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

修改报价门店商品价格修改

Browse Source
This commit is contained in:
邹宗楠
2023-04-23 15:46:39 +08:00
parent 5331dcd4c5
commit de3c3c63a5
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/auto_delivery/auto_delivery.go
View File

@@ -129,7 +129,6 @@ func AutoSettingFakeDelivery() {
return return
} }
} }
globals.SugarLogger.Debugf("==================riderKey=:%s", riderKey)
randNumber, _ := rand.Int(rand.Reader, big.NewInt(int64(len(riderListInfo[riderKey])))) randNumber, _ := rand.Int(rand.Reader, big.NewInt(int64(len(riderListInfo[riderKey]))))
randTime := randNumber.Int64() randTime := randNumber.Int64()

2
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -650,7 +650,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
//针对快送的订单（订单接单后会立马召唤骑手，不会到自动拣货完成） //针对快送的订单（订单接单后会立马召唤骑手，不会到自动拣货完成）
//如果骑手已接单，没有通知过的门店,需要发送通知 //如果骑手已接单，没有通知过的门店,需要发送通知
if bill.Status == model.WaybillStatusAccepted && order.NotifyType == 0 { if bill.Status == model.WaybillStatusAccepted && order.NotifyType == 0 {
//smsmsg.NotifyPickOrder(order) smsmsg.NotifyPickOrder(order)
} }
// 订单处于配送状态来的新分配骑手运单 // 订单处于配送状态来的新分配骑手运单

3
business/jxstore/cms/store_sku.go
View File

@@ -5892,14 +5892,13 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto
} }
} }
for _, skuBindInfo := range skuBindInfos { for _, skuBindInfo := range skuBindInfos {
globals.SugarLogger.Debugf("doStoreSkuAudit storeID: %v , nameID: %v", storeID, skuBindInfo.NameID)
storeAudits, err := dao.GetStoreSkuAuditLight(db, []int{storeID}, []int{skuBindInfo.NameID}, model.StoreAuditStatusOnline) storeAudits, err := dao.GetStoreSkuAuditLight(db, []int{storeID}, []int{skuBindInfo.NameID}, model.StoreAuditStatusOnline)
//取消关注，可售排除 //取消关注，可售排除
if skuBindInfo.IsFocus == -1 || skuBindInfo.IsSale != 0 || skuBindInfo.UnitPrice == 0 { if skuBindInfo.IsFocus == -1 || skuBindInfo.IsSale != 0 || skuBindInfo.UnitPrice == 0 {
return false, err return false, err
} }
if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile && ctx.GetLoginType() != auth2.AuthTypePassword {
authInfo, err := ctx.GetV2AuthInfo() authInfo, err := ctx.GetV2AuthInfo()
if err == nil && authInfo != nil && (ctx.GetFullUser().Type&model.UserTypeOperator) != 0 { if err == nil && authInfo != nil && (ctx.GetFullUser().Type&model.UserTypeOperator) != 0 {
if len(storeAudits) > 0 { if len(storeAudits) > 0 {

16
business/partner/delivery/rider.go
View File

@@ -327,18 +327,22 @@ func UpdateFakeWayBillToTiktok() {
} }
// 更新运单为完成状态 // 更新运单为完成状态
if fakeWayBill[i].Status == model.WaybillStatusDelivered { if fakeWayBill[i].Status == model.WaybillStatusDelivered {
order, err := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
if err != nil {
globals.SugarLogger.Errorf("Loading order by wayBill vendorOrderID err := %v", err)
continue
}
if order.Status == model.OrderStatusCanceled {
continue
}
sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? ` sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? `
_, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...) _, err = dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
} }
// 饿百订单推送订单送达 // 饿百订单推送订单送达
if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI { if fakeWayBill[i].OrderVendorID == model.VendorIDEBAI {
order, err := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)
if err != nil {
globals.SugarLogger.Errorf("Loading order by wayBill vendorOrderID err := %v", err)
continue
}
if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil { if err := handler.Swtich2SelfDelivered(order, "JingXiAdmin"); err != nil {
globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err) globals.SugarLogger.Errorf("Swtich2SelfDelivered err := %v", err)
} }