pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

处理冲突

qianyi
shanji 3 years ago
parent
3bb766babc e6f61f928d
commit
a2c9556274
5 changed files with 48 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      BBWY.Client/APIServices/OrderService.cs
  2. 9
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  3. 4
      BBWY.Client/Views/MainWindow.xaml
  4. 10
      BBWY.Server.Business/Order/OrderBusiness.cs
  5. 20
      BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs

10
BBWY.Client/APIServices/OrderService.cs
View File

@ -127,6 +127,10 @@ namespace BBWY.Client.APIServices
decimal sdCommissionAmount, decimal sdCommissionAmount,
decimal deliveryExpressFreight, decimal deliveryExpressFreight,
SDType sdType, SDType sdType,
string sdKey,
PayBillType? sdPayChannel,
string sdPaybillNo,
string sdOperator,
string flag, string flag,
string venderRemark, string venderRemark,
decimal platformCommissionRatio) decimal platformCommissionRatio)
@ -141,6 +145,10 @@ namespace BBWY.Client.APIServices
sdCommissionAmount, sdCommissionAmount,
deliveryExpressFreight, deliveryExpressFreight,
platformCommissionRatio, platformCommissionRatio,
sdKey,
sdPayChannel,
sdPaybillNo,
sdOperator,
Platform = globalContext.User.Shop.Platform, Platform = globalContext.User.Shop.Platform,
AppKey = globalContext.User.Shop.AppKey, AppKey = globalContext.User.Shop.AppKey,
AppSecret = globalContext.User.Shop.AppSecret, AppSecret = globalContext.User.Shop.AppSecret,
@ -154,7 +162,7 @@ namespace BBWY.Client.APIServices
/// <param name="orderDropShipping"></param> /// <param name="orderDropShipping"></param>
/// <param name="relationPurchaseOrderSkuList"></param> /// <param name="relationPurchaseOrderSkuList"></param>
/// <returns></returns> /// <returns></returns>
public ApiResponse<object> RelationPurchaseOrder(OrderDropShipping orderDropShipping, IList<RelationPurchaseOrderSku> relationPurchaseOrderSkuList,decimal platformCommissionRatio) public ApiResponse<object> RelationPurchaseOrder(OrderDropShipping orderDropShipping, IList<RelationPurchaseOrderSku> relationPurchaseOrderSkuList, decimal platformCommissionRatio)
{ {
return SendRequest<object>(globalContext.BBYWApiHost, "api/order/RelationPurchaseOrder", new return SendRequest<object>(globalContext.BBYWApiHost, "api/order/RelationPurchaseOrder", new
{ {

9
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -380,13 +380,20 @@ namespace BBWY.Client.ViewModels
var sdType = sd.SDType; var sdType = sd.SDType;
var flag = sd.Flag; var flag = sd.Flag;
var venderRemark = sd.VenderRemark; var venderRemark = sd.VenderRemark;
var sdKey = sd.SDKey;
var sdPayChannel = sd.PayChannel;
var sdPaybillNo = sd.SdPayBillNo;
var sdOperator = sd.SdOperator;
IsLoading = true; IsLoading = true;
Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId, Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId,
isSetStorageType, isSetStorageType,
sdCommissionAmount, sdCommissionAmount,
deliveryExpressFreight, deliveryExpressFreight,
sdType.Value, sdType.Value,
sdKey,
sdPayChannel,
sdPaybillNo,
sdOperator,
flag, flag,
venderRemark, venderRemark,
globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M)) globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M))

4
BBWY.Client/Views/MainWindow.xaml
View File

@ -25,8 +25,8 @@
<TextBlock Text="{Binding GlobalContext.User.Name}"/> <TextBlock Text="{Binding GlobalContext.User.Name}"/>
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.Name}" Margin="5,0,0,0"/>
<TextBlock Text="v10018" Margin="5,0,0,0"/> <TextBlock Text="v10019" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

10
BBWY.Server.Business/Order/OrderBusiness.cs
View File

@ -294,6 +294,10 @@ namespace BBWY.Server.Business
WaybillNo = o.WaybillNo, WaybillNo = o.WaybillNo,
Flag = o.Flag, Flag = o.Flag,
SDType = o.SDType, SDType = o.SDType,
SDKey = o.SDKey,
SDOperator = o.SDOperator,
SDPayBillNo = o.SDPayBillNo,
SDPayChannel = o.SDPayChannel,
ContactName = ocs.ContactName, ContactName = ocs.ContactName,
Address = ocs.Address, Address = ocs.Address,
@ -642,7 +646,11 @@ namespace BBWY.Server.Business
orderUpdate = fsql.Update<Order>(sdCalculationCostRequest.OrderId).Set(o => o.SDType, sdCalculationCostRequest.SDType) orderUpdate = fsql.Update<Order>(sdCalculationCostRequest.OrderId).Set(o => o.SDType, sdCalculationCostRequest.SDType)
.Set(o => o.Flag, sdCalculationCostRequest.Flag) .Set(o => o.Flag, sdCalculationCostRequest.Flag)
.Set(o => o.VenderRemark, sdCalculationCostRequest.VenderRemark); .Set(o => o.VenderRemark, sdCalculationCostRequest.VenderRemark)
.Set(o => o.SDKey, sdCalculationCostRequest.SDKey)
.Set(o => o.SDPayBillNo, sdCalculationCostRequest.SDPayBillNo)
.Set(o => o.SDOperator, sdCalculationCostRequest.SDOperator)
.SetIf(sdCalculationCostRequest.SDPayChannel != null, o => o.SDPayChannel, sdCalculationCostRequest.SDPayChannel);
if (sdCalculationCostRequest.IsSetStorageType) if (sdCalculationCostRequest.IsSetStorageType)
orderUpdate = orderUpdate.Set(o => o.StorageType, Enums.StorageType.SD); orderUpdate = orderUpdate.Set(o => o.StorageType, Enums.StorageType.SD);

20
BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs
View File

@ -12,6 +12,26 @@
public Enums.SDType SDType { get; set; } public Enums.SDType SDType { get; set; }
/// <summary>
/// 刷单关键词
/// </summary>
public string SDKey { get; set; }
/// <summary>
/// 刷单支付渠道
/// </summary>
public Enums.PayChannelType? SDPayChannel { get; set; }
/// <summary>
/// 刷单交易账单号
/// </summary>
public string SDPayBillNo { get; set; }
/// <summary>
/// 刷单人
/// </summary>
public string SDOperator { get; set; }
/// <summary> /// <summary>
/// 刷单佣金 /// 刷单佣金
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save