1

gx_api/GxPress/Api/GxPress.Api/WebControllers/WxpayController.cs

@@ -41,31 +41,31 @@ namespace GxPress.Api.WebControllers
             if (!notifyData.IsSet("transaction_id"))
             {
                 //若transaction_id不存在，则立即返回结果给微信支付后台
-                notifyData = new WxPayData();
-                notifyData.SetValue("return_code", "FAIL");
-                notifyData.SetValue("return_msg", "支付结果中微信订单号不存在");
-                return (notifyData.ToXml());
+                var res = new WxPayData();
+                res.SetValue("return_code", "FAIL");
+                res.SetValue("return_msg", "支付结果中微信订单号不存在");
+                return (res.ToXml());
             }
             string transaction_id = notifyData.GetValue("transaction_id").ToString();
             //查询订单，判断订单真实性
             if (!Common.WechatPay.WxPayApi.QueryOrder(transaction_id))
             {
                 //若订单查询失败，则立即返回结果给微信支付后台
-                notifyData = new WxPayData();
-                notifyData.SetValue("return_code", "FAIL");
-                notifyData.SetValue("return_msg", "订单查询失败");
-                return (notifyData.ToXml());
+                var res = new WxPayData();
+                res.SetValue("return_code", "FAIL");
+                res.SetValue("return_msg", "订单查询失败");
+                return (res.ToXml());
             }
             //查询订单成功
             else
             {
-                notifyData = new WxPayData();
+                var res = new WxPayData();
                 //创建订单
                 if (await orderService.InsertWxOrderAsync(notifyData))
                 {
-                    notifyData.SetValue("return_code", "SUCCESS");
-                    notifyData.SetValue("return_msg", "OK");
-                    return (notifyData.ToXml());
+                    res.SetValue("return_code", "SUCCESS");
+                    res.SetValue("return_msg", "OK");
+                    return (res.ToXml());
                 }
             }
             notifyData = new WxPayData();

gx_api/GxPress/Repository/GxPress.Repository.Implement/Media/MediaRepository.cs

@@ -334,5 +334,10 @@ namespace GxPress.Repository.Implement.Media
         {
             return await _repository.CountAsync(query);
         }
+
+        public async Task<Entity.tede2.Media.Media> GetAsync(string autoNumber)
+        {
+            return await _repository.GetAsync(Q.Where(nameof(Entity.tede2.Media.Media.AutoNumber), autoNumber));
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Media/IMediaRepository.cs

@@ -6,15 +6,16 @@ using GxPress.Result.Media;
 
 namespace GxPress.Repository.Interface.Media
 {
-    public interface IMediaRepository:IRepository
+    public interface IMediaRepository : IRepository
     {
-         Task<MediaResult> GetAsync(int id);
+        Task<MediaResult> GetAsync(int id);
+        Task<Entity.tede2.Media.Media> GetAsync(string autoNumber);
         /// <summary>
         /// 删除
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-         Task<bool> DeleteAsync(int id);
+        Task<bool> DeleteAsync(int id);
         /// <summary>
         /// 添加媒体
         /// </summary>
@@ -22,8 +23,8 @@ namespace GxPress.Repository.Interface.Media
         /// <returns></returns>
         Task<bool> InsertAsync(MediaResult result);
 
-         Task<bool> UpdateAsync(MediaResult result);
-       Task<bool> UpdateAsync(SqlKata.Query query);
+        Task<bool> UpdateAsync(MediaResult result);
+        Task<bool> UpdateAsync(SqlKata.Query query);
 
         Task<PagedList<Entity.tede2.Media.Media>> GetAllAsync(MediaSearchRequest request);
         Task<int> CountAsync(string beginTime, string endTiem);

gx_api/GxPress/Service/GxPress.Service.Implement/Order/OrderService.cs

@@ -2,15 +2,22 @@ using System.Threading.Tasks;
 using GxPress.Common.WechatPay;
 using GxPress.Repository.Interface.Order;
 using GxPress.Service.Interface.Order;
+using GxPress.Repository.Interface.Media;
+using GxPress.Repository.Interface;
+using System;
 
 namespace GxPress.Service.Implement.Order
 {
     public class OrderService : IOrderService
     {
         private readonly IOrderRepository orderRepository;
-        public OrderService(IOrderRepository orderRepository)
+        private readonly IMediaRepository mediaRepository;
+        private readonly IUserRepository userRepository;
+        public OrderService(IOrderRepository orderRepository, IMediaRepository mediaRepository, IUserRepository userRepository)
         {
             this.orderRepository = orderRepository;
+            this.mediaRepository = mediaRepository;
+            this.userRepository = userRepository;
         }
         /// <summary>
         /// 创建微信订单
@@ -21,7 +28,28 @@ namespace GxPress.Service.Implement.Order
         {
             var order = new Entity.Order.Order();
             var attach = data.GetValue("attach").ToString();
-            return await orderRepository.InsertAsync(order) > 0;
+            if (attach.Split('_').Length > 0)
+            {
+                //获取medio属性
+                var media = await mediaRepository.GetAsync(attach.Split('_')[0]);
+                //获取用户数据
+                var user = await userRepository.GetAsync(int.Parse(attach.Split('_')[1]));
+                order.OutTradeNo = data.GetValue("out_trade_no").ToString();
+                order.OrderType = 1;
+                order.IsRefund = false;
+                order.IsSuccess = true;
+                order.IsVip = user.IsVip;
+                order.MediaId = media.Id;
+                order.Explain=media.Title;
+                order.Name = user.Name;
+                order.OrderNumber = DateTime.Now.Ticks.ToString();
+                order.Price =Decimal.Parse(data.GetValue("total_fee").ToString())/100;
+                order.TransactionId = data.GetValue("transaction_id").ToString();
+                order.UserId = user.Id;
+                order.PayWay = 1;
+                return await orderRepository.InsertAsync(order) > 0;
+            }
+            return false;
         }
     }
 }