1

business/jxcallback/orderman/order.go

@@ -764,6 +764,11 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 			if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
 				skuBindInfo := skumapper[v.VendorSkuID]
 				if skuBindInfo == nil {
+					// 商品直接在美团创建,本地不存在商品信息,且为美团商品.如果门店是报价门店则获取商品的进货价
+					//if v.ShopPrice == model.NO && v.VendorID == model.VendorIDMTWM && order.OrderPayPercentage >= 50 {
+					//
+					//}
+
 					if v.ShopPrice == 0 {
 						v.ShopPrice = v.SalePrice * 70 / 100
 					}

business/jxcallback/orderman/orderman_ext.go

@@ -717,12 +717,21 @@ func (c *OrderManager) GetLogisticsOrderStatusList(orderId, LogisticsId string,
 func (c *OrderManager) GetWayBillStatusList(orderId, LogisticsId string, vendorId int) ([]*model.OrderStatus, error) {
 	sql := `SELECT *
 	FROM order_status t1
-	WHERE t1.vendor_order_id = ? AND t1.ref_vendor_order_id = ? AND t1.vendor_id = ?`
-	sqlParams := []interface{}{
-		LogisticsId,
-		orderId,
-		vendorId,
+	WHERE 1=1 `
+	sqlParams := make([]interface{}, 0, 0)
+	if LogisticsId != "" {
+		sql += ` AND t1.vendor_order_id = ? `
+		sqlParams = append(sqlParams, LogisticsId)
 	}
+	if orderId != "" {
+		sql += ` AND t1.ref_vendor_order_id = ? `
+		sqlParams = append(sqlParams, orderId)
+	}
+	if vendorId != 0 {
+		sql += ` AND t1.vendor_id = ? `
+		sqlParams = append(sqlParams, vendorId)
+	}
+
 	sql += ` ORDER BY status_time ASC `
 	var result []*model.OrderStatus
 	if err := dao.GetRows(dao.GetDB(), &result, sql, sqlParams...); err != nil {