1

business/model/api_config.go

@@ -31,7 +31,8 @@ const (
 	VendorIDMTPS          = 102 // 美团配送
 	VendorIDFengNiao      = 103 // 蜂鸟配送
 	VendorJXFakeWL        = 300 // 京西假物流
-	VendorIDJDWL          = 401 //京东物流
+	VendorIDJDWL          = 401 // 京东物流
+	VendorIDTotalWl       = 402 // (综合物流[京东,圆通,申通....])
 	VendorIDDeliveryEnd   = 500
 
 	VendorIDPrinterBegin = 201

business/model/dao/store_sku.go

@@ -687,8 +687,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
-	globals.SugarLogger.Debugf("==========sql:=  %s", sql)
-	globals.SugarLogger.Debugf("==========sqlParams:=  %s", utils.Format4Output(sqlParams, false))
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}

business/model/dao/thing_map.go

@@ -63,6 +63,14 @@ func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64) (cats []*mo
 	return cats, err
 }
 
+// DeleteThingToTiktokMapList 删除同步关联关系
+func DeleteThingToTiktokMapList(vendorId int, vendorThingId string) error {
+	sql := ` DELETE FROM thing_map t1 WHERE vendor_thing_id = ? AND vendor_id = ? `
+	param := []interface{}{vendorThingId, vendorId}
+	_, err := ExecuteSQL(GetDB(), sql, param...)
+	return err
+}
+
 func GetThingMapMap(db *DaoDB, thingType int, vendorIDs, thingIDs []int) (thingMapMap map[int64][]*model.ThingMap, err error) {
 	thingMapList, err := GetThingMapList(db, thingType, vendorIDs, thingIDs, nil)
 	if err == nil {

business/model/order.go

@@ -289,6 +289,13 @@ func (v *OrderStatus) TableIndex() [][]string {
 	}
 }
 
+// 更新物料订单物流信息
+type UpdateMaterialLogistic struct {
+	OrderId     string `json:"orderId"`     // 订单id
+	LogisticId  string `json:"logisticId"`  // 物料订单id
+	LogisticFee int64  `json:"logisticFee"` // 物流价格 分
+}
+
 func Order2Status(order *GoodsOrder) (retVal *OrderStatus) {
 	retVal = &OrderStatus{
 		VendorOrderID:    order.VendorOrderID,