1

Mall.Model/Entity/Assess/RB_Assess_Category.cs

@@ -33,6 +33,11 @@ namespace Mall.Model.Entity.Assess
 		/// </summary>
 		public int Enable { get; set; }
 
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int Sort { get; set; }
+
 		/// <summary>
 		/// Status
 		/// </summary>

Mall.Module.Miai/AssessModule.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Mall.Common;
+using Mall.Common.Plugin;
+using Newtonsoft.Json;
+using VT.FW.DB;
+using Mall.Repository.Assess;
+using Mall.Model.Extend.Assess;
+using Mall.Model.Entity.Assess;
+using Mall.Repository.User;
+
+namespace Mall.Module.Miai
+{
+    /// <summary>
+    /// 估价处理层
+    /// </summary>
+    public class AssessModule
+    {
+        
+
+        /// <summary>
+        /// 用户管理
+        /// </summary>
+        private readonly RB_Member_UserRepository member_UserRepository = new RB_Member_UserRepository();
+        /// <summary>
+        /// 分类
+        /// </summary>
+        private readonly RB_Assess_CategoryRepository assess_CategoryRepository = new RB_Assess_CategoryRepository();
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        private readonly RB_Assess_BrandRepository assess_BrandRepository = new RB_Assess_BrandRepository();
+        /// <summary>
+        /// 商品
+        /// </summary>
+        private readonly RB_Assess_GoodsRepository assess_GoodsRepository = new RB_Assess_GoodsRepository();
+
+
+        #region 估价分类
+
+        /// <summary>
+        /// 获取分类分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Assess_Category_Extend> GetCategoryPageList(int pageIndex, int pageSize, out long count, RB_Assess_Category_Extend demodel)
+        {
+            return assess_CategoryRepository.GetPageList(pageIndex, pageSize, out count, demodel);
+        }
+
+        /// <summary>
+        /// 获取分类列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Assess_Category_Extend> GetCategoryList(RB_Assess_Category_Extend demodel)
+        {
+            return assess_CategoryRepository.GetList(demodel);
+        }
+
+        /// <summary>
+        /// 保存修改分类
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public string SetCategoryInfo(RB_Assess_Category_Extend demodel)
+        {
+            if (demodel.Id > 0)
+            {
+                var dmodel = assess_CategoryRepository.GetEntity(demodel.Id);
+                dmodel.Name = demodel.Name;
+                dmodel.Image = demodel.Image;
+                dmodel.Enable = demodel.Enable;
+                dmodel.Sort = demodel.Sort;
+                dmodel.UpdateBy = demodel.UpdateBy;
+                dmodel.UpdateDate = demodel.UpdateDate;
+                bool flag = assess_CategoryRepository.Update(dmodel);
+                return flag ? "" : "出错了，请联系管理员";
+            }
+            else {
+                bool flag = assess_CategoryRepository.Insert(demodel) > 0;
+                return flag ? "" : "出错了，请联系管理员";
+            }
+        }
+
+        /// <summary>
+        /// 删除分类
+        /// </summary>
+        /// <param name="categoryId"></param>
+        /// <returns></returns>
+        public bool DelCategoryInfo(int categoryId)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Assess_Category_Extend.Status),1},
+                { nameof(RB_Assess_Category_Extend.UpdateDate),DateTime.Now},
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName = nameof(RB_Assess_Category_Extend.Id),
+                      FiledValue = categoryId,
+                       OperatorEnum =OperatorEnum.Equal
+                }
+            };
+            return assess_CategoryRepository.Update(keyValues, wheres);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Mall.WebApi/Controllers/Miai/AssessController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Mall.Common.API;
+using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Mall.Common.Plugin;
+using Newtonsoft.Json.Linq;
+using Mall.Common;
+using Mall.Module.Miai;
+using Mall.Model.Extend.Assess;
+using Mall.Model.Extend.Assess;
+
+namespace Mall.WebApi.Controllers.MallBase
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class AssessController : BaseController
+    {
+        private readonly AssessModule assessModule = new AssessModule();
+
+        #region 分类
+        /// <summary>
+        /// 获取分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCategoryPageList()
+        {
+            var req = base.RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
+            RB_Assess_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Assess_Category_Extend>(req.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(req.uid);
+            demodel.MallBaseId = req.MallBaseId;
+            var list = assessModule.GetCategoryPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Image,
+                x.Enable,
+                x.Sort,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取分类下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCategoryDropList()
+        {
+            var req = base.RequestParm;
+            RB_Assess_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Assess_Category_Extend>(req.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(req.uid);
+            demodel.MallBaseId = req.MallBaseId;
+            demodel.Enable = 1;
+            var list = assessModule.GetCategoryList(demodel);
+            return ApiResult.Success("", list.OrderByDescending(x => x.Sort).Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Image,
+                x.Sort,
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
+            }));
+        }
+
+        /// <summary>
+        /// 新增修改分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetCategoryInfo() {
+            var req = RequestParm;
+            RB_Assess_Category_Extend demodel = JsonHelper.DeserializeObject<RB_Assess_Category_Extend>(req.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name)) {
+                return ApiResult.ParamIsNull("请传递分类名称");
+            }
+            if (string.IsNullOrEmpty(demodel.Image)) {
+                return ApiResult.ParamIsNull("请上传分类背景图片");   
+            }
+            demodel.Enable = demodel.Enable == 0 ? 1:demodel.Enable;
+
+            demodel.TenantId = req.TenantId;
+            demodel.MallBaseId = req.MallBaseId;
+            demodel.CreateBy = req.EmpId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateBy = req.EmpId;
+
+            string msg = assessModule.SetCategoryInfo(demodel);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed(msg);
+            }
+        }
+
+        /// <summary>
+        /// 删除分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelCategoryInfo() {
+            JObject parms = JObject.Parse(base.RequestParm.msg.ToString());
+            int CategoryId = parms.GetInt("CategoryId", 0);
+            if (CategoryId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            bool flag = assessModule.DelCategoryInfo(CategoryId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        #endregion
+
+
+
+    }
+}
\ No newline at end of file

