antissoft / lvqianmeiye_ERP

Commit fb9d5c60ae21c51735a10716828a3e32c725866c

Authored by “wangming”
1 parent ce74473f

feat: 更新LqHytkHytk和LqMdxx服务，增强数据处理和接口功能 

- 在LqHytkHytkService中添加cancelRemark字段，支持作废备注
- 更新VoidRefundCardInfo方法，增加remarks参数以传递作废备注
- 在LqMdxxService中新增StoreCategory和StoreType字段，支持门店类别和类型
- 添加获取门店类别和类型的接口，返回相应的枚举数据
- 更新相关DTO和实体类，确保数据结构一致性
- 优化错误处理，提供更详细的异常信息
Inline Side-by-side
Showing 13 changed files with 235 additions and 88 deletions
antis-ncc-admin/.env.development
  View file @fb9d5c6
1 1 # 开发
2 2  
3 3 VUE_CLI_BABEL_TRANSPILE_MODULES = true
4   -VUE_APP_BASE_API = 'http://lvqian.antissoft.com'
  4 +# VUE_APP_BASE_API = 'http://lvqian.antissoft.com'
5 5 # VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
6   -# VUE_APP_BASE_API = 'http://localhost:2011'
  6 +VUE_APP_BASE_API = 'http://localhost:2011'
7 7 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkInfoOutput.cs
  View file @fb9d5c6
... ... @@ -97,6 +97,16 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
97 97 public string signatureFile { get; set; }
98 98  
99 99 /// <summary>
  100 + /// 作废备注
  101 + /// </summary>
  102 + public string cancelRemark { get; set; }
  103 +
  104 + /// <summary>
  105 + /// 是否有效
  106 + /// </summary>
  107 + public int isEffective { get; set; }
  108 +
  109 + /// <summary>
100 110 /// 退卡品项明细列表
101 111 /// </summary>
102 112 public List<LqHytkMxInfoOutput> lqHytkMxList { get; set; }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkHytk/LqHytkHytkListOutput.cs
  View file @fb9d5c6
... ... @@ -92,5 +92,10 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
92 92 /// </summary>
93 93 public int isEffective { get; set; }
94 94  
  95 + /// <summary>
  96 + /// 作废备注
  97 + /// </summary>
  98 + public string cancelRemark { get; set; }
  99 +
95 100 }
96 101 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqHytkMx/LqHytkMxInfoOutput.cs
  View file @fb9d5c6
... ... @@ -50,10 +50,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkMx
50 50 /// </summary>
51 51 public int projectNumber { get; set; }
52 52  
  53 +
53 54 /// <summary>
54 55 /// 是否有效
55 56 /// </summary>
56   - public int isEnabled { get; set; }
  57 + public int isEffective { get; set; }
57 58  
58 59 /// <summary>
59 60 /// 来源类型（开卡/赠送/其他）
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdDeductinfo/LqKdDeductinfoCrInput.cs
  View file @fb9d5c6
... ... @@ -34,7 +34,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
34 34 /// 合计金额
35 35 /// </summary>
36 36 [Required(ErrorMessage = "合计金额不能为空")]
37   - [Range(0.01, 999999.99, ErrorMessage = "合计金额必须在0.01到999999.99之间")]
38 37 public decimal? Amount { get; set; }
39 38  
40 39 /// <summary>
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxCrInput.cs
  View file @fb9d5c6
... ... @@ -12,141 +12,151 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
12 12 /// 主键
13 13 /// </summary>
14 14 public string id { get; set; }
15   -
  15 +
16 16 /// <summary>
17 17 /// 门店编码
18 18 /// </summary>
19 19 public string mdbm { get; set; }
20   -
  20 +
21 21 /// <summary>
22 22 /// 单据门店编号
23 23 /// </summary>
24 24 public string djmdbh { get; set; }
25   -
  25 +
26 26 /// <summary>
27 27 /// 单据门店
28 28 /// </summary>
29 29 public string djmd { get; set; }
30   -
  30 +
31 31 /// <summary>
32 32 /// 店名
33 33 /// </summary>
34 34 public string dm { get; set; }
35   -
  35 +
36 36 /// <summary>
37 37 /// 城市
38 38 /// </summary>
39 39 public string cs { get; set; }
40   -
  40 +
