zhangkun лет назад: 5
Родитель
Сommit
7a494b9dda

+ 1 - 1
代码/System.Common/Helpers/ModelConvertHelper.cs

@@ -267,7 +267,7 @@ namespace System.Common.Helpers
267 267
                         }
268 268
                         else if (t1p.PropertyType.FullName.Contains(typeof(System.Decimal).FullName))
269 269
                         {
270
-                            t1p.SetValue(t1, t2value, null);
270
+                            t1p.SetValue(t1, t2value, null); 
271 271
                         }
272 272
                         else if (t1p.PropertyType.FullName.Contains(typeof(System.DateTime).FullName))
273 273
                         {

+ 8 - 6
代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -151,15 +151,17 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
151 151
         [HttpPost("deleteproductclass")]
152 152
         public async Task<IActionResult> DeleteProductClass(string ids)
153 153
         {
154
-
155
-
156 154
             if (string.IsNullOrEmpty(ids))
157 155
                 return Error("请输入删除id");
158
-            if (ids.Replace(",", "") == "")
156
+            ids = ids.Trim(',');
157
+            if (string.IsNullOrEmpty(ids))
159 158
                 return Error("请输入删除id");
160
-
161
-            //删除的时候  分类下有商品怎么处理  暂未处理  后续根据需求处理  可以指定规则,分类下没有商品才可以删除
162
-            if (await _productClassRepository.Delete(a => ids.Contains("," + a.F_ClassId.ToString() + ",")))
159
+            string[] idsarry = ids.Split(',');
160
+            if (await _productRepository.GetCount(q => q.F_ClassId == q.F_ClassId) > 0)
161
+            {
162
+                return Success("请先删除分类下商品");
163
+            }
164
+            if (await _productClassRepository.Delete(a => idsarry.Contains( a.F_ClassId.ToString())))
163 165
             {
164 166
                 return Success("删除商品分类成功");
165 167
             }

+ 144 - 0
代码/TVShoppingCallCenter_ZLJ/Controllers/SMS/SMSController.cs

@@ -1,11 +1,16 @@
1 1
 using System;
2 2
 using System.Collections.Generic;
3 3
 using System.Common;
4
+using System.Common.Helpers;
4 5
 using System.IRepositories;
5 6
 using System.Linq;
7
+using System.Linq.Expressions;
8
+using System.Model;
6 9
 using System.Threading.Tasks;
7 10
 using Microsoft.AspNetCore.Authorization;
8 11
 using Microsoft.AspNetCore.Mvc;
12
+using SqlSugar;
13
+using TVShoppingCallCenter_ZLJ.Models.Inputs;
9 14
 
10 15
 namespace TVShoppingCallCenter_ZLJ.Controllers.SMS
11 16
 {
@@ -27,10 +32,149 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.SMS
27 32
         {
28 33
             bus_SMSTemplateRepository = _bus_SMSTemplateRepository;
29 34
             bus_SMSLogRepository = _bus_SMSLogRepository;
35
+        }
36
+
37
+        #region 短信模板
38
+
39
+        /// <summary>
40
+        /// 新增
41
+        /// </summary>
42
+        /// <param name="input"></param>
43
+        /// <returns></returns>
44
+        [HttpPost("addtemplate")]
45
+        public async Task<IActionResult> AddTemplate(SMSTemplateInput input)
46
+        {
47
+
48
+            #region 验证 参数
49
+
50
+
51
+            if (string.IsNullOrEmpty(input.F_Content))
52
+                return Error("请输入模板内容");
53
+            if (string.IsNullOrEmpty(input.F_ModelName))
54
+                return Error("请输入模板名称");
55
+            if (string.IsNullOrEmpty(input.F_Tel))
56
+                return Error("请输入要绑定400电话");
57
+
30 58
 
59
+            #endregion
31 60
 
61
+            if (await bus_SMSTemplateRepository.GetCount(a => a.F_ModelName == input.F_ModelName) > 0)
62
+            {
63
+                return Error("模板名称不能重复");
64
+            }
65
+            T_Bus_SMSTemplate ModelAdd = new T_Bus_SMSTemplate();
66
+            ModelConvertHelper<T_Bus_SMSTemplate, SMSTemplateInput>.ModeToModelDefault(ModelAdd, input);
67
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
68
+            ModelAdd.F_AddUserName = UserLogin.UserName;
69
+            ModelAdd.F_AddTime = DateTime.Now;
70
+
71
+            if (await bus_SMSTemplateRepository.Add(ModelAdd) > 0)
72
+            {
73
+                return Success("新增成功");
74
+            }
75
+            else
76
+            {
77
+                return Error("新增失败,请重试!");
78
+            }
32 79
         }
33 80
 
34 81
 
82
+        /// <summary>
83
+        /// 更新
84
+        /// </summary>
85
+        /// <param name="input"></param>
86
+        /// <returns></returns>
87
+        [HttpPost("updatetemplate")]
88
+        public async Task<IActionResult> UpdateTemplate(SMSTemplateInput input)
89
+        {
90
+
91
+            #region 验证 参数
92
+
93
+
94
+            if (string.IsNullOrEmpty(input.F_Content))
95
+                return Error("请输入模板内容");
96
+            if (string.IsNullOrEmpty(input.F_ModelName))
97
+                return Error("请输入模板名称");
98
+            if (string.IsNullOrEmpty(input.F_Tel))
99
+                return Error("请输入要绑定400电话");
100
+            if (input.F_Id<1)
101
+                return Error("参数缺失");
102
+
103
+            #endregion
104
+
105
+            if (await bus_SMSTemplateRepository.GetCount(q => q.F_ModelName == input.F_ModelName&&q.F_Id!= input.F_Id) > 0)
106
+            {
107
+                return Error("模板名称不能重复");
108
+            }
109
+            input.F_AddTime = DateTime.Now;
110
+            T_Bus_SMSTemplate ModelAdd = await bus_SMSTemplateRepository.GetSingle(q=>q.F_Id==input.F_Id);
111
+            ModelConvertHelper<T_Bus_SMSTemplate, SMSTemplateInput>.ModeToModelDefault(ModelAdd, input);
112
+            ModelAdd.F_AddUser = UserLogin.UserId.ObjToInt();
113
+            ModelAdd.F_AddUserName = UserLogin.UserName;
114
+
115
+            if (await bus_SMSTemplateRepository.Update(ModelAdd))
116
+            {
117
+                return Success("保存成功");
118
+            }
119
+
120
+            return Error("保存失败,请重试!");
121
+            
122
+        }
123
+
124
+        /// <summary>
125
+        /// 删除
126
+        /// </summary>
127
+        /// <param name="ids">格式   1,2,3,4</param>
128
+        /// <returns></returns>
129
+        [HttpPost("deletetemplate")]
130
+        public async Task<IActionResult> DeleteTemplate(string ids)
131
+        {
132
+            if (string.IsNullOrEmpty(ids))
133
+                return Error("请输入删除id");
134
+            ids = ids.Trim(',');
135
+            if (string.IsNullOrEmpty(ids))
136
+                return Error("请输入删除id");
137
+            string[] idsArry = ids.Split(',');
138
+            if (await bus_SMSTemplateRepository.Delete(q => idsArry.Contains( q.F_Id.ToString())))
139
+            {
140
+                return Success("删除成功");
141
+            }
142
+            else
143
+            {
144
+                return Error("删除失败,请重试!");
145
+            }
146
+        }
147
+
148
+        /// <summary>
149
+        /// 分页查询
150
+        /// </summary>
151
+        /// <param name="input"></param>
152
+        /// <returns></returns>
153
+        [HttpPost("gettemplatebypage")]
154
+        public async Task<IActionResult> ProductClassList(SMSTemplateInput input)
155
+        {
156
+
157
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
158
+            #region 条件筛选
159
+            if (!string.IsNullOrEmpty(input.F_ModelName))
160
+            {
161
+                conModels.Add(new ConditionalModel() { FieldName = "F_ModelName", ConditionalType = ConditionalType.Like, FieldValue = input.F_ModelName });
162
+            }
163
+            if (!string.IsNullOrEmpty(input.F_Tel))
164
+            {
165
+                conModels.Add(new ConditionalModel() { FieldName = "F_Tel", ConditionalType = ConditionalType.Like, FieldValue = input.F_Tel });
166
+            }
167
+
168
+            #endregion
169
+            int count = 0;
170
+            PageData<T_Bus_SMSTemplate> productClasselist = await bus_SMSTemplateRepository.GetListByPage(conModels, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count });
171
+
172
+            return Success("成功", productClasselist);
173
+        }
174
+
175
+
176
+        #endregion
177
+
178
+
35 179
     }
36 180
 }

