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 VUE_CLI_BABEL_TRANSPILE_MODULES = true 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 # VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' 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 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' 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,6 +97,16 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
97 public string signatureFile { get; set; } 97 public string signatureFile { get; set; }
98 98
99 /// <summary> 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 /// </summary> 111 /// </summary>
102 public List<LqHytkMxInfoOutput> lqHytkMxList { get; set; } 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,5 +92,10 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
92 /// </summary> 92 /// </summary>
93 public int isEffective { get; set; } 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,10 +50,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkMx
50 /// </summary> 50 /// </summary>
51 public int projectNumber { get; set; } 51 public int projectNumber { get; set; }
52 52
  53 +
53 /// <summary> 54 /// <summary>
54 /// 是否有效 55 /// 是否有效
55 /// </summary> 56 /// </summary>
56 - public int isEnabled { get; set; } 57 + public int isEffective { get; set; }
57 58
58 /// <summary> 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,7 +34,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdDeductinfo
34 /// 合计金额 34 /// 合计金额
35 /// </summary> 35 /// </summary>
36 [Required(ErrorMessage = "合计金额不能为空")] 36 [Required(ErrorMessage = "合计金额不能为空")]
37 - [Range(0.01, 999999.99, ErrorMessage = "合计金额必须在0.01到999999.99之间")]  
38 public decimal? Amount { get; set; } 37 public decimal? Amount { get; set; }
39 38
40 /// <summary> 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,141 +12,151 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
12 /// 主键 12 /// 主键
13 /// </summary> 13 /// </summary>
14 public string id { get; set; } 14 public string id { get; set; }
15 - 15 +
16 /// <summary> 16 /// <summary>
17 /// 门店编码 17 /// 门店编码
18 /// </summary> 18 /// </summary>
19 public string mdbm { get; set; } 19 public string mdbm { get; set; }
20 - 20 +
21 /// <summary> 21 /// <summary>
22 /// 单据门店编号 22 /// 单据门店编号
23 /// </summary> 23 /// </summary>
24 public string djmdbh { get; set; } 24 public string djmdbh { get; set; }
25 - 25 +
26 /// <summary> 26 /// <summary>
27 /// 单据门店 27 /// 单据门店
28 /// </summary> 28 /// </summary>
29 public string djmd { get; set; } 29 public string djmd { get; set; }
30 - 30 +
31 /// <summary> 31 /// <summary>
32 /// 店名 32 /// 店名
33 /// </summary> 33 /// </summary>
34 public string dm { get; set; } 34 public string dm { get; set; }
35 - 35 +
36 /// <summary> 36 /// <summary>
37 /// 城市 37 /// 城市
38 /// </summary> 38 /// </summary>
39 public string cs { get; set; } 39 public string cs { get; set; }
40 - 40 +
41 /// <summary> 41 /// <summary>
42 /// 地址 42 /// 地址
43 /// </summary> 43 /// </summary>
44 public string dz { get; set; } 44 public string dz { get; set; }
45 - 45 +
46 /// <summary> 46 /// <summary>
47 /// 姓名 47 /// 姓名
48 /// </summary> 48 /// </summary>
49 public string xm { get; set; } 49 public string xm { get; set; }
50 - 50 +
51 /// <summary> 51 /// <summary>
52 /// 电话号码 52 /// 电话号码
53 /// </summary> 53 /// </summary>
54 public string dhhm { get; set; } 54 public string dhhm { get; set; }
55 - 55 +
56 /// <summary> 56 /// <summary>
57 /// 座机 57 /// 座机
58 /// </summary> 58 /// </summary>
59 public string zj { get; set; } 59 public string zj { get; set; }
60 - 60 +
61 /// <summary> 61 /// <summary>
62 /// 开业时间 62 /// 开业时间
63 /// </summary> 63 /// </summary>
64 public DateTime? kysj { get; set; } 64 public DateTime? kysj { get; set; }
65 - 65 +
66 /// <summary> 66 /// <summary>
67 /// 最新状态 67 /// 最新状态
68 /// </summary> 68 /// </summary>
69 public string zxzt { get; set; } 69 public string zxzt { get; set; }
70 - 70 +
71 /// <summary> 71 /// <summary>
72 /// 工商名称 72 /// 工商名称
73 /// </summary> 73 /// </summary>
74 public string gsmc { get; set; } 74 public string gsmc { get; set; }
75 - 75 +
76 /// <summary> 76 /// <summary>
77 /// 法人 77 /// 法人
78 /// </summary> 78 /// </summary>
79 public string fr { get; set; } 79 public string fr { get; set; }
80 - 80 +
81 /// <summary> 81 /// <summary>
82 /// 有无社保 82 /// 有无社保
83 /// </summary> 83 /// </summary>
84 public string ywsb { get; set; } 84 public string ywsb { get; set; }
85 - 85 +
86 /// <summary> 86 /// <summary>
87 /// 事业部 87 /// 事业部
88 /// </summary> 88 /// </summary>
89 public string syb { get; set; } 89 public string syb { get; set; }
90 - 90 +
91 /// <summary> 91 /// <summary>
92 /// 教育部 92 /// 教育部
93 /// </summary> 93 /// </summary>
94 public string jyb { get; set; } 94 public string jyb { get; set; }
95 - 95 +
96 /// <summary> 96 /// <summary>
97 /// 科技部 97 /// 科技部
98 /// </summary> 98 /// </summary>
99 public string kjb { get; set; } 99 public string kjb { get; set; }
100 - 100 +
101 /// <summary> 101 /// <summary>
102 /// 大项目部 102 /// 大项目部
103 /// </summary> 103 /// </summary>
104 public string dxmb { get; set; } 104 public string dxmb { get; set; }
105 - 105 +
106 /// <summary> 106 /// <summary>
107 /// 归属起始时间 107 /// 归属起始时间
108 /// </summary> 108 /// </summary>
109 public DateTime? gsqssj { get; set; } 109 public DateTime? gsqssj { get; set; }
110 - 110 +
111 /// <summary> 111 /// <summary>
112 /// 归属终止时间 112 /// 归属终止时间
113 /// </summary> 113 /// </summary>
114 public DateTime? gszzsj { get; set; } 114 public DateTime? gszzsj { get; set; }
115 - 115 +
116 /// <summary> 116 /// <summary>
117 /// 状态 117 /// 状态
118 /// </summary> 118 /// </summary>
119 public int? status { get; set; } 119 public int? status { get; set; }
120 - 120 +
121 /// <summary> 121 /// <summary>
122 /// 目标-门店生命线 122 /// 目标-门店生命线
123 /// </summary> 123 /// </summary>
124 public decimal? xsyj { get; set; } 124 public decimal? xsyj { get; set; }
125 - 125 +
126 /// <summary> 126 /// <summary>
127 /// 目标-消耗业绩 127 /// 目标-消耗业绩
128 /// </summary> 128 /// </summary>
129 public decimal? xhyj { get; set; } 129 public decimal? xhyj { get; set; }
130 - 130 +
131 /// <summary> 131 /// <summary>
132 /// 目标-项目数 132 /// 目标-项目数
133 /// </summary> 133 /// </summary>
134 public int? xms { get; set; } 134 public int? xms { get; set; }
135 - 135 +
136 /// <summary> 136 /// <summary>
137 /// 目标-人头1 137 /// 目标-人头1
138 /// </summary> 138 /// </summary>
139 public int? rt1 { get; set; } 139 public int? rt1 { get; set; }
140 - 140 +
141 /// <summary> 141 /// <summary>
142 /// 目标-人头2 142 /// 目标-人头2
143 /// </summary> 143 /// </summary>
144 public int? rt2 { get; set; } 144 public int? rt2 { get; set; }
145 - 145 +
146 /// <summary> 146 /// <summary>
147 /// 目标-人次 147 /// 目标-人次
148 /// </summary> 148 /// </summary>
149 public int? rc { get; set; } 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 using System; 1 using System;
2 using System.Collections.Generic; 2 using System.Collections.Generic;
  3 +using NCC.Code;
  4 +using NCC.Extend.Entitys.Enum;
