提交代码

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -77,11 +77,11 @@ namespace Mall.Module.BaseSetUp
             {
                 if (model.ID == 0)
                 {
-                    flag = mallBaseRepository.Insert(model) > 0;
+                    flag = mallBaseRepository.Insert(model, trans) > 0;
                 }
                 else
                 {
-                    flag = mallBaseRepository.Update(model);
+                    flag = mallBaseRepository.Update(model, trans);
                 }
                 IDictionary<string, object> fileds = new Dictionary<string, object>()
                 {

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -803,16 +803,17 @@ as t GROUP BY t.CreateDate desc";
                     where += $" and  b.SupplierId={dmodel.SupplierId} ";
                 }
             }
-            string sql = $@" SELECT MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,'供应商名称' as SupplierName,
+            string sql = $@" SELECT MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
 SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
 SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight,
 c.OneCommission,d.TwoCommission,0 as OtherPrice,e.ALLCommission,0 as Paid
 from rb_goods_orderdetail as b
 LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
+LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
 LEFT JOIN (SELECT SUM(Commission) as OneCommission,OrderId from rb_goods_ordercommission  where Grade=1 and CommissionState=2  GROUP BY OrderId ) as c on a.OrderId=c.OrderId
 LEFT JOIN (SELECT SUM(Commission) as TwoCommission,OrderId from rb_goods_ordercommission  where Grade=2 and CommissionState=2  GROUP BY OrderId ) as d on a.OrderId=d.OrderId
 LEFT JOIN (SELECT SUM(Commission) as ALLCommission,OrderId from rb_goods_ordercommission  GROUP BY OrderId ) as e on a.OrderId=e.OrderId {where}
-GROUP BY b.OrderId ";
+GROUP BY b.GoodsId,b.SupplierId,b.OrderId ";
             return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
         }
         #endregion

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -1294,12 +1294,22 @@ namespace Mall.WebApi.Controllers.MallBase
                     #region 基本设置
                     //基础配置 Add By:W 2020年6月1号
                     var mallBaseModel = mallBaseModule.GetListRepository(new RB_MallBase_Extend { TenantId = miniProgram.TenantId ?? 0, MallBaseId = miniProgram.MallBaseId }).FirstOrDefault();
+                    if (mallBaseModel == null)
+                    {
+                        mallBaseModel = new RB_MallBase_Extend();
+                    }
                     //获取物流配置
                     var logisticsRules = mallBaseModule.GetLogisticsList(new RB_Logistics { TenantId = miniProgram.TenantId ?? 0, MallBaseId = miniProgram.MallBaseId }).FirstOrDefault();
-
+                    if (logisticsRules == null)
+                    {
+                        logisticsRules = new RB_Logistics();
+                    }
                     //用户积分
                     var integralModel = integralModule.GetIntegralSettingsList(new RB_Integral_Settings { TenantId = miniProgram.TenantId ?? 0, MallBaseId = miniProgram.MallBaseId }).FirstOrDefault();
-
+                    if (integralModel == null)
+                    {
+                        integralModel = new RB_Integral_Settings();
+                    }
                     List<string> payment_type = new List<string>();
                     if (!string.IsNullOrWhiteSpace(mallBaseModel.PayWay))
                     {
@@ -2090,7 +2100,7 @@ namespace Mall.WebApi.Controllers.MallBase
             if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
             {
                 var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId);
-                user_info = memberModel;                
+                user_info = memberModel;
             }
 
             var data = new object();

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -43,6 +43,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     return ApiResult.Failed("请输入商城名称");
                 }
                 query.TenantId = UserInfo.TenantId;
+                query.MallBaseId = parms.MallBaseId;
                 //if (query.ID == 0)//新增
                 //{
                 //    var TenantModel = TenantModule.GetTenantModule(query.TenantId);

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -381,7 +381,8 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetHpUserReferralsAuditList() {
+        public ApiResult GetHpUserReferralsAuditList()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
@@ -413,7 +414,8 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetHpUserReferralsAudit() {
+        public ApiResult SetHpUserReferralsAudit()
+        {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             JObject parms = JObject.Parse(req.msg.ToString());
@@ -425,7 +427,8 @@ namespace Mall.WebApi.Controllers.User
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed();
             }
         }
@@ -930,5 +933,44 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", pagelist);
         }
         #endregion
+
+
+        #region 个人中心余额/积分/优惠券气泡
+        /// <summary>
+        ///  个人中心- 积分明细
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserCenter()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+
+            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(req.msg.ToString());
+            demodel.Id = userInfo.UserId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+
+            //获取用户的基本信息
+            var userModel = userModule.GetMemberUserEntityModule(demodel);
+
+            if (userModel == null)
+            {
+                return ApiResult.Failed("用户信息不存在");
+
+            }
+
+            //获取用户的优惠券信息
+            var couponList = couponModule.GetMemberDiscountCouponList(new RB_Member_DiscountCoupon_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UseState = 0, UserId = userModel.Id });
+            var result = new
+            {
+                Balance = userModel.Balance ?? 0,//余额
+                Integral = userModel.Integral ?? 0,//积分
+                couponCount = (couponList == null || !couponList.Any()) ? 0 : couponList.Count(),//优惠券
+                couponCardCount = 0//卡券
+            };
+            return ApiResult.Success("");
+        }
+        #endregion
     }
 }
\ No newline at end of file