Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/jxcallback/scheduler/defsch/defsch.go

@@ -45,7 +45,7 @@ const (
 	minute2Schedule3rdCarrier4Ebai = 30            // 饿百的最少转自配送需要的时间（分钟）
 	minMinute2Schedule3rdCarrier   = 5             // 转三方配送最少等待时间（分钟）
 
-	time2AutoPickupMin   = 14 * time.Minute  // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置
+	time2AutoPickupMin   = 9 * time.Minute   // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置
 	second2AutoPickupGap = 60                //随机60秒
 	time2AutoPickupAhead = 120 * time.Second // 有最后拣货时间的提前值
 

business/jxstore/act/act.go

@@ -2034,30 +2034,34 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) {
 					}
 				}
 				// 查询门店爆款商品,当门店存在爆款时,取消之前的力荐商品,将新的爆款设置为力荐商品
+				// 商品为手动设置力荐或者爆款活动在取消力荐之前被删除,那么无法取消被力荐的商品!
 				//if k == mtwmapi.RetailActTypeSecKill && len(actList) > 0 {
-				//	allActivitySkuIdList := make([]string, 0, 0)        // 此门店全部的折扣(爆款)活动商品
-				//	activationActivitySkuIdList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品
-				//	loseActivitySkuIdList := make([]string, 0, 0)       // 此门店全部的折扣(爆款)活动商品
+				//	allActivitySkuIdList := make([]string, 0, 0)                       // 此门店全部的折扣(爆款)活动商品
+				//	activationActivitySkuIdList := make([]*partner.StoreSkuInfo, 0, 0) // 此门店正在进行的折扣(爆款)活动商品
+				//	loseActivitySkuIdList := make([]*partner.StoreSkuInfo, 0, 0)       // 此门店已经结束的折扣(爆款)活动商品
 				//	for _, ac := range actList {
 				//		allActivitySkuIdList = append(allActivitySkuIdList, utils.Int64ToStr(ac.ItemID))
 				//		// 已经生效的爆款活动
 				//		if ac.Status == 1 && ac.SkuId != "" {
-				//			activationActivitySkuIdList = append(activationActivitySkuIdList, utils.Int64ToStr(ac.ItemID))
+				//			activity := &partner.StoreSkuInfo{
+				//				SkuID:       utils.Str2Int(ac.SkuId),
+				//				IsSpecialty: 1,
+				//			}
+				//			activationActivitySkuIdList = append(activationActivitySkuIdList, activity)
 				//		}
 				//		// 已经失效的爆款活动
 				//		if ac.Status == 0 && ac.SkuId != "" {
-				//			loseActivitySkuIdList = append(loseActivitySkuIdList, ac.SkuId)
+				//			lose := &partner.StoreSkuInfo{
+				//				SkuID:       utils.Str2Int(ac.SkuId),
+				//				IsSpecialty: 0,
+				//			}
+				//			loseActivitySkuIdList = append(loseActivitySkuIdList, lose)
 				//		}
 				//	}
 				//	// 取消当前力荐商品
-				//	mtapi.RetailDiscountDelete2(storeMap.VendorStoreID, k)
+				//	partner.GetPurchasePlatformFromVendorID(storeMap.VendorID).(partner.ISingleStoreStoreSkuHandler).UpdateStoreSkusSpecTag(ctx, storeMap.VendorOrgCode, storeMap.StoreID, storeMap.VendorStoreID, loseActivitySkuIdList)
 				//	// 重新推荐力荐商品
-				//	partner.GetPurchasePlatformFromVendorID(storeMap.VendorID).(partner.ISingleStoreStoreSkuHandler).UpdateStoreSkus()
-				//}
-				//
-				//// 门店爆款活动商品为0,则取消真在力荐的商品
-				//if k == mtwmapi.RetailActTypeSecKill && len(actList) == 0 {
-				//
+				//	partner.GetPurchasePlatformFromVendorID(storeMap.VendorID).(partner.ISingleStoreStoreSkuHandler).UpdateStoreSkusSpecTag(ctx, storeMap.VendorOrgCode, storeMap.StoreID, storeMap.VendorStoreID, activationActivitySkuIdList)
 				//}
 			}
 			return retVal, err

business/partner/purchase/mtwm/store_sku2.go

@@ -748,7 +748,7 @@ func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorO
 	var foodDataList = []map[string]interface{}{}
 	for _, v := range storeSkuList {
 		var foodData = make(map[string]interface{})
-		if v.IsSpecialty != 0 && v.IsSpecialty == -1 {
+		if v.IsSpecialty == -1 {
 			v.IsSpecialty = 0
 		}
 		foodData["is_specialty"] = v.IsSpecialty

business/partner/purchase/tiktok_store/act.go

@@ -155,7 +155,7 @@ func getActStoreSkuFromTaskResult(taskReslt []interface{}) (list []*model.ActSto
 
 func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actStoreSku []*model.ActStoreSku2) (createdList []*model.ActStoreSku2, err error) {
 	actStoreSkuListList := partner.SplitActStoreSku2List(actStoreSku)
-	task := tasksch.NewParallelTask("mtwm createSkuAct", nil, ctx,
+	task := tasksch.NewParallelTask("Tiktok createSkuAct", nil, ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			list := batchItemList[0].([]*model.ActStoreSku2)
 			failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list)

controllers/jx_order2.go

@@ -18,7 +18,7 @@ type JxOrderController struct {
 // @Description 创建京西商城订单
 // @Param	token			header		string	true	"认证token"
 // @Param	jxOrder			formData	string	true	"订单信息"
-// @Param	addressID		formData	int64	true	"配送地址ID"
+// @Param	addressID		formData	int64	fasle	"配送地址ID"
 // @Param	fromStoreID		formData	int		fasle	"物料配送门店"
 // @Param	couponIDs		formData	string	fasle	"优惠券IDs"
 // @Param	createType		formData	int		false	"创建类型, 0:预创建, 1:创建"

routers/commentsRouter_controllers.go

@@ -910,7 +910,7 @@ func init() {
 	web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JxOrderController"],
 		web.ControllerComments{
 			Method:           "Pay4Order",
-			Router:           `4Order`,
+			Router:           `Pay4Order`,
 			AllowHTTPMethods: []string{"post"},
 			MethodParams:     param.Make(),
 			Filters:          nil,