qt

BBWY.Client/BBWY.Client.csproj

@@ -10,6 +10,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>x64</PlatformTarget>
+    <DefineConstants>$(DefineConstants);Local</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<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="v10092" Margin="5,0,0,0"/>
+                <TextBlock Text="v10093" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Client/Views/PackTask/PrintWindow.xaml.cs

@@ -164,7 +164,7 @@ namespace BBWY.Client.Views.PackTask
             //args.PageSettings.PrinterSettings.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Custom", 236, 157);
             //args.PageSettings.PrinterSettings.DefaultPageSettings.Landscape = true;
 
-            Bitmap bitmap = new Bitmap(236,157);
+            //Bitmap bitmap = new Bitmap(236,157);
 #endif
 
             Font font = new Font("宋体", 6, System.Drawing.FontStyle.Regular);

BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@@ -7,6 +7,8 @@ using Newtonsoft.Json;
 using QuanTan.SDK.Client;
 using QuanTan.SDK.Model;
 using System.Linq;
+using static BBWY.Server.Model.Enums;
+
 namespace BBWY.Server.Business
 {
     public class QuanTanBusiness : PlatformSDKBusiness
@@ -22,31 +24,79 @@ namespace BBWY.Server.Business
         public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
         {
             var data = payPurchaseOrderRequest.PurchaseAccount;
-            var qtResponse = quanTanOrderClient.PayOrder(new  QuanTanPayOrderRequest { orderId= payPurchaseOrderRequest.OrderId,  
-                 userAccount= data.AccountName
+            var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
+            {
+                orderId = payPurchaseOrderRequest.OrderId,
+                userAccount = data.AccountName
             }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
-            if (qtResponse.Status != 200)
-                return new PayPurchaseOrderResponse
+            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true };
+
+            if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
+            {
+                var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
                 {
-                     Success = false, Msg=qtResponse.Message
-                };
+                    orderId = payPurchaseOrderRequest.OrderId,
+                    userAccount = data.AccountName
+                }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
+                if (res.Status == 200)
+                {
+                    PurchaseOrderState purchaseOrder= PurchaseOrderState.待发货;
+                    switch (res.Data.Status)
+                    {
+                        case -1:
+                            purchaseOrder = PurchaseOrderState.已取消;
+                            break;
+                        case 0:
+                            purchaseOrder = PurchaseOrderState.待发货;
+                            break;
+                        case 1:
+                            purchaseOrder = PurchaseOrderState.待收货;
+                            break;
+                        case 2:
+                           
+                        case 3:
+                            purchaseOrder = PurchaseOrderState.已完成;
+                            break;
+                    }
+                    return new PayPurchaseOrderResponse { Success = true , PurchaseOrderState= purchaseOrder };
+
+                }
+
+            }
+            if (qtResponse.Message != null && qtResponse.Message.Contains("已删除"))
+            {
+                return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.已取消 };
+            }
+            return new PayPurchaseOrderResponse
+            {
+                Success = false,
+                Msg = qtResponse.Message
+            };
+
 
-            return new PayPurchaseOrderResponse { Success = true };
 
         }
         public override CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
         {
 
-           var data = request.PurchaseAccount;
+            var data = request.PurchaseAccount;
 
             var qtResponse = quanTanOrderClient.CancelOrder(new QuanTanCancelOrderRequest
             {
                 orderId = request.OrderId,
                 userAccount = data.AccountName,
-                remark =request.Remark,
+                remark = request.Remark,
             }, request.PurchaseAccount.AppKey, request.PurchaseAccount.AppSecret);
-            if (qtResponse.Status != 200)
-                return new CancelPurchaseOrderResponse
+            if (qtResponse.Status == 200) return new CancelPurchaseOrderResponse { Success = true };
+
+
+
+
+            if (qtResponse.Message != null&&qtResponse.Message.Contains("已删除"))
+            {
+                return new CancelPurchaseOrderResponse { Success = true };
+            }
+            return new CancelPurchaseOrderResponse
                 {
                     Success = false,
                     Msg = qtResponse.Message
@@ -54,7 +104,7 @@ namespace BBWY.Server.Business
 
             //将数据库设置取消
 
-            return new CancelPurchaseOrderResponse { Success = true };
+            
         }
 
 
@@ -104,8 +154,8 @@ namespace BBWY.Server.Business
                 clientOrderId = createOnlinePurchaseOrderRequest.OrderId,
                 userAccount = createOnlinePurchaseOrderRequest.AppToken,
                 cartIds = createOnlinePurchaseOrderRequest.Extensions,
-                autoPay= createOnlinePurchaseOrderRequest.AutoPay,
-                remark=createOnlinePurchaseOrderRequest.Remark,
+                autoPay = createOnlinePurchaseOrderRequest.AutoPay,
+                remark = createOnlinePurchaseOrderRequest.Remark,
                 receipt = new QuanTanCreateOrderReceipt()
                 {
                     province = createOnlinePurchaseOrderRequest.Consignee.Province,

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -399,7 +399,7 @@ namespace BBWY.Server.Business
                 var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
 
                 fsql.Update<PurchaseOrderV2>(order)
-      .Set(a => a.OrderState,  Enums.PurchaseOrderState.待发货)
+      .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
       .ExecuteAffrows();
             }
 

BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderResponse.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using static BBWY.Server.Model.Enums;
 
 namespace BBWY.Server.Model.Dto
 {
@@ -8,6 +9,9 @@ namespace BBWY.Server.Model.Dto
     {
         public bool Success { get; set; }
 
+        public PurchaseOrderState PurchaseOrderState { get; set; }
+
         public string Msg { get; set; }
+
     }
 }