# 2022-02-09

### 1.3.5 开源社区版（会员专业版同步修改）：
无
### 0.1.5 会员专业版：
【升级】nuget升级常用组件到最新版本。
【修复】服务商品列表图片组件从image调整为u--image组件。#I4RUC6
【优化】规范coreshop-goods.vue组件for循环未定义key的问题。
【修复】修复因升级uview版本导致【商品选项卡goodTabBar组件】切换失效的问题。
【新增】微信自定义交易组件增加【商品审核结果回调】，【类目审核结果回调】微信服务器消息推送处理。
【优化】调整自定义交易组件sku价格为decimal(18, 2)类型，方便小数处理。
【优化】微信自定义交易组件增加图片同步至微信侧功能。
【优化】重命名一些方法名称大小写。
【新增】首页设计轮播图增加高度设置功能。#I4SWEA
【修复】优化在苹果6/7/8plus及安卓一些机型出现分享海报弹窗文字被遮挡的问题。#I4SWCA

CoreCms.Net.Services/Order/CoreCmsOrderServices.cs

@@ -25,13 +25,11 @@ using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.Basics;
-using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Model.ViewModels.DTO;
+using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.Utility.Helper;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Net.Http.Headers;
-using Microsoft.OpenApi.Validations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SqlSugar;
@@ -75,6 +73,11 @@ namespace CoreCms.Net.Services
         private readonly ISysTaskLogServices _taskLogServices;
         private readonly ICoreCmsPromotionRecordServices _promotionRecordServices;
         private readonly IRedisOperationRepository _redisOperationRepository;
+        private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
+        private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
+
+
+
 
         public CoreCmsOrderServices(ICoreCmsOrderRepository dal
             , IHttpContextAccessor httpContextAccessor
@@ -100,7 +103,7 @@ namespace CoreCms.Net.Services
             , ICoreCmsPaymentsServices paymentsServices
             , ICoreCmsBillRefundServices billRefundServices
             , ICoreCmsBillLadingServices billLadingServices
-            , ICoreCmsBillReshipServices billReshipServices, ICoreCmsMessageCenterServices messageCenterServices, ICoreCmsGoodsCommentServices goodsCommentServices, ISysTaskLogServices taskLogServices, ICoreCmsPromotionRecordServices promotionRecordServices, IRedisOperationRepository redisOperationRepository)
+            , ICoreCmsBillReshipServices billReshipServices, ICoreCmsMessageCenterServices messageCenterServices, ICoreCmsGoodsCommentServices goodsCommentServices, ISysTaskLogServices taskLogServices, ICoreCmsPromotionRecordServices promotionRecordServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices)
         {
             this._dal = dal;
             base.BaseDal = dal;
@@ -134,6 +137,8 @@ namespace CoreCms.Net.Services
             _taskLogServices = taskLogServices;
             _promotionRecordServices = promotionRecordServices;
             _redisOperationRepository = redisOperationRepository;
+            _userWeChatInfoServices = userWeChatInfoServices;
+            _tcOrderServices = tcOrderServices;
         }
 
 
@@ -246,6 +251,7 @@ namespace CoreCms.Net.Services
             order.status = (int)GlobalEnumVars.OrderStatus.Normal;
             order.confirmStatus = (int)GlobalEnumVars.OrderConfirmStatus.ReceiptNotConfirmed;
             order.createTime = DateTime.Now;
+            order.scene = scene;
 
             //开始事务处理
             await _dal.InsertAsync(order);
@@ -820,7 +826,7 @@ namespace CoreCms.Net.Services
                     if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break;
                 }
             }
-            //把退款金额和退货商品查出来
+            //把退款金额和退货商品查出来判断是否能进行售后
             AfterSalesVal(order, aftersaleLevel);
             //促销信息
             if (!string.IsNullOrEmpty(order.promotionList))
@@ -830,7 +836,7 @@ namespace CoreCms.Net.Services
 
             //发票信息
             var invoiceModel = await _invoiceServices.GetOrderInvoiceInfo(order.orderId);