+ 125 - 0
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/SMSLogInput.cs

@@ -0,0 +1,125 @@
1
+using System;
2
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
3
+{
4
+	/// <summary>
5
+	/// 短信模板表
6
+	/// </summary>
7
+	[Serializable]
8
+	public partial class SMSLogInput : BaseInput
9
+	{
10
+		public SMSLogInput()
11
+		{ }
12
+		#region Model
13
+		private string _f_id;
14
+		private int _f_adduser = 0;
15
+		private string _f_addusername;
16
+		private string _f_content = "";
17
+		private int _f_templateid;
18
+		private int _f_state;
19
+		private string _f_message = "";
20
+		private DateTime _f_addtime;
21
+		private DateTime _f_sendtime;
22
+		private DateTime _f_plansendtime;
23
+		private string _f_tel = "";
24
+		private int _f_type;
25
+		/// <summary>
26
+		/// 
27
+		/// </summary>
28
+		public string F_Id
29
+		{
30
+			set { _f_id = value; }
31
+			get { return _f_id; }
32
+		}
33
+		/// <summary>
34
+		/// 记录添加人
35
+		/// </summary>
36
+		public int F_AddUser
37
+		{
38
+			set { _f_adduser = value; }
39
+			get { return _f_adduser; }
40
+		}
41
+		/// <summary>
42
+		/// 记录添加人姓名/发送人
43
+		/// </summary>
44
+		public string F_AddUserName
45
+		{
46
+			set { _f_addusername = value; }
47
+			get { return _f_addusername; }
48
+		}
49
+		/// <summary>
50
+		/// 发送内容
51
+		/// </summary>
52
+		public string F_Content
53
+		{
54
+			set { _f_content = value; }
55
+			get { return _f_content; }
56
+		}
57
+		/// <summary>
58
+		/// 模板id
59
+		/// </summary>
60
+		public int F_TemplateId
61
+		{
62
+			set { _f_templateid = value; }
63
+			get { return _f_templateid; }
64
+		}
65
+		/// <summary>
66
+		/// 发送状态 0没有获取状态 1成功2失败
67
+		/// </summary>
68
+		public int F_State
69
+		{
70
+			set { _f_state = value; }
71
+			get { return _f_state; }
72
+		}
73
+		/// <summary>
74
+		/// 发送状态信息,可不用
75
+		/// </summary>
76
+		public string F_Message
77
+		{
78
+			set { _f_message = value; }
79
+			get { return _f_message; }
80
+		}
81
+		/// <summary>
82
+		/// 发送时间
83
+		/// </summary>
84
+		public DateTime F_AddTime
85
+		{
86
+			set { _f_addtime = value; }
87
+			get { return _f_addtime; }
88
+		}
89
+		/// <summary>
90
+		/// 发送时间
91
+		/// </summary>
92
+		public DateTime F_SendTime
93
+		{
94
+			set { _f_sendtime = value; }
95
+			get { return _f_sendtime; }
96
+		}
97
+		/// <summary>
98
+		/// 计划发送时间
99
+		/// </summary>
100
+		public DateTime F_PlanSendTime
101
+		{
102
+			set { _f_plansendtime = value; }
103
+			get { return _f_plansendtime; }
104
+		}
105
+		/// <summary>
106
+		/// 绑定的400电话
107
+		/// </summary>
108
+		public string F_Tel
109
+		{
110
+			set { _f_tel = value; }
111
+			get { return _f_tel; }
112
+		}
113
+		/// <summary>
114
+		/// 0即时发送(模板),2定时发送(模板),3自定义发送(暂时不用)
115
+		/// </summary>
116
+		public int F_Type
117
+		{
118
+			set { _f_type = value; }
119
+			get { return _f_type; }
120
+		}
121
+		#endregion Model
122
+
123
+	}
124
+}
125
+