41 41 /// <summary>
42 42 /// 地址
43 43 /// </summary>
44 44 public string dz { get; set; }
45   -
  45 +
46 46 /// <summary>
47 47 /// 姓名
48 48 /// </summary>
49 49 public string xm { get; set; }
50   -
  50 +
51 51 /// <summary>
52 52 /// 电话号码
53 53 /// </summary>
54 54 public string dhhm { get; set; }
55   -
  55 +
56 56 /// <summary>
57 57 /// 座机
58 58 /// </summary>
59 59 public string zj { get; set; }
60   -
  60 +
61 61 /// <summary>
62 62 /// 开业时间
63 63 /// </summary>
64 64 public DateTime? kysj { get; set; }
65   -
  65 +
66 66 /// <summary>
67 67 /// 最新状态
68 68 /// </summary>
69 69 public string zxzt { get; set; }
70   -
  70 +
71 71 /// <summary>
72 72 /// 工商名称
73 73 /// </summary>
74 74 public string gsmc { get; set; }
75   -
  75 +
76 76 /// <summary>
77 77 /// 法人
78 78 /// </summary>
79 79 public string fr { get; set; }
80   -
  80 +
81 81 /// <summary>
82 82 /// 有无社保
83 83 /// </summary>
84 84 public string ywsb { get; set; }
85   -
  85 +
86 86 /// <summary>
87 87 /// 事业部
88 88 /// </summary>
89 89 public string syb { get; set; }
90   -
  90 +
91 91 /// <summary>
92 92 /// 教育部
93 93 /// </summary>
94 94 public string jyb { get; set; }
95   -
  95 +
96 96 /// <summary>
97 97 /// 科技部
98 98 /// </summary>
99 99 public string kjb { get; set; }
100   -
  100 +
101 101 /// <summary>
102 102 /// 大项目部
103 103 /// </summary>
104 104 public string dxmb { get; set; }
105   -
  105 +
106 106 /// <summary>
107 107 /// 归属起始时间
108 108 /// </summary>
109 109 public DateTime? gsqssj { get; set; }
110   -
  110 +
111 111 /// <summary>
112 112 /// 归属终止时间
113 113 /// </summary>
114 114 public DateTime? gszzsj { get; set; }
115   -
  115 +
116 116 /// <summary>
117 117 /// 状态
118 118 /// </summary>
119 119 public int? status { get; set; }
120   -
  120 +
121 121 /// <summary>
122 122 /// 目标-门店生命线
123 123 /// </summary>
124 124 public decimal? xsyj { get; set; }
125   -
  125 +
126 126 /// <summary>
127 127 /// 目标-消耗业绩
128 128 /// </summary>
129 129 public decimal? xhyj { get; set; }
130   -
  130 +
131 131 /// <summary>
132 132 /// 目标-项目数
133 133 /// </summary>
134 134 public int? xms { get; set; }
135   -
  135 +
136 136 /// <summary>
137 137 /// 目标-人头1
138 138 /// </summary>
139 139 public int? rt1 { get; set; }
140   -
  140 +
141 141 /// <summary>
142 142 /// 目标-人头2
143 143 /// </summary>
144 144 public int? rt2 { get; set; }
145   -
  145 +
146 146 /// <summary>
147 147 /// 目标-人次
148 148 /// </summary>
149 149 public int? rc { get; set; }
150   -
  150 +
  151 + /// <summary>
  152 + /// 门店类别
  153 + /// </summary>
  154 + public int? StoreCategory { get; set; }
  155 +
  156 + /// <summary>
  157 + /// 门店类型
  158 + /// </summary>
  159 + public int? StoreType { get; set; }
  160 +
151 161 }
152 162 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxInfoOutput.cs
  View file @fb9d5c6
1 1 using System;
2 2 using System.Collections.Generic;
  3 +using NCC.Code;
  4 +using NCC.Extend.Entitys.Enum;
