订单结算价测试

business/partner/purchase/mtwm/order.go

@@ -232,6 +232,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 	}
 	ignoreSkuMap := make(map[int]int)
 	// detail := result["detail"].([]interface{})
+	multiSkuMap := make(map[int]int)
 	for _, product := range detail {
 		// product := product2.(map[string]interface{})
 		skuName := product["food_name"].(string)
@@ -264,6 +265,12 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		// 	sku.SkuType = 1
 		// }
 		order.Skus = append(order.Skus, sku)
+		multiSkuMap[sku.SkuID]++
+	}
+	for _, v := range order.Skus {
+		if multiSkuMap[v.SkuID] > 1 && v.SalePrice == v.VendorPrice {
+			v.IsVendorAct = model.YES
+		}
 	}
 
 	jxutils.RefreshOrderSkuRelated(order)

business/partner/purchase/yb/store_sku.go

@@ -101,6 +101,9 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 		if len(storeSkuList) == 1 {
 			storeSku := storeSkuList[0]
 			result, err := api.YinBaoAPI.QueryProductByBarcode(storeSku.VendorSkuID)
+			if err != nil || result == nil {
+				return nil, err
+			}
 			resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(result.Barcode)
 			// resultp, err := getProductImages(vendorStoreID, storeSku.VendorSkuID)
 			if err != nil {