订单取消调整

Mall.Module.Product/OrderModule.cs

@@ -5875,7 +5875,8 @@ namespace Mall.Module.Product
                     TripSTime = item.TripSTime,
                     UseDay = item.UseDay,
                     InsuranceMoney = item.InsuranceMoney,
-                    InsuranceCostMoney = item.InsuranceCostMoney
+                    InsuranceCostMoney = item.InsuranceCostMoney,
+                    InsuranceFinanceId = 0
                 }, trans);
                 item.Id = detailId;
                 if (detailId > 0 && SatisfiedGoodsList.Any())
@@ -5900,7 +5901,8 @@ namespace Mall.Module.Product
                         }, trans);
                     }
                 }
-
+                if (IsSDGoods == false)
+                {
                     //更新商品数量
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                             { nameof(RB_Goods.InventoryNum),item.InventoryNum-(item.Number??0)}
@@ -5967,6 +5969,7 @@ namespace Mall.Module.Product
                             TenantId = demodel.TenantId
                         }, trans);
                     }
+                }
 
                 #region 更新司导商品预约时间
                 if (IsSDGoods) {
@@ -8690,6 +8693,74 @@ namespace Mall.Module.Product
                                     };
                                     goods_SpecificationPriceRepository.Update(keyValues2, wheres2, trans);
                                 }
+                                if (item.OrderType == OrderTypeEnum.SDGoods)
+                                {
+                                    //更新商品可预定日期
+                                    var tdlist = goods_TargetDateRepository.GetList(new RB_Goods_TargetDate_Extend() { GoodsId = item.GoodsId ?? 0, StartTime = item.TripSTime.Value.ToString("yyyy-MM-dd"), EndTime = item.TripETime.Value.ToString("yyyy-MM-dd") });
+                                    if (item.CarType == GuideCarGoodsTypeEnum.Line && item.IsSpell == 1)
+                                    {
+                                        //只调整第一天的   其他天 直接表示已预订了
+                                        var fristModel = tdlist.Where(x => x.Date == Convert.ToDateTime(item.TripSTime.Value.ToString("yyyy-MM-dd"))).FirstOrDefault();
+                                        //第一条更新数量  如果OK咯  更新已预定
+                                        if (fristModel != null)
+                                        {
+                                            Dictionary<string, object> keyValues1 = new Dictionary<string, object>
+                                        {
+                                            { nameof(RB_Goods_TargetDate.IsReserve), 1 },
+                                            { nameof(RB_Goods_TargetDate.ReserveNum), (fristModel.ReserveNum) - (item.Number ?? 0) }
+                                        };
+
+                                            List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                                            new WhereHelper(){
+                                                    FiledName=nameof(RB_Goods_TargetDate.Id),
+                                                    FiledValue=fristModel.Id,
+                                                    OperatorEnum=OperatorEnum.Equal
+                                            }
+                                        };
+                                            goods_TargetDateRepository.Update(keyValues1, wheres1, trans);
+                                            if ((fristModel.ReserveNum) - (item.Number ?? 0) <= 0)
+                                            {
+                                                //其他的直接改未预定
+                                                foreach (var qitem in tdlist.Where(x => x.Date != Convert.ToDateTime(item.TripSTime.Value.ToString("yyyy-MM-dd")) && x.IsReserve == 2))
+                                                {
+                                                    Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
+                                                    { nameof(RB_Goods_TargetDate.IsReserve),1},
+                                                    { nameof(RB_Goods_TargetDate.ReserveNum),0},
+                                                };
+                                                    List<WhereHelper> wheres2 = new List<WhereHelper>() {
+                                                    new WhereHelper(){
+                                                            FiledName=nameof(RB_Goods_TargetDate.Id),
+                                                            FiledValue=qitem.Id,
+                                                            OperatorEnum=OperatorEnum.Equal
+                                                    }
+                                                };
+                                                    goods_TargetDateRepository.Update(keyValues2, wheres2, trans);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        //直接回滚所有的日期 为可预定
+                                        foreach (var qitem in tdlist)
+                                        {
+                                            Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                                            { nameof(RB_Goods_TargetDate.IsReserve),1},
+                                            { nameof(RB_Goods_TargetDate.ReserveNum),0},
+                                        };
+                                            List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                                            new WhereHelper(){
+                                                 FiledName=nameof(RB_Goods_TargetDate.Id),
+                                                  FiledValue=qitem.Id,
+                                                   OperatorEnum=OperatorEnum.Equal
+                                            }
+                                        };
+                                            goods_TargetDateRepository.Update(keyValues1, wheres1, trans);
+                                        }
+                                    }
+                                }
+                                else
+                                {
                                     //更新商品表库存
                                     Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
                                         { nameof(RB_Goods.InventoryNum), (gmodel.InventoryNum??0)+(item.Number??0)}
@@ -8702,6 +8773,7 @@ namespace Mall.Module.Product
                                         }
                                     };
                                     goodsRepository.Update(keyValues1, wheres1, trans);
+                                }
                                 goods_LogRepository.Insert(new RB_Goods_Log()
                                 {
                                     Id = 0,
@@ -10700,6 +10772,7 @@ namespace Mall.Module.Product
                     x.FreeShippingRemarks,
                     x.SmallShopsCostPrice,
                     CouponMoney = x.CouponMoney ?? 0,
+                    InsuranceMoney = x.InsuranceMoney ?? 0,
                     IntegralMoney = x.IntegralMoney ?? 0,
                     IntegralNumber = x.IntegralNumber ?? 0,
                 })

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -252,7 +252,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.Final_Price,
                     y.Number,
                     y.IsComment,
-                    y.FreeShippingRemarks
+                    y.FreeShippingRemarks,
+                    InsuranceMoney = y.InsuranceMoney ?? 0
                 }),
                 x.OrderStatus,
                 OrderStatusName = x.OrderStatus.GetEnumName(),

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -132,6 +132,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.YFMoney,
                     y.PayMoney,
                     CouponMoney = y.CouponMoney ?? 0,
+                    InsuranceMoney = y.InsuranceMoney ?? 0,
+                    InsuranceCostMoney = y.InsuranceCostMoney ?? 0,
                     IntegralMoney = y.IntegralMoney ?? 0,
                     IntegralNumber = y.IntegralNumber ?? 0,
                     SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new