3 5  
4 6 namespace NCC.Extend.Entitys.Dto.LqMdxx
5 7 {
... ... @@ -12,111 +14,130 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
12 14 /// 主键
13 15 /// </summary>
14 16 public string id { get; set; }
15   -
  17 +
16 18 /// <summary>
17 19 /// 门店编码
18 20 /// </summary>
19 21 public string mdbm { get; set; }
20   -
  22 +
21 23 /// <summary>
22 24 /// 单据门店编号
23 25 /// </summary>
24 26 public string djmdbh { get; set; }
25   -
  27 +
26 28 /// <summary>
27 29 /// 单据门店
28 30 /// </summary>
29 31 public string djmd { get; set; }
30   -
  32 +
31 33 /// <summary>
32 34 /// 店名
33 35 /// </summary>
34 36 public string dm { get; set; }
35   -
  37 +
36 38 /// <summary>
37 39 /// 城市
38 40 /// </summary>
39 41 public string cs { get; set; }
40   -
  42 +
41 43 /// <summary>
42 44 /// 地址
43 45 /// </summary>
44 46 public string dz { get; set; }
45   -
  47 +
46 48 /// <summary>
47 49 /// 姓名
48 50 /// </summary>
49 51 public string xm { get; set; }
50   -
  52 +
51 53 /// <summary>
52 54 /// 电话号码
53 55 /// </summary>
54 56 public string dhhm { get; set; }
55   -
  57 +
56 58 /// <summary>
57 59 /// 座机
58 60 /// </summary>
59 61 public string zj { get; set; }
60   -
  62 +
61 63 /// <summary>
62 64 /// 开业时间
63 65 /// </summary>
64 66 public DateTime? kysj { get; set; }
65   -
  67 +
66 68 /// <summary>
67 69 /// 最新状态
68 70 /// </summary>
69 71 public string zxzt { get; set; }
70   -
  72 +
71 73 /// <summary>
72 74 /// 工商名称
73 75 /// </summary>
74 76 public string gsmc { get; set; }
75   -
  77 +
76 78 /// <summary>
77 79 /// 法人
78 80 /// </summary>
79 81 public string fr { get; set; }
80   -
  82 +
81 83 /// <summary>
82 84 /// 有无社保
83 85 /// </summary>
84 86 public string ywsb { get; set; }
85   -
  87 +
86 88 /// <summary>
87 89 /// 事业部
88 90 /// </summary>
89 91 public string syb { get; set; }
90   -
  92 +
91 93 /// <summary>
92 94 /// 教育部
93 95 /// </summary>
94 96 public string jyb { get; set; }
95   -
  97 +
96 98 /// <summary>
97 99 /// 科技部
98 100 /// </summary>
99 101 public string kjb { get; set; }
100   -
  102 +
101 103 /// <summary>
102 104 /// 大项目部
103 105 /// </summary>
104 106 public string dxmb { get; set; }
105   -
  107 +
106 108 /// <summary>
107 109 /// 归属起始时间
108 110 /// </summary>
109 111 public DateTime? gsqssj { get; set; }
110   -
  112 +
111 113 /// <summary>
112 114 /// 归属终止时间
113 115 /// </summary>
114 116 public DateTime? gszzsj { get; set; }
115   -
  117 +
116 118 /// <summary>
117 119 /// 状态
118 120 /// </summary>
119 121 public int? status { get; set; }
120   -
  122 +
  123 + /// <summary>
  124 + /// 门店类别
  125 + /// </summary>
  126 + public int? StoreCategory { get; set; }
  127 +
  128 + /// <summary>
  129 + /// 门店类别名称
  130 + /// </summary>
  131 + public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(StoreCategory.Value) : string.Empty;
  132 +
  133 + /// <summary>
  134 + /// 门店类型
  135 + /// </summary>
  136 + public int? StoreType { get; set; }
  137 +
  138 + /// <summary>
  139 + /// 门店类型名称
  140 + /// </summary>
  141 + public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(StoreType.Value) : string.Empty;
121 142 }
122 143 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqMdxx/LqMdxxListOutput.cs
  View file @fb9d5c6
1 1 using System;
  2 +using NCC.Code;
  3 +using NCC.Extend.Entitys.Enum;
