页面修改

Mall.Module.Product/OrderModule.cs

@@ -5613,12 +5613,11 @@ namespace Mall.Module.Product
                 {
                     demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付
                 }
-                
                 demodel.Remark ??= "";
                 demodel.ApplyForCancelStatus ??= 0;
                 if (demodel.Income == 0)
                 {
-                    demodel.OrderStatus = OrderStatusEnum.Completed;
+                    demodel.OrderStatus = OrderStatusEnum.WaitReceiving;
                     demodel.PaymentTime = DateTime.Now;
                     demodel.DeliveryTime = DateTime.Now;
                     demodel.ReceivingTime = DateTime.Now;

Mall.Module.Product/ProductModule.cs

@@ -3617,10 +3617,29 @@ namespace Mall.Module.Product
             }
 
             #endregion
+
+            var minModel =new RB_MiniProgramRepository().GetMiniProgramRepository(new RB_MiniProgram_Extend()
+            {
+                MallBaseId = MallBaseId
+            });
+            //订阅
+            List<string> template_message_list = new List<string>();
+            if (minModel != null)
+            {
+                if (!string.IsNullOrWhiteSpace(minModel.OrderSuccessTpl))
+                {
+                    template_message_list.Add(minModel.OrderSuccessTpl);
+                }
+                if (!string.IsNullOrWhiteSpace(minModel.OrderCancelTpl))
+                {
+                    template_message_list.Add(minModel.OrderCancelTpl);
+                }
+            }
             return new
             {
                 goods = new
                 {
+                    template_message_list,
                     id = model.Id,
                     mall_id = model.MallBaseId,
                     mch_id = model.TenantId,//暂  商户id

Mall.Module.Reserve/OfflineGoodsModule.cs

@@ -1302,11 +1302,14 @@ namespace Mall.Module.Product
                 if (list.FirstOrDefault().OrderDetailId > 0)
                 {
                     //更新订单商品为已评价
-                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() 
+                    {
                         { nameof(RB_Goods_OrderDetail.IsComment),1}
                     };
-                    List<WhereHelper> wheres = new List<WhereHelper>() {
-                        new WhereHelper(){
+                    List<WhereHelper> wheres = new List<WhereHelper>()
+                    {
+                        new WhereHelper()
+                        {
                              FiledName=nameof(RB_Goods_OrderDetail.Id),
                              FiledValue=list.FirstOrDefault().OrderDetailId,
                              OperatorEnum=OperatorEnum.Equal
@@ -1330,11 +1333,14 @@ namespace Mall.Module.Product
                         if (carScore > 0)//更新车辆的评分
                         {
                             //更新订单商品为已评价
-                            Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() {
+                            Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() 
+                            {
                                 { nameof(RB_Goods.CourseScore),Math.Round(carScore,1, MidpointRounding.AwayFromZero)}
                             };
-                            List<WhereHelper> wheresCar = new List<WhereHelper>() {
-                                new WhereHelper(){
+                            List<WhereHelper> wheresCar = new List<WhereHelper>() 
+                            {
+                                new WhereHelper()
+                                {
                                      FiledName=nameof(RB_Goods.Id),
                                      FiledValue=dmodel.GoodsId,
                                      OperatorEnum=OperatorEnum.Equal
@@ -1359,11 +1365,14 @@ namespace Mall.Module.Product
                         if (guidScore > 0)//更新车辆的评分
                         {
                             //更新订单商品为已评价
-                            Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() {
+                            Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() 
+                            {
                                 { nameof(RB_Reserve_ServicePersonal.Score),Math.Round(guidScore,1, MidpointRounding.AwayFromZero)}
                             };
-                            List<WhereHelper> wheresCar = new List<WhereHelper>() {
-                                new WhereHelper(){
+                            List<WhereHelper> wheresCar = new List<WhereHelper>()
+                            {
+                                new WhereHelper()
+                                {
                                      FiledName=nameof(RB_Reserve_ServicePersonal.ID),
                                      FiledValue=dmodel.ServicepersonalId,
                                      OperatorEnum=OperatorEnum.Equal

Mall.WebApi/Controllers/BaseController.cs

@@ -75,7 +75,6 @@ namespace Mall.WebApi.Controllers
             get {
                 var parm = this.RequestParm;
                 AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
-               // AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
                 return userInfo;
             }
         }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -745,7 +745,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.DestinationAddress ??= "";
             #endregion
             bool flag= orderModule.SetAppletOfflineGoodsOrderModule(demodel,out string message);
-            return flag ? ApiResult.Success(message: message,data: new { demodel.OrderId }) : ApiResult.Failed(message: message);
+            return flag ? ApiResult.Success(message: message,data: new { demodel.OrderId}) : ApiResult.Failed(message: message);
         }
 
         /// <summary>

Mall.WebApi/Controllers/Reserve/AppletStoresController.cs

@@ -850,10 +850,10 @@ namespace Mall.WebApi.Controllers.Reserve
                 {
                     return ApiResult.ParamIsNull("请传递商品");
                 }
-                if (list.Where(x => x.ServicePersonalId > 0).Count() == 0)
-                {
-                    return ApiResult.ParamIsNull("请传递服务人员信息");
-                }
+                //if (list.Where(x => x.ServicePersonalId > 0).Count() == 0)
+                //{
+                //    return ApiResult.ParamIsNull("请传递服务人员信息");
+                //}
             }
             else
             {