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

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -139,7 +139,7 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public List<string> SpecificationNameList { get; set; }
         /// <summary>
-        /// 是否申请售后
+        /// 是否申请售后   1是
         /// </summary>
         public int? IsApplyForAfterSale { get; set; }
 

Mall.Module.Product/OrderModule.cs

@@ -7566,7 +7566,10 @@ namespace Mall.Module.Product
                     ServicepersonalId = item.ServicepersonalId,
                     ServiceTime = item.ServiceTime,
                     GoodServiceTime = item.GoodServiceTime,
-                    IsNoTax = item.IsNoTax
+                    IsNoTax = item.IsNoTax,
+                    DepositMoney = item.DepositMoney,
+                    DepositFreightMoney = item.DepositFreightMoney,
+                    DepositRefundMoney = item.DepositRefundMoney
                 }, trans);
                 item.Id = detailId;
                 if (detailId > 0 && SatisfiedGoodsList.Any())
@@ -7800,6 +7803,11 @@ namespace Mall.Module.Product
                     {
                         return false;//已有商品发货，无法退款
                     }
+                    //验证储值卡  并且未实际金额的话，直接取消订单  无需后台二次确认
+                    if (omodel.Income == 0 && omodel.DepositId > 0 && omodel.DepositMoney > 0)
+                    {
+                        type = 1;//改为直接取消
+                    }
                 }
             }
             var trans = goods_OrderRepository.DbTransaction;
@@ -7976,6 +7984,20 @@ namespace Mall.Module.Product
                                         goodsRepository.Update(keyValues1, wheres1, trans);
                                     }
                                 }
+                                if (omodel.DepositId > 0)
+                                {
+                                    Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                                        { nameof(RB_Goods_OrderDetail_Extend.DepositRefundMoney),item.DepositMoney + item.DepositFreightMoney}
+                                    };
+                                    List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                                        new WhereHelper(){
+                                             FiledName=nameof(RB_Goods_OrderDetail_Extend.Id),
+                                              FiledValue=item.Id,
+                                               OperatorEnum=OperatorEnum.Equal
+                                        }
+                                    };
+                                    goods_OrderDetailRepository.Update(keyValues1, wheres1, trans);
+                                }
                                 goods_LogRepository.Insert(new RB_Goods_Log()
                                 {
                                     Id = 0,
@@ -8046,6 +8068,46 @@ namespace Mall.Module.Product
                                 member_CouponRepository.Update(keyValues1, wheres1, trans);
                             }
                         }
+                        //储值卡回滚
+                        if (omodel.DepositId > 0)
+                        {
+                            var depositModel = member_DepositBuyRepository.GetEntity(omodel.DepositId);
+                            if (depositModel != null)
+                            {
+                                Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                                    { nameof(RB_Member_DepositBuy_Extend.SurplusPrice),depositModel.SurplusPrice + omodel.DepositMoney}
+                                };
+                                List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                                    new WhereHelper(){
+                                         FiledName=nameof(RB_Member_DepositBuy_Extend.Id),
+                                          FiledValue=depositModel.Id,
+                                           OperatorEnum=OperatorEnum.Equal
+                                    }
+                                };
+                                member_DepositBuyRepository.Update(keyValues1, wheres1, trans);
+                                member_DepositBalanceRepository.Insert(new RB_Member_DepositBalance()
+                                {
+                                    Id = 0,
+                                    UserId = umodel.Id,
+                                    Balance = depositModel.SurplusPrice,
+                                    CouponIco = depositModel.CouponIco,
+                                    CreateDate = DateTime.Now,
+                                    DepositPrice = depositModel.DepositPrice,
+                                    MallBaseId = umodel.MallBaseId,
+                                    MergeType = 3,
+                                    Name = depositModel.Name,
+                                    NewDepositBuyId = 0,
+                                    OldDepositBuyId = 0,
+                                    Remarks = "订单" + omodel.OrderNo + "取消，退回使用储值卡抵扣" + omodel.DepositMoney + "金额",
+                                    SalePrice = depositModel.SalePrice,
+                                    Status = 0,
+                                    Surplus = depositModel.SurplusPrice + omodel.DepositMoney,
+                                    TenantId = umodel.TenantId,
+                                    Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income
+                                }, trans);
+                            }
+                        }
+
                         //余额支付回滚
 
                         if (omodel.OrderClassify == 2 && omodel.EducationMoney > 0)

Mall.Module.User/UserModule.cs

@@ -4522,7 +4522,9 @@ namespace Mall.Module.User
                     Msg = "分销商不存在"
                 };
             }