Mall.WebApi/appsettings.json

@@ -6,9 +6,9 @@
       "FinanceConnectionPName": "MySql.Data.MySqlClient",
       "UserConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
       "UserConnectionPName": "MySql.Data.MySqlClient",
-        "PropertyConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+      "PropertyConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
       "PropertyConnectionPName": "MySql.Data.MySqlClient",
-        "EduConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+      "EduConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_edu2;CharSet=utf8mb4; Convert Zero Datetime=true; ",
       "EduConnectionPName": "MySql.Data.MySqlClient"
     },
     "Logging": {
@@ -55,12 +55,13 @@
     "XuZongUserId": 111790, //徐总的id，用于区分线下订单
     "RebornDMC": "reborn_dmc",
     "PropertyDB": "test_property",
-    "IncomeFinanceApi": "http://192.168.10.7:8083/api/Mall/InsertFinanceBatchForMallIn",
-    "PaymentFinanceApi": "http://192.168.10.7:8083/api/Mall/InsertFinanceBatchForMallOut",
-    "ZYRefundFinanceApi": "http://192.168.10.7:8083/api/Mall/SetMallOrderSalesTheWayRefund",
-    "PropertyApi": "http://192.168.1.13:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
-    "EduOrderApi": "http://192.168.10.17:8017/api/Order/SetBatchClassOrder",
+    "IncomeFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallIn",
+    "PaymentFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallOut",
+    "ZYRefundFinanceApi": "http://192.168.10.2:8083/api/Mall/SetMallOrderSalesTheWayRefund",
+    "PropertyApi": "http://192.168.10.2:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
+    "EduOrderApi": "http://192.168.10.2:8017/api/Order/SetBatchClassOrder",
     "EduUpdateGoodsSpecification": "http://192.168.10.17:8017/api/Order/UpdateGoodsSpecification",
+    "EduPushOrderProperty": "http://192.168.10.2:8085/api/EudGoods/SetMallOrderWeChatMessage",
     "FinanceKey": "FinanceMallInsertToERPViitto2020",
     "SettlementRate": "0.60",
     "EduSettlementRate": "0.54",