处理冲突

BBWY.Client/APIServices/OrderService.cs

@@ -127,6 +127,10 @@ namespace BBWY.Client.APIServices
                                                      decimal sdCommissionAmount,
                                                      decimal deliveryExpressFreight,
                                                      SDType sdType,
+                                                     string sdKey,
+                                                     PayBillType? sdPayChannel,
+                                                     string sdPaybillNo,
+                                                     string sdOperator,
                                                      string flag,
                                                      string venderRemark,
                                                      decimal platformCommissionRatio)
@@ -141,6 +145,10 @@ namespace BBWY.Client.APIServices
                 sdCommissionAmount,
                 deliveryExpressFreight,
                 platformCommissionRatio,
+                sdKey,
+                sdPayChannel,
+                sdPaybillNo,
+                sdOperator,
                 Platform = globalContext.User.Shop.Platform,
                 AppKey = globalContext.User.Shop.AppKey,
                 AppSecret = globalContext.User.Shop.AppSecret,
@@ -154,7 +162,7 @@ namespace BBWY.Client.APIServices
         /// <param name="orderDropShipping"></param>
         /// <param name="relationPurchaseOrderSkuList"></param>
         /// <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
             {

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

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

BBWY.Client/Views/MainWindow.xaml

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

BBWY.Server.Business/Order/OrderBusiness.cs

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

BBWY.Server.Model/Dto/Request/Order/SDCalculationCostRequest.cs

@@ -12,6 +12,26 @@
 
         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>