From 4c6d717ba17e11a7a4fb9ef9be5ffbc4dd18dc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 18 Jan 2021 18:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=AF=9B=E9=92=B1=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Hncore.Pass.Vpn/Service/ProductOrderService.cs    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 4735655..cf7c8b6 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -223,6 +223,9 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             var ProductAccountCount = userEntity.ProductAccountCount;
 
             var is_verify = userEntity.is_verify;   
+            
+
+            
 
             if (is_verify == 0)
             {
@@ -234,8 +237,10 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             if (userPrice != null && userPrice.UserPrice > 0)
                 price = userPrice.UserPrice;
 
-            if (ProductAccountCount == 0 && packageEntity.DayCount == 1  && packageEntity.ProductId!=5 && request.ConnectCount == 1){
+            if (ProductAccountCount == 0 && packageEntity.DayCount == 1  && packageEntity.ProductId!=5 && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){
                 price = 0.1M;
+                userEntity.ProductAccountCount = 1;
+                await m_UserService.Update(userEntity);
             }
             var order = new ProductOrderEntity()
             {
@@ -304,10 +309,6 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             
             if (ret.Code != ResultCode.C_SUCCESS) return ret;
             
-            if (order.AccountPayAmount == 0.1M){
-                userEntity.ProductAccountCount = 1;
-                await m_UserService.Update(userEntity);
-            }
             using (var tran = await m_DbContext.Database.BeginTransactionAsync())
             {
                 try