+ 89 - 0
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/SMSTemplateInput.cs

@@ -0,0 +1,89 @@
1
+using System;
2
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
3
+{
4
+	/// <summary>
5
+	/// 短信模板表
6
+	/// </summary>
7
+	[Serializable]
8
+	public partial class SMSTemplateInput:BaseInput
9
+	{
10
+		public SMSTemplateInput()
11
+		{ }
12
+		#region Model
13
+		private int _f_id;
14
+		private string _f_modelname = "";
15
+		private string _f_content = "";
16
+		private int _f_adduser;
17
+		private string _f_addusername = "";
18
+		private int _f_sort = 100;
19
+		private DateTime _f_addtime = DateTime.Now;
20
+		private string _f_tel = "";
21
+		/// <summary>
22
+		/// 
23
+		/// </summary>
24
+		public int F_Id
25
+		{
26
+			set { _f_id = value; }
27
+			get { return _f_id; }
28
+		}
29
+		/// <summary>
30
+		/// 短息模板名称
31
+		/// </summary>
32
+		public string F_ModelName
33
+		{
34
+			set { _f_modelname = value; }
35
+			get { return _f_modelname; }
36
+		}
37
+		/// <summary>
38
+		/// 模板内容
39
+		/// </summary>
40
+		public string F_Content
41
+		{
42
+			set { _f_content = value; }
43
+			get { return _f_content; }
44
+		}
45
+		/// <summary>
46
+		/// 添加人id
47
+		/// </summary>
48
+		public int F_AddUser
49
+		{
50
+			set { _f_adduser = value; }
51
+			get { return _f_adduser; }
52
+		}
53
+		/// <summary>
54
+		/// 添加人
55
+		/// </summary>
56
+		public string F_AddUserName
57
+		{
58
+			set { _f_addusername = value; }
59
+			get { return _f_addusername; }
60
+		}
61
+		/// <summary>
62
+		/// 排序
63
+		/// </summary>
64
+		public int F_Sort
65
+		{
66
+			set { _f_sort = value; }
67
+			get { return _f_sort; }
68
+		}
69
+		/// <summary>
70
+		/// 添加时间
71
+		/// </summary>
72
+		public DateTime F_AddTime
73
+		{
74
+			set { _f_addtime = value; }
75
+			get { return _f_addtime; }
76
+		}
77
+		/// <summary>
78
+		/// 绑定400电话
79
+		/// </summary>
80
+		public string F_Tel
81
+		{
82
+			set { _f_tel = value; }
83
+			get { return _f_tel; }
84
+		}
85
+		#endregion Model
86
+
87
+	}
88
+}
89
+