-            if (model.IsOpenOfflineEarnings != 1)
+            var customModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
+            int OpenOfflineEarnings = customModel?.OpenOfflineEarnings ?? 0;
+            if (OpenOfflineEarnings != 1)
             {
                 return new
                 {
@@ -4792,6 +4794,12 @@ namespace Mall.Module.User
 
                 #endregion
 
+                #region 开启离线收益
+
+                var customModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() {  TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
+                int OpenOfflineEarnings = customModel?.OpenOfflineEarnings ?? 0;
+                #endregion
+
                 objData = new
                 {
                     //孵化公司
@@ -4854,7 +4862,8 @@ namespace Mall.Module.User
                     Sex = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.Sex : 0,//0-未认证，1-男-2女
                     myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的
                     followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注
-                    messageNum = MessageNum
+                    messageNum = MessageNum,
+                    openOfflineEarnings = OpenOfflineEarnings
                 };
             }
             return objData;

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -824,7 +824,7 @@ WHERE o.TenantId={tenantId} and o.MallBaseId={mallBaseId} and o.OrderStatus = 7
         public List<RB_Goods_Order_Extend> GetMySellMoneyStatistics(int mallBaseId, int userId, string startTime, string endTime)
         {
             string sql = $@"SELECT t.CreateDate as StartTime,SUM(t.FreightMoney + t.Final_Price) AS Income FROM (
-SELECT o.OrderId,DATE_FORMAT(o.CreateDate,'%y-%m-%d') AS CreateDate,o.FreightMoney,SUM(od.Final_Price) AS Final_Price FROM rb_goods_order o
+SELECT o.OrderId,DATE_FORMAT(o.CreateDate,'%Y-%m-%d') AS CreateDate,o.FreightMoney,SUM(od.Final_Price) AS Final_Price FROM rb_goods_order o
 LEFT JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId
 LEFT JOIN rb_goods_orderaftersale oa on od.Id = oa.OrderDetialId and oa.Type=1 and oa.ReOrderStatus =5
 WHERE o.MallBaseId ={mallBaseId} and o.OrderStatus in(2,3,4,5,6) and o.Recycled=2 and o.`Status`=0 and o.UserId ={userId} and o.CreateDate >= '{startTime}' AND o.CreateDate <= '{endTime} 23:59:59' AND oa.ReOrderId is NULL
@@ -863,7 +863,7 @@ GROUP BY o.OrderId
         public List<RB_Goods_Order_Extend> GetMyReferralsMoneyStatistics(int mallBaseId, int userId, string startTime, string endTime)
         {
             string sql = $@"SELECT t.CreateDate as StartTime,SUM(t.FreightMoney + t.Final_Price) AS Income FROM (
-SELECT o.OrderId,DATE_FORMAT(o.CreateDate,'%y-%m-%d') AS CreateDate,o.FreightMoney,SUM(od.Final_Price) AS Final_Price FROM rb_goods_order o
+SELECT o.OrderId,DATE_FORMAT(o.CreateDate,'%Y-%m-%d') AS CreateDate,o.FreightMoney,SUM(od.Final_Price) AS Final_Price FROM rb_goods_order o
 INNER JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId
 INNER JOIN rb_goods_ordercommission oc on od.Id = oc.OrderDetailId
 LEFT JOIN rb_goods_orderaftersale oa on od.Id = oa.OrderDetialId and oa.Type=1 and oa.ReOrderStatus =5

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1057,7 +1057,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             if (demodel.Type == 1)
             {
-                if ((demodel.Refund ?? 0) <= 0)
+                if ((demodel.Refund ?? 0) < 0)
                 {
                     return ApiResult.ParamIsNull("请输入退款金额");
                 }

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -984,7 +984,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.Failed("该订单已无法取消");
             }
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
-            if (IsNormalServer == 1 && omodel.OrderStatus == OrderStatusEnum.WaitSendGoods && omodel.OrderSource != UserSourceEnum.ERP)
+            if (IsNormalServer == 1 && omodel.OrderStatus == OrderStatusEnum.WaitSendGoods && omodel.OrderSource != UserSourceEnum.ERP && omodel.Income > 0)
             {
                 //获取小程序信息
                 var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
@@ -3742,7 +3742,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull();
             }
-            if (Refund <= 0)
+            if (Refund < 0)
             {
                 return ApiResult.ParamIsNull("请传递金额");
             }
@@ -3771,7 +3771,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
             var omodel = orderModule.GetOrderInfo(ReModel.OrderId ?? 0);
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
-            if (IsNormalServer == 1 && omodel.OrderSource != UserSourceEnum.ERP)
+            if (IsNormalServer == 1 && omodel.OrderSource != UserSourceEnum.ERP && Refund > 0)
             {
                 //获取小程序信息
                 var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);