2 4  
3 5 namespace NCC.Extend.Entitys.Dto.LqMdxx
4 6 {
... ... @@ -11,107 +13,107 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
11 13 /// 主键
12 14 /// </summary>
13 15 public string id { get; set; }
14   -
  16 +
15 17 /// <summary>
16 18 /// 门店编码
17 19 /// </summary>
18 20 public string mdbm { get; set; }
19   -
  21 +
20 22 /// <summary>
21 23 /// 单据门店编号
22 24 /// </summary>
23 25 public string djmdbh { get; set; }
24   -
  26 +
25 27 /// <summary>
26 28 /// 单据门店
27 29 /// </summary>
28 30 public string djmd { get; set; }
29   -
  31 +
30 32 /// <summary>
31 33 /// 店名
32 34 /// </summary>
33 35 public string dm { get; set; }
34   -
  36 +
35 37 /// <summary>
36 38 /// 城市
37 39 /// </summary>
38 40 public string cs { get; set; }
39   -
  41 +
40 42 /// <summary>
41 43 /// 地址
42 44 /// </summary>
43 45 public string dz { get; set; }
44   -
  46 +
45 47 /// <summary>
46 48 /// 姓名
47 49 /// </summary>
48 50 public string xm { get; set; }
49   -
  51 +
50 52 /// <summary>
51 53 /// 电话号码
52 54 /// </summary>
53 55 public string dhhm { get; set; }
54   -
  56 +
55 57 /// <summary>
56 58 /// 座机
57 59 /// </summary>
58 60 public string zj { get; set; }
59   -
  61 +
60 62 /// <summary>
61 63 /// 开业时间
62 64 /// </summary>
63 65 public DateTime? kysj { get; set; }
64   -
  66 +
65 67 /// <summary>
66 68 /// 最新状态
67 69 /// </summary>
68 70 public string zxzt { get; set; }
69   -
  71 +
70 72 /// <summary>
71 73 /// 工商名称
72 74 /// </summary>
73 75 public string gsmc { get; set; }
74   -
  76 +
75 77 /// <summary>
76 78 /// 法人
77 79 /// </summary>
78 80 public string fr { get; set; }
79   -
  81 +
80 82 /// <summary>
81 83 /// 有无社保
82 84 /// </summary>
83 85 public string ywsb { get; set; }
84   -
  86 +
85 87 /// <summary>
86 88 /// 事业部
87 89 /// </summary>
88 90 public string syb { get; set; }
89   -
  91 +
90 92 /// <summary>
91 93 /// 教育部
92 94 /// </summary>
93 95 public string jyb { get; set; }
94   -
  96 +
95 97 /// <summary>
96 98 /// 科技部
97 99 /// </summary>
98 100 public string kjb { get; set; }
99   -
  101 +
100 102 /// <summary>
101 103 /// 大项目部
102 104 /// </summary>
103 105 public string dxmb { get; set; }
104   -
  106 +
105 107 /// <summary>
106 108 /// 归属起始时间
107 109 /// </summary>
108 110 public DateTime? gsqssj { get; set; }
109   -
  111 +
110 112 /// <summary>
111 113 /// 归属终止时间
112 114 /// </summary>
113 115 public DateTime? gszzsj { get; set; }
114   -
  116 +
115 117 /// <summary>
116 118 /// 状态
117 119 /// </summary>
... ... @@ -121,31 +123,50 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
121 123 /// 目标-门店生命线
122 124 /// </summary>
123 125 public decimal? xsyj { get; set; }
124   -
  126 +
125 127 /// <summary>
126 128 /// 目标-消耗业绩
127 129 /// </summary>
128 130 public decimal? xhyj { get; set; }
129   -
  131 +
130 132 /// <summary>
131 133 /// 目标-项目数
132 134 /// </summary>
133 135 public int? xms { get; set; }
134   -
  136 +
135 137 /// <summary>
136 138 /// 目标-人头1
137 139 /// </summary>
138 140 public int? rt1 { get; set; }
139   -
  141 +
140 142 /// <summary>
141 143 /// 目标-人头2
142 144 /// </summary>
143 145 public int? rt2 { get; set; }
144   -
  146 +
145 147 /// <summary>
146 148 /// 目标-人次
147 149 /// </summary>
148 150 public int? rc { get; set; }
149   -
  151 +
  152 + /// <summary>
  153 + /// 门店类别
  154 + /// </summary>
  155 + public int? StoreCategory { get; set; }
  156 +
  157 + /// <summary>
  158 + /// 门店类别名称
  159 + /// </summary>
  160 + public string StoreCategoryName => StoreCategory.HasValue ? EnumHelper.GetEnumDesc<StoreCategoryEnum>(StoreCategory.Value) : string.Empty;
  161 +
  162 + /// <summary>
  163 + /// 门店类型
  164 + /// </summary>
  165 + public int? StoreType { get; set; }
  166 +
  167 + /// <summary>
  168 + /// 门店类型名称
  169 + /// </summary>
  170 + public string StoreTypeName => StoreType.HasValue ? EnumHelper.GetEnumDesc<StoreTypeEnum>(StoreType.Value) : string.Empty;
150 171 }
151 172 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_hytk_hytk/LqHytkHytkEntity.cs
  View file @fb9d5c6
