diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
index 203851a6..041827f6 100644
--- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs
+++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
@@ -36,5 +36,16 @@ namespace BBWY.Server.API.Controllers
{
return batchPurchaseBusiness.PreviewOrder(request);
}
+
+ ///
+ /// 批量创建采购单
+ ///
+ ///
+ ///
+ [HttpPost]
+ public BatchCreareOrderResponse BatchCreateOrder([FromBody] BatchPurchaseCreateOrderRequest request)
+ {
+ return batchPurchaseBusiness.BatchCreateOrder(request);
+ }
}
}
diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index 1f89c33c..fe3ae388 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -3,6 +3,7 @@ using BBWY.Common.Models;
using BBWY.Server.Model;
using BBWY.Server.Model.Dto;
using Microsoft.Extensions.Caching.Memory;
+using Newtonsoft.Json;
using QuanTan.SDK.Client;
using QuanTan.SDK.Model;
using System;
@@ -74,20 +75,27 @@ namespace BBWY.Server.Business
address = createOnlinePurchaseOrderRequest.Consignee.Address,
phone = createOnlinePurchaseOrderRequest.Consignee.Mobile,
realName = createOnlinePurchaseOrderRequest.Consignee.ContactName
- }
+ },
+ extended = JsonConvert.SerializeObject(new
+ {
+ BuyerAccount = createOnlinePurchaseOrderRequest.AppToken,
+ createOnlinePurchaseOrderRequest.SourceSku,
+ createOnlinePurchaseOrderRequest.SourceShopName
+ })
};
var qtResponse = quanTanOrderClient.CreateOrder(quantanCreateOrderRequest, createOnlinePurchaseOrderRequest.AppKey, createOnlinePurchaseOrderRequest.AppSecret);
if (qtResponse.Status != 200)
throw new BusinessException(qtResponse.Message);
var payStatus = !string.IsNullOrEmpty(qtResponse.Data.PayStatus) ? qtResponse.Data.PayStatus.ToLower() : string.Empty;
- if (payStatus != "success")
- throw new BusinessException($"拳探账户余额不足,支付失败,请前往拳探进行手动支付");
+ //if (payStatus != "success")
+ // throw new BusinessException($"拳探账户余额不足,支付失败,请前往拳探进行手动支付");
+
- //对接支付接口
return new CreateOnlinePurchaseOrderResponse()
{
- PurchaseOrderId = qtResponse.Data.OrderId
+ PurchaseOrderId = qtResponse.Data.OrderId,
+ IsPay = payStatus == "success"
};
}
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index a7f9edb0..ba729f2c 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -1,4 +1,5 @@
using BBWY.Common.Models;
+using BBWY.Server.Model;
using BBWY.Server.Model.Db;
using BBWY.Server.Model.Dto;
using Newtonsoft.Json;
@@ -104,6 +105,12 @@ namespace BBWY.Server.Business
return list;
}
+ ///
+ /// 预览订单
+ ///
+ ///
+ ///
+ ///
public PreviewOrderResponse PreviewOrder(BatchPurchasePreviewOrderRequest request)
{
/*
@@ -120,7 +127,7 @@ namespace BBWY.Server.Business
if (request.PurchaseAccountList == null || request.PurchaseAccountList.Count() == 0)
throw new BusinessException("缺少采购账号");
- var purchaserGroups = request.ProductParamList.GroupBy(p => p.PurchaserId);
+ var skuGroups = request.ProductParamList.GroupBy(p => p.BelongSkuId);
var carIds = new List