1

business/partner/purchase/mtwm/order.go

@@ -632,7 +632,7 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName
 				riderInfo.ThirdCarrierOrderId = order.VendorOrderID
 			} else {
 				for _, v := range waybills {
-					if v.Status >= model.OrderStatusDelivering && v.Status <= model.OrderStatusFinished {
+					if v.Status != model.OrderStatusCanceled && v.Status != model.OrderStatusFinished && v.Status != model.OrderStatusEndEnd {
 						riderInfo.CourierName = v.CourierName
 						riderInfo.CourierPhone = v.CourierMobile
 						riderInfo.ThirdCarrierOrderId = v.VendorWaybillID

business/partner/purchase/mtwm/store_sku2.go

@@ -3,6 +3,7 @@ package mtwm
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"regexp"
 	"strings"
 
@@ -437,6 +438,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		//	boxPirce = storeSku.LadderBoxPrice
 		//}
 		//skus[0]["ladder_box_price"] = jxutils.IntPrice2Standard(int64(boxPirce))
+
+		skus[0]["ladder_box_num"] = 0
+		skus[0]["ladder_box_price"] = 0
 		if foodData["tag_id"] != nil {
 			skus[0]["weight"] = storeSku.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用
 		}
@@ -895,3 +899,45 @@ func (p *PurchaseHandler) UpdateStoreSkusSpecTag(ctx *jxcontext.Context, vendorO
 func (p *PurchaseHandler) GetSkuCategoryIdByName(vendorOrgCode, skuName string) (vendorCategoryId string, err error) {
 	return "", err
 }
+
+func UpdateBoxPrice(ctx *jxcontext.Context, db *dao.DaoDB, storeId int) error {
+	storeDetail, err := dao.GetStoreDetail(db, storeId, model.VendorIDMTWM, "")
+	if err != nil {
+		return err
+	}
+
+	storeSkuList, err := dao.GetStoresSkusInfo(db, []int{storeId}, nil)
+	if err != nil {
+		return err
+	}
+
+	api := getAPI(storeDetail.VendorOrgCode, storeId, storeDetail.VendorStoreID)
+	foodDataList := make([]map[string]interface{}, 0)
+	for _, v := range storeSkuList {
+		if v.MtwmID != model.NO {
+			continue
+		}
+
+		foodDataList = append(foodDataList, map[string]interface{}{
+			"app_spu_code": utils.Int2Str(v.SkuID),
+			"skus": []map[string]interface{}{
+				{
+					"sku_id":           utils.Int2Str(v.SkuID),
+					"ladder_box_num":   "0",
+					"ladder_box_price": "0",
+				},
+			},
+		})
+	}
+
+	count := utils.Float64TwoInt(math.Ceil(float64(len(foodDataList)) / float64(50)))
+	for i := 1; i <= count; i++ {
+		if i == count {
+			_, _ = api.RetailBatchInitData(ctx.GetTrackInfo(), storeDetail.VendorStoreID, foodDataList[(i-1)*50:])
+		} else {
+			_, _ = api.RetailBatchInitData(ctx.GetTrackInfo(), storeDetail.VendorStoreID, foodDataList[(i-1)*50:i*50])
+		}
+	}
+
+	return nil
+}