... ... @@ -143,5 +143,11 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk
143 143 /// </summary>
144 144 [SugarColumn(ColumnName = "F_SignatureFile")]
145 145 public string SignatureFile { get; set; }
  146 +
  147 + /// <summary>
  148 + /// 作废备注
  149 + /// </summary>
  150 + [SugarColumn(ColumnName = "F_CancelRemark")]
  151 + public string CancelRemark { get; set; }
146 152 }
147 153 }
148 154 \ No newline at end of file
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_mdxx/LqMdxxEntity.cs
  View file @fb9d5c6
... ... @@ -185,5 +185,11 @@ namespace NCC.Extend.Entitys.lq_mdxx
185 185 [SugarColumn(ColumnName = "F_StoreType")]
186 186 public int? StoreType { get; set; }
187 187  
  188 + /// <summary>
  189 + /// 门店类别
  190 + /// </summary>
  191 + [SugarColumn(ColumnName = "F_StoreCategory")]
  192 + public int? StoreCategory { get; set; }
  193 +
188 194 }
189 195 }
190 196 \ No newline at end of file
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Enum/StoreCategoryEnum.cs 0 → 100644
  View file @fb9d5c6
  1 +using System.ComponentModel;
  2 +
  3 +namespace NCC.Extend.Entitys.Enum
  4 +{
  5 + /// <summary>
  6 + /// 门店分类枚举
  7 + /// </summary>
  8 + public enum StoreCategoryEnum
  9 + {
  10 + /// <summary>
  11 + /// A类门店
  12 + /// </summary>
  13 + [Description("A类门店")]
  14 + A类门店 = 1,
  15 +
  16 + /// <summary>
  17 + /// B类门店
  18 + /// </summary>
  19 + [Description("B类门店")]
  20 + B类门店 = 2,
  21 +
  22 + /// <summary>
  23 + /// C类门店
  24 + /// </summary>
  25 + [Description("C类门店")]
  26 + C类门店 = 3,
  27 + }
  28 +}
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqHytkHytkService.cs
  View file @fb9d5c6
... ... @@ -115,6 +115,7 @@ namespace NCC.Extend.LqHytkHytk
115 115 czry = it.Czry,
116 116 fileUrl = it.FileUrl,
117 117 isEffective = it.IsEffective,
  118 + cancelRemark = it.CancelRemark,
118 119 })
119 120 .MergeTable()
120 121 .OrderBy(sidx + " " + input.sort)
... ... @@ -477,7 +478,7 @@ namespace NCC.Extend.LqHytkHytk
477 478 /// <param name="id">主键</param>
478 479 /// <returns></returns>
479 480 [HttpPut("VoidRefundCardInfo/{id}")]
480   - public async Task<dynamic> VoidRefundCardInfo(string id)
  481 + public async Task<dynamic> VoidRefundCardInfo(string id, [FromQuery] string remarks = null)