-            if (invoiceModel != null && invoiceModel.status)
+            if (invoiceModel is { status: true })
             {
                 order.invoice = invoiceModel.data;
             }
@@ -844,6 +850,9 @@ namespace CoreCms.Net.Services
                 };
             }
 
+            order.tcOrder = await _tcOrderServices.QueryByClauseAsync(p => p.outOrderId == order.orderId);
+
+
             jm.status = true;
             jm.data = order;
             jm.msg = GlobalConstVars.GetDataSuccess;
@@ -853,9 +862,9 @@ namespace CoreCms.Net.Services
 
         #endregion
 
-        #region 把退款的金额和退货的商品数量保存起来
+        #region 把退款金额和退货商品查出来判断是否能进行售后
         /// <summary>
-        /// 把退款的金额和退货的商品数量保存起来
+        /// 把退款金额和退货商品查出来判断是否能进行售后
         /// </summary>
         /// <param name="order"></param>
         /// <param name="aftersaleLevel">取售后单的时候，售后单的等级，0：待审核的和审核通过的售后单，1未审核的，2审核通过的</param>
@@ -863,7 +872,7 @@ namespace CoreCms.Net.Services
         {
             var addAftersalesStatus = false;
             var res = _billAftersalesServices.OrderToAftersales(order.orderId, aftersaleLevel);
-            var resData = res.data as OrderToAftersalesDto;
+            var resData = res.data as OrderToAfterSalesDto;
             //已经退过款的金额
             order.refunded = resData.refundMoney;
             //算退货商品数量
@@ -1126,7 +1135,7 @@ namespace CoreCms.Net.Services
         /// 商家获取订单列表-微信小程序
         /// </summary>
         /// <returns></returns>
-        public async Task<WebApiCallBack> GetOrderPageByMerchant(string dateType, string[] date, int status = 0, int storeId = 0, int page = 1, int limit = 5)
+        public async Task<WebApiCallBack> GetOrderPageByMerchant(string dateType, string[] date, int status = 0, int receiptType = 0, int storeId = 0, int page = 1, int limit = 5)
         {
             var jm = new WebApiCallBack { status = true };
 
@@ -1139,6 +1148,12 @@ namespace CoreCms.Net.Services
                 where = where.And(p => p.storeId == storeId);
             }
 
+            if (receiptType > 0)
+            {
+                where = where.And(p => p.receiptType == receiptType);
+
+            }
+
 
             DateTime dt = DateTime.Now;
             if (dateType == "today")
@@ -1171,6 +1186,7 @@ namespace CoreCms.Net.Services
                 //本月第一天时间      
                 DateTime dtFirst = dt.AddDays(1 - (dt.Day));
                 dtFirst = new DateTime(dtFirst.Year, dtFirst.Month, dtFirst.Day, 0, 0, 0);
+
                 //获得某年某月的天数    
                 int dayCount = DateTime.DaysInMonth(dt.Date.Year, dt.Date.Month);
                 //本月最后一天时间    
@@ -1231,7 +1247,6 @@ namespace CoreCms.Net.Services
 
         #endregion
 
-
         #region 商家获取订单列表通过检索手机号码和订单号-微信小程序
         /// <summary>
         /// 商家获取订单列表通过检索手机号码和订单号-微信小程序
@@ -1296,6 +1311,7 @@ namespace CoreCms.Net.Services
 
         #endregion
 
+
         #region 订单支付
 
         /// <summary>
@@ -1329,15 +1345,14 @@ namespace CoreCms.Net.Services
                 order.paymentCode = paymentCode;
                 order.payStatus = (int)GlobalEnumVars.OrderPayStatus.Yes;
 
-                var isUpdate = await _dal.UpdateAsync(
-                    p => new CoreCmsOrder()
-                    {
-                        paymentCode = paymentCode,
-                        payStatus = (int)GlobalEnumVars.OrderPayStatus.Yes,
-                        paymentTime = order.paymentTime,
-                        payedAmount = order.orderAmount,
-                        updateTime = order.updateTime
-                    }, p => p.orderId == order.orderId);
+                var isUpdate = await _dal.UpdateAsync(p => new CoreCmsOrder()
+                {
+                    paymentCode = paymentCode,
+                    payStatus = (int)GlobalEnumVars.OrderPayStatus.Yes,
+                    paymentTime = order.paymentTime,
+                    payedAmount = order.orderAmount,
+                    updateTime = order.updateTime
+                }, p => p.orderId == order.orderId);
                 jm.data = isUpdate;
 
                 if (isUpdate)
@@ -1723,6 +1738,7 @@ namespace CoreCms.Net.Services
         }
         #endregion
 
