Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Module.Product/GuideCarModule.cs

@@ -3869,6 +3869,7 @@ namespace Mall.Module.Product
                 PaymentWayName = model.PaymentWay.GetEnumName(),
                 model.DeliveryMethod,
                 DeliveryMethodName = model.DeliveryMethod.GetEnumName(),
+                CarTypeStr =  model.CarType.GetEnumName(),
                 model.PreferPrice,
                 model.Income,
                 model.CouponMoney,
@@ -3908,7 +3909,10 @@ namespace Mall.Module.Product
                     x.GuideWorkYears,
                     x.CarId,
                     x.GuideId,
-                    x.OrderId
+                    x.OrderId,
+                    x.InsuranceMoney,
+                    x.IntegralNumber,
+                    x.IntegralMoney
                 }),
                 model.IsApplyForCancel,
                 model.RejectRemark,

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -990,7 +990,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
                 where += $@" and g.{nameof(RB_Goods_Extend.CarType)}={(int)dmodel.CarType}";
                 if (dmodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.Line)
                 {
-                    if (dmodel.IsSpell > 0)
+                    if (dmodel.IsSpell ==1)
                     {
                         where += $@" and g.{nameof(RB_Goods_Extend.IsSpell)}={dmodel.IsSpell}";
                     }

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -3435,6 +3435,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.PlatformSource,
                 x.TenantId,
                 x.MallBaseId,
+                x.OrderDetailId,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -243,7 +243,9 @@ namespace Mall.WebApi.Controllers.User
                 x.CostFinanceId,
                 x.FreightFinanceId,
                 x.Id,
-                x.OrderId
+                x.OrderId,
+                x.InsuranceCostMoney,
+                x.InsuranceFinanceId
             });
             return ApiResult.Success("", pagelist);
         }
@@ -347,16 +349,16 @@ namespace Mall.WebApi.Controllers.User
                             {
                                 FinanceType = 3,
                                 Final_Price = orderGoodsItem.Final_Price,
-                                Number = 1,
+                                Number = orderGoodsItem.Number,
                                 FreightMoney = orderGoodsItem.FreightMoney,
                                 GoodsName = orderGoodsItem.GoodsName,
                                 OrderNo = orderGoodsItem.OrderNo,
                                 Id = orderGoodsItem.Id,
                                 CostMoney = orderGoodsItem.CostMoney,
                                 FreightCostMoney = orderGoodsItem.FreightCostMoney,
-                                InsuranceCostMoney = orderGoodsItem.InsuranceCostMoney
+                                InsuranceCostMoney = ((orderGoodsItem.InsuranceCostMoney ?? 0) / (orderGoodsItem.Number ?? 1))
                             };
-                            OrderDetailPaid += ((orderGoodsItem.InsuranceCostMoney ?? 0) * (orderGoodsItem.Number ?? 0));
+                            OrderDetailPaid += (orderGoodsItem.InsuranceCostMoney ?? 0);
                             result.Add(newOrderGoods);
                         }
                     }
@@ -380,7 +382,7 @@ namespace Mall.WebApi.Controllers.User
                         Unit_Price = orderGoodsItem.CostMoney,
                         Number = orderGoodsItem.Number,
                         OrderDetailPaid = OrderDetailPaid,
-                        InsuranceCostMoney = ((orderGoodsItem.InsuranceCostMoney ?? 0) * (orderGoodsItem.Number ?? 0)),
+                        InsuranceCostMoney = (orderGoodsItem.InsuranceCostMoney ?? 0),
                     };
                     record.RecordDetailList.Add(financeRecordDetail);
 
@@ -423,7 +425,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 else if (demodel.IsSelectAll == 3)
                 {
-                    totalMonry = result.Where(x => x.FinanceType == 2).Sum(x => ((x.InsuranceCostMoney ?? 0) * (x.Number ?? 0)));
+                    totalMonry = result.Where(x => x.FinanceType == 3).Sum(x => ((x.InsuranceCostMoney ?? 0) * (x.Number ?? 0)));
                 }
                 var financeObj = new
                 {