3 5
4 namespace NCC.Extend.Entitys.Dto.LqMdxx 6 namespace NCC.Extend.Entitys.Dto.LqMdxx
5 { 7 {
@@ -12,111 +14,130 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx @@ -12,111 +14,130 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
12 /// 主键 14 /// 主键
13 /// </summary> 15 /// </summary>
14 public string id { get; set; } 16 public string id { get; set; }
15 - 17 +
16 /// <summary> 18 /// <summary>
17 /// 门店编码 19 /// 门店编码
18 /// </summary> 20 /// </summary>
19 public string mdbm { get; set; } 21 public string mdbm { get; set; }
20 - 22 +
21 /// <summary> 23 /// <summary>
22 /// 单据门店编号 24 /// 单据门店编号
23 /// </summary> 25 /// </summary>
24 public string djmdbh { get; set; } 26 public string djmdbh { get; set; }
25 - 27 +
26 /// <summary> 28 /// <summary>
27 /// 单据门店 29 /// 单据门店
28 /// </summary> 30 /// </summary>
29 public string djmd { get; set; } 31 public string djmd { get; set; }
30 - 32 +
31 /// <summary> 33 /// <summary>
32 /// 店名 34 /// 店名
33 /// </summary> 35 /// </summary>
34 public string dm { get; set; } 36 public string dm { get; set; }
35 - 37 +
36 /// <summary> 38 /// <summary>
37 /// 城市 39 /// 城市
38 /// </summary> 40 /// </summary>
39 public string cs { get; set; } 41 public string cs { get; set; }
40 - 42 +
41 /// <summary> 43 /// <summary>
42 /// 地址 44 /// 地址
43 /// </summary> 45 /// </summary>
44 public string dz { get; set; } 46 public string dz { get; set; }
45 - 47 +
46 /// <summary> 48 /// <summary>
47 /// 姓名 49 /// 姓名
48 /// </summary> 50 /// </summary>
49 public string xm { get; set; } 51 public string xm { get; set; }
50 - 52 +
51 /// <summary> 53 /// <summary>
52 /// 电话号码 54 /// 电话号码
53 /// </summary> 55 /// </summary>
54 public string dhhm { get; set; } 56 public string dhhm { get; set; }
55 - 57 +
56 /// <summary> 58 /// <summary>
57 /// 座机 59 /// 座机
58 /// </summary> 60 /// </summary>
59 public string zj { get; set; } 61 public string zj { get; set; }
60 - 62 +
61 /// <summary> 63 /// <summary>
62 /// 开业时间 64 /// 开业时间
63 /// </summary> 65 /// </summary>
64 public DateTime? kysj { get; set; } 66 public DateTime? kysj { get; set; }
65 - 67 +
66 /// <summary> 68 /// <summary>
67 /// 最新状态 69 /// 最新状态
68 /// </summary> 70 /// </summary>
69 public string zxzt { get; set; } 71 public string zxzt { get; set; }
70 - 72 +
71 /// <summary> 73 /// <summary>
72 /// 工商名称 74 /// 工商名称
73 /// </summary> 75 /// </summary>
74 public string gsmc { get; set; } 76 public string gsmc { get; set; }
75 - 77 +
76 /// <summary> 78 /// <summary>
77 /// 法人 79 /// 法人
78 /// </summary> 80 /// </summary>
79 public string fr { get; set; } 81 public string fr { get; set; }
80 - 82 +
81 /// <summary> 83 /// <summary>
82 /// 有无社保 84 /// 有无社保
83 /// </summary> 85 /// </summary>
84 public string ywsb { get; set; } 86 public string ywsb { get; set; }
85 - 87 +
86 /// <summary> 88 /// <summary>
87 /// 事业部 89 /// 事业部
88 /// </summary> 90 /// </summary>
89 public string syb { get; set; } 91 public string syb { get; set; }
90 - 92 +
91 /// <summary> 93 /// <summary>
92 /// 教育部 94 /// 教育部
93 /// </summary> 95 /// </summary>
94 public string jyb { get; set; } 96 public string jyb { get; set; }
95 - 97 +
96 /// <summary> 98 /// <summary>
97 /// 科技部 99 /// 科技部
98 /// </summary> 100 /// </summary>
99 public string kjb { get; set; } 101 public string kjb { get; set; }
100 - 102 +
101 /// <summary> 103 /// <summary>
102 /// 大项目部 104 /// 大项目部
103 /// </summary> 105 /// </summary>
104 public string dxmb { get; set; } 106 public string dxmb { get; set; }
105 - 107 +
106 /// <summary> 108 /// <summary>
107 /// 归属起始时间 109 /// 归属起始时间
108 /// </summary> 110 /// </summary>
109 public DateTime? gsqssj { get; set; } 111 public DateTime? gsqssj { get; set; }
110 - 112 +
111 /// <summary> 113 /// <summary>
112 /// 归属终止时间 114 /// 归属终止时间
113 /// </summary> 115 /// </summary>
114 public DateTime? gszzsj { get; set; } 116 public DateTime? gszzsj { get; set; }
115 - 117 +
116 /// <summary> 118 /// <summary>
117 /// 状态 119 /// 状态
118 /// </summary> 120 /// </summary>
119 public int? status { get; set; } 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 using System; 1 using System;
  2 +using NCC.Code;
  3 +using NCC.Extend.Entitys.Enum;
2 4
3 namespace NCC.Extend.Entitys.Dto.LqMdxx 5 namespace NCC.Extend.Entitys.Dto.LqMdxx
4 { 6 {
@@ -11,107 +13,107 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx @@ -11,107 +13,107 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
11 /// 主键 13 /// 主键
12 /// </summary> 14 /// </summary>
13 public string id { get; set; } 15 public string id { get; set; }
14 - 16 +
15 /// <summary> 17 /// <summary>
16 /// 门店编码 18 /// 门店编码
17 /// </summary> 19 /// </summary>
18 public string mdbm { get; set; } 20 public string mdbm { get; set; }
19 - 21 +
20 /// <summary> 22 /// <summary>
21 /// 单据门店编号 23 /// 单据门店编号
22 /// </summary> 24 /// </summary>
23 public string djmdbh { get; set; } 25 public string djmdbh { get; set; }
24 - 26 +
25 /// <summary> 27 /// <summary>
26 /// 单据门店 28 /// 单据门店
27 /// </summary> 29 /// </summary>
28 public string djmd { get; set; } 30 public string djmd { get; set; }
29 - 31 +
30 /// <summary> 32 /// <summary>
31 /// 店名 33 /// 店名
32 /// </summary> 34 /// </summary>
33 public string dm { get; set; } 35 public string dm { get; set; }
34 - 36 +
35 /// <summary> 37 /// <summary>
36 /// 城市 38 /// 城市
37 /// </summary> 39 /// </summary>
38 public string cs { get; set; } 40 public string cs { get; set; }
39 - 41 +
40 /// <summary> 42 /// <summary>
41 /// 地址 43 /// 地址
42 /// </summary> 44 /// </summary>
43 public string dz { get; set; } 45 public string dz { get; set; }
44 - 46 +
45 /// <summary> 47 /// <summary>
46 /// 姓名 48 /// 姓名
47 /// </summary> 49 /// </summary>
48 public string xm { get; set; } 50 public string xm { get; set; }
49 - 51 +
50 /// <summary> 52 /// <summary>
51 /// 电话号码 53 /// 电话号码
52 /// </summary> 54 /// </summary>
53 public string dhhm { get; set; } 55 public string dhhm { get; set; }
54 - 56 +
55 /// <summary> 57 /// <summary>
56 /// 座机 58 /// 座机
57 /// </summary> 59 /// </summary>
58 public string zj { get; set; } 60 public string zj { get; set; }
59 - 61 +
60 /// <summary> 62 /// <summary>
61 /// 开业时间 63 /// 开业时间
62 /// </summary> 64 /// </summary>
63 public DateTime? kysj { get; set; } 65 public DateTime? kysj { get; set; }
64 - 66 +
65 /// <summary> 67 /// <summary>
66 /// 最新状态 68 /// 最新状态
67 /// </summary> 69 /// </summary>
68 public string zxzt { get; set; } 70 public string zxzt { get; set; }
69 - 71 +
70 /// <summary> 72 /// <summary>
71 /// 工商名称 73 /// 工商名称
72 /// </summary> 74 /// </summary>
73 public string gsmc { get; set; } 75 public string gsmc { get; set; }
74 - 76 +
75 /// <summary> 77 /// <summary>
76 /// 法人 78 /// 法人
77 /// </summary> 79 /// </summary>
78 public string fr { get; set; } 80 public string fr { get; set; }
79 - 81 +
80 /// <summary> 82 /// <summary>
81 /// 有无社保 83 /// 有无社保
82 /// </summary> 84 /// </summary>
83 public string ywsb { get; set; } 85 public string ywsb { get; set; }
84 - 86 +
85 /// <summary> 87 /// <summary>
86 /// 事业部 88 /// 事业部
87 /// </summary> 89 /// </summary>
88 public string syb { get; set; } 90 public string syb { get; set; }
89 - 91 +
90 /// <summary> 92 /// <summary>
91 /// 教育部 93 /// 教育部
92 /// </summary> 94 /// </summary>
93 public string jyb { get; set; } 95 public string jyb { get; set; }
94 - 96 +
95 /// <summary> 97 /// <summary>
96 /// 科技部 98 /// 科技部
97 /// </summary> 99 /// </summary>
98 public string kjb { get; set; } 100 public string kjb { get; set; }
99 - 101 +
100 /// <summary> 102 /// <summary>
101 /// 大项目部 103 /// 大项目部
102 /// </summary> 104 /// </summary>
103 public string dxmb { get; set; } 105 public string dxmb { get; set; }
104 - 106 +
105 /// <summary> 107 /// <summary>
106 /// 归属起始时间 108 /// 归属起始时间
107 /// </summary> 109 /// </summary>
108 public DateTime? gsqssj { get; set; } 110 public DateTime? gsqssj { get; set; }
109 - 111 +
110 /// <summary> 112 /// <summary>
111 /// 归属终止时间 113 /// 归属终止时间
112 /// </summary> 114 /// </summary>
113 public DateTime? gszzsj { get; set; } 115 public DateTime? gszzsj { get; set; }
114 - 116 +
115 /// <summary> 117 /// <summary>
116 /// 状态 118 /// 状态
117 /// </summary> 119 /// </summary>
@@ -121,31 +123,50 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx @@ -121,31 +123,50 @@ namespace NCC.Extend.Entitys.Dto.LqMdxx
121 /// 目标-门店生命线 123 /// 目标-门店生命线
122 /// </summary> 124 /// </summary>
123 public decimal? xsyj { get; set; } 125 public decimal? xsyj { get; set; }
124 - 126 +
125 /// <summary> 127 /// <summary>
126 /// 目标-消耗业绩 128 /// 目标-消耗业绩
127 /// </summary> 129 /// </summary>
128 public decimal? xhyj { get; set; } 130 public decimal? xhyj { get; set; }
129 - 131 +
130 /// <summary> 132 /// <summary>
131 /// 目标-项目数 133 /// 目标-项目数
132 /// </summary> 134 /// </summary>
133 public int? xms { get; set; } 135 public int? xms { get; set; }
134 - 136 +
135 /// <summary> 137 /// <summary>
136 /// 目标-人头1 138 /// 目标-人头1
137 /// </summary> 139 /// </summary>
138 public int? rt1 { get; set; } 140 public int? rt1 { get; set; }
139 - 141 +
140 /// <summary> 142 /// <summary>
141 /// 目标-人头2 143 /// 目标-人头2
142 /// </summary> 144 /// </summary>
143 public int? rt2 { get; set; } 145 public int? rt2 { get; set; }
144 - 146 +
145 /// <summary> 147 /// <summary>
146 /// 目标-人次 148 /// 目标-人次
147 /// </summary> 149 /// </summary>
148 public int? rc { get; set; } 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,5 +143,11 @@ namespace NCC.Extend.Entitys.lq_hytk_hytk
143 /// </summary> 143 /// </summary>
144 [SugarColumn(ColumnName = "F_SignatureFile")] 144 [SugarColumn(ColumnName = "F_SignatureFile")]
145 public string SignatureFile { get; set; } 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 \ No newline at end of file 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,5 +185,11 @@ namespace NCC.Extend.Entitys.lq_mdxx
185 [SugarColumn(ColumnName = "F_StoreType")] 185 [SugarColumn(ColumnName = "F_StoreType")]
186 public int? StoreType { get; set; } 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 \ No newline at end of file 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,6 +115,7 @@ namespace NCC.Extend.LqHytkHytk
115 czry = it.Czry, 115 czry = it.Czry,
116 fileUrl = it.FileUrl, 116 fileUrl = it.FileUrl,
117 isEffective = it.IsEffective, 117 isEffective = it.IsEffective,
  118 + cancelRemark = it.CancelRemark,
118 }) 119 })
119 .MergeTable() 120 .MergeTable()
120 .OrderBy(sidx + " " + input.sort) 121 .OrderBy(sidx + " " + input.sort)
@@ -477,7 +478,7 @@ namespace NCC.Extend.LqHytkHytk @@ -477,7 +478,7 @@ namespace NCC.Extend.LqHytkHytk
477 /// <param name="id">主键</param> 478 /// <param name="id">主键</param>
478 /// <returns></returns> 479 /// <returns></returns>
479 [HttpPut("VoidRefundCardInfo/{id}")] 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 try 483 try
483 { 484 {
@@ -491,6 +492,7 @@ namespace NCC.Extend.LqHytkHytk @@ -491,6 +492,7 @@ namespace NCC.Extend.LqHytkHytk
491 // 更新主表 492 // 更新主表
492 entity.IsEffective = StatusEnum.无效.GetHashCode(); 493 entity.IsEffective = StatusEnum.无效.GetHashCode();
493 entity.F_ModifyTime = DateTime.Now; 494 entity.F_ModifyTime = DateTime.Now;
  495 + entity.CancelRemark = remarks;
494 await _db.Updateable(entity).ExecuteCommandAsync(); 496 await _db.Updateable(entity).ExecuteCommandAsync();
495 // 更新明细表 497 // 更新明细表
496 await _db.Updateable<LqHytkMxEntity>().SetColumns(it => new LqHytkMxEntity { IsEffective = StatusEnum.无效.GetHashCode() }).Where(w => w.RefundInfoId == id).ExecuteCommandAsync(); 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,10 +602,10 @@ namespace NCC.Extend.LqHytkHytk
600 try 602 try
601 { 603 {
602 // 1. 查询主表信息 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 if (entity == null) 606 if (entity == null)
605 { 607 {
606 - throw NCCException.Oh(ErrorCode.COM1005, "退卡记录不存在或已作废"); 608 + throw NCCException.Oh("退卡记录不存在");
607 } 609 }
608 610
609 var output = entity.Adapt<LqHytkHytkInfoOutput>(); 611 var output = entity.Adapt<LqHytkHytkInfoOutput>();
@@ -633,6 +635,7 @@ namespace NCC.Extend.LqHytkHytk @@ -633,6 +635,7 @@ namespace NCC.Extend.LqHytkHytk
633 projectNumber = mx.ProjectNumber, 635 projectNumber = mx.ProjectNumber,
634 sourceType = mx.SourceType, 636 sourceType = mx.SourceType,
635 totalPrice = mx.TotalPrice, 637 totalPrice = mx.TotalPrice,
  638 + isEffective = mx.IsEffective,
636 }; 639 };
637 640
638 // 关联该品项的健康师业绩 641 // 关联该品项的健康师业绩
@@ -655,9 +658,9 @@ namespace NCC.Extend.LqHytkHytk @@ -655,9 +658,9 @@ namespace NCC.Extend.LqHytkHytk
655 658
656 return output; 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 #endregion 666 #endregion
netcore/src/Modularity/Extend/NCC.Extend/LqMdxxService.cs
  View file @fb9d5c6
@@ -22,6 +22,8 @@ using NCC.Common.Model.NPOI; @@ -22,6 +22,8 @@ using NCC.Common.Model.NPOI;
22 using NCC.Common.Configuration; 22 using NCC.Common.Configuration;
23 using NCC.DataEncryption; 23 using NCC.DataEncryption;
24 using NCC.ClayObject; 24 using NCC.ClayObject;
  25 +using NCC.Extend.Entitys.Enum;
  26 +using NCC.Code;
25 27
26 namespace NCC.Extend.LqMdxx 28 namespace NCC.Extend.LqMdxx
27 { 29 {
@@ -118,6 +120,8 @@ namespace NCC.Extend.LqMdxx @@ -118,6 +120,8 @@ namespace NCC.Extend.LqMdxx
118 rt1 = it.Rt1, 120 rt1 = it.Rt1,
119 rt2 = it.Rt2, 121 rt2 = it.Rt2,
120 rc = it.Rc, 122 rc = it.Rc,
  123 + StoreCategory = it.StoreCategory,
  124 + StoreType = it.StoreType,
121 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); 125 }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize);
122 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data); 126 return PageResult<LqMdxxListOutput>.SqlSugarPageResult(data);
123 } 127 }
@@ -187,6 +191,8 @@ namespace NCC.Extend.LqMdxx @@ -187,6 +191,8 @@ namespace NCC.Extend.LqMdxx
187 gsmc = it.Gsmc, 191 gsmc = it.Gsmc,
188 fr = it.Fr, 192 fr = it.Fr,
189 ywsb = it.Ywsb, 193 ywsb = it.Ywsb,
  194 + StoreCategory = it.StoreCategory,
  195 + StoreType = it.StoreType,
190 }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); 196 }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync();
191 return data; 197 return data;
192 } 198 }
@@ -322,10 +328,13 @@ namespace NCC.Extend.LqMdxx @@ -322,10 +328,13 @@ namespace NCC.Extend.LqMdxx
322 [HttpDelete("{id}")] 328 [HttpDelete("{id}")]
323 public async Task Delete(string id) 329 public async Task Delete(string id)
324 { 330 {
  331 +
325 var entity = await _db.Queryable<LqMdxxEntity>().FirstAsync(p => p.Id == id); 332 var entity = await _db.Queryable<LqMdxxEntity>().FirstAsync(p => p.Id == id);
326 _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); 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 #endregion 339 #endregion
331 340
@@ -343,5 +352,33 @@ namespace NCC.Extend.LqMdxx @@ -343,5 +352,33 @@ namespace NCC.Extend.LqMdxx
343 return new { list = list }; 352 return new { list = list };
344 } 353 }
345 #endregion 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 }