+
         #region 构建单个需要发货的数据，和发货单密切关联
         /// <summary>
         /// 构建单个需要发货的数据，和发货单密切关联
@@ -1772,7 +1788,6 @@ namespace CoreCms.Net.Services
             }
             AfterSalesVal(orderInfo, 0);
 
-
             if (!jm.status)
             {
                 return jm;
@@ -1885,7 +1900,7 @@ namespace CoreCms.Net.Services
             Dictionary<int, int> items, string shipName, string shipMobile, string shipAddress, string memo, int storeId = 0, int shipAreaId = 0, string deliveryCompanyId = "")
         {
 
-            var result = await _billDeliveryServices.BatchShip(ids, logiCode, logiNo, items, storeId, shipName, shipMobile, shipAreaId, shipAddress, memo);
+            var result = await _billDeliveryServices.BatchShip(ids, logiCode, logiNo, items, storeId, shipName, shipMobile, shipAreaId, shipAddress, memo, deliveryCompanyId);
             return result;
 
         }
@@ -1911,14 +1926,12 @@ namespace CoreCms.Net.Services
         public async Task<WebApiCallBack> Ship(string orderId, string logiCode, string logiNo,
             Dictionary<int, int> items, string shipName, string shipMobile, string shipAddress, string memo, int storeId = 0, int shipAreaId = 0, string deliveryCompanyId = "")
         {
-            var result = await _billDeliveryServices.Ship(orderId, logiCode, logiNo, items, storeId, shipName, shipMobile, shipAreaId, shipAddress, memo);
+            var result = await _billDeliveryServices.Ship(orderId, logiCode, logiNo, items, storeId, shipName, shipMobile, shipAreaId, shipAddress, memo, deliveryCompanyId);
             return result;
 
         }
         #endregion
 
-
-
         #region 完成订单
 
         /// <summary>
@@ -1991,6 +2004,10 @@ namespace CoreCms.Net.Services
                 //订单完成结算订单
                 await _redisOperationRepository.SortedSetAddAsync(RedisMessageQueueKey.OrderFinishCommand, orderInfo.orderId, score);
 
+                // 微信自定义交易组件-订单确认收货
+                await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo));
+
+
                 jm.status = true;
                 jm.msg = "订单完成";
 
@@ -2026,12 +2043,19 @@ namespace CoreCms.Net.Services
             where = where.And(p => p.status == (int)GlobalEnumVars.OrderStatus.Normal);
             where = where.And(p => p.confirmStatus != (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt);
 
+            var orderInfo = await _dal.QueryByClauseAsync(where);
+            if (orderInfo == null)
+            {
+                jm.status = false;
+                jm.msg = "订单查询失败";
+            }
+
             var bl = await _dal.UpdateAsync(
                 p => new CoreCmsOrder()
                 {
                     confirmStatus = (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt,
                     confirmTime = DateTime.Now
-                }, where);
+                }, p => p.orderId == orderInfo.orderId);
             if (!bl)
             {
                 jm.msg = "确认收货失败";
@@ -2050,6 +2074,10 @@ namespace CoreCms.Net.Services
             };
             await _orderLogServices.InsertAsync(orderLog);
 
+
+            // 微信自定义交易组件-订单确认收货
+            await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo));
+
             jm.status = true;
             jm.msg = "确认收货成功";
 
@@ -2096,6 +2124,7 @@ namespace CoreCms.Net.Services
         }
         #endregion
 
+
         #region 重写根据条件列表数据
         /// <summary>
         ///     重写根据条件列表数据