481 482 {
482 483 try
483 484 {
... ... @@ -491,6 +492,7 @@ namespace NCC.Extend.LqHytkHytk
491 492 // 更新主表
492 493 entity.IsEffective = StatusEnum.无效.GetHashCode();
493 494 entity.F_ModifyTime = DateTime.Now;
  495 + entity.CancelRemark = remarks;
494 496 await _db.Updateable(entity).ExecuteCommandAsync();
495 497 // 更新明细表
496 498 await _db.Updateable<LqHytkMxEntity>().SetColumns(it => new LqHytkMxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.RefundInfoId == id).ExecuteCommandAsync();
... ... @@ -600,10 +602,10 @@ namespace NCC.Extend.LqHytkHytk
600 602 try
601 603 {
602 604 // 1. 查询主表信息
603   - var entity = await _db.Queryable<LqHytkHytkEntity>().Where(p => p.Id == id && p.IsEffective == StatusEnum.有效.GetHashCode()).FirstAsync();
  605 + var entity = await _db.Queryable<LqHytkHytkEntity>().Where(p => p.Id == id).FirstAsync();
604 606 if (entity == null)
605 607 {
606   - throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在或已作废");
  608 + throw NCCException.Oh("退卡记录不存在");
607 609 }
608 610  
609 611 var output = entity.Adapt<LqHytkHytkInfoOutput>();
... ... @@ -633,6 +635,7 @@ namespace NCC.Extend.LqHytkHytk
633 635 projectNumber = mx.ProjectNumber,
634 636 sourceType = mx.SourceType,
635 637 totalPrice = mx.TotalPrice,
  638 + isEffective = mx.IsEffective,
636 639 };
637 640  
638 641 // 关联该品项的健康师业绩
... ... @@ -655,9 +658,9 @@ namespace NCC.Extend.LqHytkHytk
655 658  
656 659 return output;
657 660 }
658   - catch (Exception)
  661 + catch (Exception ex)
659 662 {
660   - throw NCCException.Oh(ErrorCode.COM1000, "获取退卡记录失败");
  663 + throw NCCException.Oh($"获取退卡记录详情失败: {ex.Message}");
661 664 }
662 665 }
663 666 #endregion
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
  View file @fb9d5c6
... ... @@ -22,6 +22,8 @@ using NCC.Common.Model.NPOI;
22 22 using NCC.Common.Configuration;
23 23 using NCC.DataEncryption;
24 24 using NCC.ClayObject;
  25 +using NCC.Extend.Entitys.Enum;
  26 +using NCC.Code;
25 27  
26 28 namespace NCC.Extend.LqMdxx
27 29 {
... ... @@ -118,6 +120,8 @@ namespace NCC.Extend.LqMdxx
118 120 rt1 = it.Rt1,
119 121 rt2 = it.Rt2,
120 122 rc = it.Rc,
  123 + StoreCategory = it.StoreCategory,
  124 + StoreType = it.StoreType,
121 125 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
122 126 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
123 127 }
... ... @@ -187,6 +191,8 @@ namespace NCC.Extend.LqMdxx
187 191 gsmc = it.Gsmc,
188 192 fr = it.Fr,
189 193 ywsb = it.Ywsb,
  194 + StoreCategory = it.StoreCategory,
  195 + StoreType = it.StoreType,
190 196 }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
191 197 return data;
192 198 }
... ... @@ -322,10 +328,13 @@ namespace NCC.Extend.LqMdxx
322 328 [HttpDelete("{id}")]
323 329 public async Task Delete(string id)
324 330 {
  331 +
325 332 var entity = await _db.Queryable<LqMdxxEntity>().FirstAsync(p => p.Id == id);
326 333 _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
327   - var isOk = await _db.Deleteable<LqMdxxEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
328   - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002);
  334 + //直接修改status为0
  335 + entity.Status = StatusEnum.删除.GetHashCode();
  336 + var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
  337 + if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001);
329 338 }
330 339 #endregion
331 340  
... ... @@ -343,5 +352,33 @@ namespace NCC.Extend.LqMdxx
343 352 return new { list = list };
344 353 }
345 354 #endregion
  355 +
  356 + #region 获取门店类别下拉选择数据
  357 + /// <summary>
  358 + /// 获取门店类别下拉选择数据
  359 + /// </summary>
  360 + /// <returns></returns>
  361 + [HttpGet("Selector/StoreCategory")]
  362 + public async Task<dynamic> GetStoreCategorySelector()
  363 + {
  364 + //从Enum中获取门店类别
  365 + var storeCategoryEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreCategoryEnum));
  366 + return new { list = storeCategoryEnum };
  367 + }
  368 + #endregion
  369 +
  370 + #region 获取门店类型下拉选择数据
  371 + /// <summary>
  372 + /// 获取门店类型下拉选择数据
  373 + /// </summary>
  374 + /// <returns></returns>
  375 + [HttpGet("Selector/StoreType")]
  376 + public async Task<dynamic> GetStoreTypeSelector()
  377 + {
  378 + //从Enum中获取门店类型
  379 + var storeTypeEnum = EnumExtensions.GetEnumDescDictionary(typeof(StoreTypeEnum));
  380 + return new { list = storeTypeEnum };
  381 + }
  382 + #endregion
346 383 }
347 384 }
... ...