1

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -78,10 +78,12 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
 					err = c.Swtich2SelfDelivered(order, userName)
 				}
 				if err == nil {
-					// order.Status = model.OrderStatusFinished // todo 是否需要强制设置完成状态？
+					order.Status = model.OrderStatusFinished // todo 是否需要强制设置完成状态？
 					if err = dao.SetOrderFlag(dao.GetDB(), ctx.GetUserName(), order.VendorOrderID, order.VendorID, model.OrderFlagMaskSetDelivered); err == nil {
 						return err
 					}
+					order.OrderFinishedAt = time.Now()
+					dao.UpdateEntity(dao.GetDB(), order, "Status", "OrderFinishedAt")
 				}
 			}
 			return err

business/jxstore/cms/store.go

@@ -600,6 +600,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 			}
 		}
 	}
+	globals.SugarLogger.Debugf("===============params := %s", utils.Format4Output(params, false))
 	sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo)
 	if err != nil {
 		return nil, err
@@ -1078,6 +1079,7 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		}
 	}
 
+	globals.SugarLogger.Debugf("===========valid := %s", utils.Format4Output(valid, false))
 	if len(valid) > 0 {
 		if globals.IsAddEvent {
 			mapBefore := refutil.FindMapAndStructMixed(valid, beforStore)
@@ -1125,10 +1127,56 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 		}
 	} else {
 		globals.SugarLogger.Debugf("UpdateStore track:%s, store:%s", ctx.GetTrackInfo(), utils.Format4Output(store, true))
+	}
+	if status == -2 {
+
 	}
 	return num, err
 }
 
+// updateVendorStoreStatusAndDeliveryStatus 当门店被禁用时,将三方平台和三方配送全部关闭
+//func updateVendorStoreStatusAndDeliveryStatus(ctx *jxcontext.Context, storeId int) error {
+//	var (
+//		db = dao.GetDB()
+//	)
+//	// 获取门店绑定三方平台列表
+//	storeMap, err := dao.GetStoresMapList(db, nil, []int{storeId}, nil, 0, 0, "", "", "")
+//	if err != nil {
+//		return err
+//	}
+//	// 获取门店绑定的配送凭条
+//	storeCouriers, err := dao.GetOpenedStoreCouriersByStoreID(db, storeId, -1)
+//	if err != nil {
+//		return err
+//	}
+//
+//	work := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+//		var errList []error
+//		step := batchItemList[0].(int)
+//		switch step {
+//		case 0: // 同步修改门店营业撞他
+//			// 京东关店,本地店铺状态修改
+//			// 美团关店,本地店铺状态修改
+//			// 饿百关店,本地店铺状态修改
+//			// 抖音关店,本地店铺状态修改
+//		case 1: // 同步修改门店配送状态
+//			// 美团跑腿配送(没有门店状态修改,直接修改本店)
+//			// 蜂鸟配送,关闭(有)
+//			// 达达配送,关闭(有)
+//			// uu跑腿,关闭(不涉及门店概念,直接本地取消绑定信息)
+//		}
+//		return errList, nil
+//	}
+//	tasksch.NewParallelTask(
+//		"禁用门店,修改平台门店状态",
+//		tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false),
+//		ctx,
+//		work,
+//		[]int{0, 1},
+//	)
+//
+//}
+
 func notifyStoreOperatorChanged(ctx *jxcontext.Context, storeID int, operatorRoleName, phone string, newPhone interface{}) {
 	if phone != "" && newPhone != nil {
 		db := dao.GetDB()

business/jxstore/permission/permission.go

@@ -3,6 +3,7 @@ package permission
 import (
 	"fmt"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/globals"
 	"strings"
 	"time"
 
@@ -352,6 +353,7 @@ func GetUserStoresResultMap(userID string) (resultMap map[int]int, err error) {
 		}
 	}
 	userRoles, err2 := dao.GetUserRole2(db, []string{userID}, nil)
+	globals.SugarLogger.Debugf("======userRoles:%s", utils.Format4Output(userRoles, false))
 	err = err2
 	for _, v := range userRoles {
 		var (