Commit 850bf2058d189ec6f83db1e9f03dea5c0d294a9b
1 parent
7cae7f7c
Add ActualPrice field to LqKdKdjlb and LqKdPxmx entities and DTOs for enhanced pricing details
Showing
6 changed files
with
116 additions
and
109 deletions
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbCrInput.cs
| @@ -13,146 +13,145 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb | @@ -13,146 +13,145 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb | ||
| 13 | /// 开单编号 | 13 | /// 开单编号 |
| 14 | /// </summary> | 14 | /// </summary> |
| 15 | public string id { get; set; } | 15 | public string id { get; set; } |
| 16 | - | 16 | + |
| 17 | /// <summary> | 17 | /// <summary> |
| 18 | /// 单据门店 | 18 | /// 单据门店 |
| 19 | /// </summary> | 19 | /// </summary> |
| 20 | public string djmd { get; set; } | 20 | public string djmd { get; set; } |
| 21 | - | 21 | + |
| 22 | /// <summary> | 22 | /// <summary> |
| 23 | /// 金三角 | 23 | /// 金三角 |
| 24 | /// </summary> | 24 | /// </summary> |
| 25 | public string jsj { get; set; } | 25 | public string jsj { get; set; } |
| 26 | - | 26 | + |
| 27 | /// <summary> | 27 | /// <summary> |
| 28 | /// 开单日期 | 28 | /// 开单日期 |
| 29 | /// </summary> | 29 | /// </summary> |
| 30 | public DateTime? kdrq { get; set; } | 30 | public DateTime? kdrq { get; set; } |
| 31 | - | 31 | + |
| 32 | /// <summary> | 32 | /// <summary> |
| 33 | /// 顾客类型 | 33 | /// 顾客类型 |
| 34 | /// </summary> | 34 | /// </summary> |
| 35 | public string gjlx { get; set; } | 35 | public string gjlx { get; set; } |
| 36 | - | 36 | + |
| 37 | /// <summary> | 37 | /// <summary> |
| 38 | /// 合作机构 | 38 | /// 合作机构 |
| 39 | /// </summary> | 39 | /// </summary> |
| 40 | public string hgjg { get; set; } | 40 | public string hgjg { get; set; } |
| 41 | - | 41 | + |
| 42 | /// <summary> | 42 | /// <summary> |
| 43 | /// 整单业绩 | 43 | /// 整单业绩 |
| 44 | /// </summary> | 44 | /// </summary> |
| 45 | public decimal zdyj { get; set; } | 45 | public decimal zdyj { get; set; } |
| 46 | - | 46 | + |
| 47 | /// <summary> | 47 | /// <summary> |
| 48 | /// 实付业绩 | 48 | /// 实付业绩 |
| 49 | /// </summary> | 49 | /// </summary> |
| 50 | public decimal sfyj { get; set; } | 50 | public decimal sfyj { get; set; } |
| 51 | - | 51 | + |
| 52 | /// <summary> | 52 | /// <summary> |
| 53 | /// 欠款 | 53 | /// 欠款 |
| 54 | /// </summary> | 54 | /// </summary> |
| 55 | public decimal qk { get; set; } | 55 | public decimal qk { get; set; } |
| 56 | - | 56 | + |
| 57 | /// <summary> | 57 | /// <summary> |
| 58 | /// 储扣方式 | 58 | /// 储扣方式 |
| 59 | /// </summary> | 59 | /// </summary> |
| 60 | public string ckfs { get; set; } | 60 | public string ckfs { get; set; } |
| 61 | - | 61 | + |
| 62 | /// <summary> | 62 | /// <summary> |
| 63 | /// 储扣明细 | 63 | /// 储扣明细 |
| 64 | /// </summary> | 64 | /// </summary> |
| 65 | public string ckmx { get; set; } | 65 | public string ckmx { get; set; } |
| 66 | - | 66 | + |
| 67 | /// <summary> | 67 | /// <summary> |
| 68 | /// 付款方式 | 68 | /// 付款方式 |
| 69 | /// </summary> | 69 | /// </summary> |
| 70 | public string fkfs { get; set; } | 70 | public string fkfs { get; set; } |
| 71 | - | 71 | + |
| 72 | /// <summary> | 72 | /// <summary> |
| 73 | /// 付款医院 | 73 | /// 付款医院 |
| 74 | /// </summary> | 74 | /// </summary> |
| 75 | public string fkyy { get; set; } | 75 | public string fkyy { get; set; } |
| 76 | - | 76 | + |
| 77 | /// <summary> | 77 | /// <summary> |
| 78 | /// 付款判断 | 78 | /// 付款判断 |
| 79 | /// </summary> | 79 | /// </summary> |
| 80 | public string fkpd { get; set; } | 80 | public string fkpd { get; set; } |
| 81 | - | 81 | + |
| 82 | /// <summary> | 82 | /// <summary> |
| 83 | /// 客户来源 | 83 | /// 客户来源 |
| 84 | /// </summary> | 84 | /// </summary> |
| 85 | public string khly { get; set; } | 85 | public string khly { get; set; } |
| 86 | - | 86 | + |
| 87 | /// <summary> | 87 | /// <summary> |
| 88 | /// 推荐人 | 88 | /// 推荐人 |
| 89 | /// </summary> | 89 | /// </summary> |
| 90 | public string tjr { get; set; } | 90 | public string tjr { get; set; } |
| 91 | - | 91 | + |
| 92 | /// <summary> | 92 | /// <summary> |
| 93 | /// 是否首开订单 | 93 | /// 是否首开订单 |
| 94 | /// </summary> | 94 | /// </summary> |
| 95 | public string sfskdd { get; set; } | 95 | public string sfskdd { get; set; } |
| 96 | - | 96 | + |
| 97 | /// <summary> | 97 | /// <summary> |
| 98 | /// 简介 | 98 | /// 简介 |
| 99 | /// </summary> | 99 | /// </summary> |
| 100 | public string jj { get; set; } | 100 | public string jj { get; set; } |
| 101 | - | 101 | + |
| 102 | /// <summary> | 102 | /// <summary> |
| 103 | /// 上传文件 | 103 | /// 上传文件 |
| 104 | /// </summary> | 104 | /// </summary> |
| 105 | public List<FileControlsModel> scwj { get; set; } | 105 | public List<FileControlsModel> scwj { get; set; } |
| 106 | - | 106 | + |
| 107 | /// <summary> | 107 | /// <summary> |
| 108 | /// 会员签字 | 108 | /// 会员签字 |
| 109 | /// </summary> | 109 | /// </summary> |
| 110 | public List<FileControlsModel> hyqz { get; set; } | 110 | public List<FileControlsModel> hyqz { get; set; } |
| 111 | - | 111 | + |
| 112 | /// <summary> | 112 | /// <summary> |
| 113 | /// 备注 | 113 | /// 备注 |
| 114 | /// </summary> | 114 | /// </summary> |
| 115 | public string bz { get; set; } | 115 | public string bz { get; set; } |
| 116 | - | 116 | + |
| 117 | /// <summary> | 117 | /// <summary> |
| 118 | /// 开单会员 | 118 | /// 开单会员 |
| 119 | /// </summary> | 119 | /// </summary> |
| 120 | public string kdhy { get; set; } | 120 | public string kdhy { get; set; } |
| 121 | - | 121 | + |
| 122 | /// <summary> | 122 | /// <summary> |
| 123 | /// 开单会员名称 | 123 | /// 开单会员名称 |
| 124 | /// </summary> | 124 | /// </summary> |
| 125 | public string kdhyc { get; set; } | 125 | public string kdhyc { get; set; } |
| 126 | - | 126 | + |
| 127 | /// <summary> | 127 | /// <summary> |
| 128 | /// 开单会员手机号 | 128 | /// 开单会员手机号 |
| 129 | /// </summary> | 129 | /// </summary> |
| 130 | public string kdhysjh { get; set; } | 130 | public string kdhysjh { get; set; } |
| 131 | - | 131 | + |
| 132 | /// <summary> | 132 | /// <summary> |
| 133 | /// 健康师业绩 | 133 | /// 健康师业绩 |
| 134 | /// </summary> | 134 | /// </summary> |
| 135 | public string jksyj { get; set; } | 135 | public string jksyj { get; set; } |
| 136 | - | 136 | + |
| 137 | /// <summary> | 137 | /// <summary> |
| 138 | /// 科技部老师业绩 | 138 | /// 科技部老师业绩 |
| 139 | /// </summary> | 139 | /// </summary> |
| 140 | public string kjblsyj { get; set; } | 140 | public string kjblsyj { get; set; } |
| 141 | - | 141 | + |
| 142 | /// <summary> | 142 | /// <summary> |
| 143 | /// 品项信息 | 143 | /// 品项信息 |
| 144 | /// </summary> | 144 | /// </summary> |
| 145 | public string pxxx { get; set; } | 145 | public string pxxx { get; set; } |
| 146 | - | 146 | + |
| 147 | /// <summary> | 147 | /// <summary> |
| 148 | /// 方案其他 | 148 | /// 方案其他 |
| 149 | /// </summary> | 149 | /// </summary> |
| 150 | public string F_FIleUrl { get; set; } | 150 | public string F_FIleUrl { get; set; } |
| 151 | - | 151 | + |
| 152 | /// <summary> | 152 | /// <summary> |
| 153 | /// 开单_品项明细 | 153 | /// 开单_品项明细 |
| 154 | /// </summary> | 154 | /// </summary> |
| 155 | public List<LqKdPxmxCrInput> lqKdPxmxList { get; set; } | 155 | public List<LqKdPxmxCrInput> lqKdPxmxList { get; set; } |
| 156 | - | ||
| 157 | } | 156 | } |
| 158 | } | 157 | } |
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdPxmx/LqKdPxmxCrInput.cs
| @@ -34,6 +34,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb | @@ -34,6 +34,11 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb | ||
| 34 | public decimal pxjg { get; set; } | 34 | public decimal pxjg { get; set; } |
| 35 | 35 | ||
| 36 | /// <summary> | 36 | /// <summary> |
| 37 | + /// 实付金额 | ||
| 38 | + /// </summary> | ||
| 39 | + public decimal actualPrice { get; set; } | ||
| 40 | + | ||
| 41 | + /// <summary> | ||
| 37 | /// 会员id | 42 | /// 会员id |
| 38 | /// </summary> | 43 | /// </summary> |
| 39 | public string memberId { get; set; } | 44 | public string memberId { get; set; } |
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_kdjlb/LqKdKdjlbEntity.cs
| 1 | -using NCC.Common.Const; | 1 | +using System; |
| 2 | +using NCC.Common.Const; | ||
| 2 | using SqlSugar; | 3 | using SqlSugar; |
| 3 | -using System; | ||
| 4 | 4 | ||
| 5 | namespace NCC.Extend.Entitys.lq_kd_kdjlb | 5 | namespace NCC.Extend.Entitys.lq_kd_kdjlb |
| 6 | { | 6 | { |
| @@ -16,174 +16,173 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb | @@ -16,174 +16,173 @@ namespace NCC.Extend.Entitys.lq_kd_kdjlb | ||
| 16 | /// </summary> | 16 | /// </summary> |
| 17 | [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] | 17 | [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] |
| 18 | public string Id { get; set; } | 18 | public string Id { get; set; } |
| 19 | - | 19 | + |
| 20 | /// <summary> | 20 | /// <summary> |
| 21 | /// 单据门店 | 21 | /// 单据门店 |
| 22 | /// </summary> | 22 | /// </summary> |
| 23 | - [SugarColumn(ColumnName = "djmd")] | 23 | + [SugarColumn(ColumnName = "djmd")] |
| 24 | public string Djmd { get; set; } | 24 | public string Djmd { get; set; } |
| 25 | - | 25 | + |
| 26 | /// <summary> | 26 | /// <summary> |
| 27 | /// 金三角 | 27 | /// 金三角 |
| 28 | /// </summary> | 28 | /// </summary> |
| 29 | - [SugarColumn(ColumnName = "jsj")] | 29 | + [SugarColumn(ColumnName = "jsj")] |
| 30 | public string Jsj { get; set; } | 30 | public string Jsj { get; set; } |
| 31 | - | 31 | + |
| 32 | /// <summary> | 32 | /// <summary> |
| 33 | /// 开单日期 | 33 | /// 开单日期 |
| 34 | /// </summary> | 34 | /// </summary> |
| 35 | - [SugarColumn(ColumnName = "kdrq")] | 35 | + [SugarColumn(ColumnName = "kdrq")] |
| 36 | public DateTime? Kdrq { get; set; } | 36 | public DateTime? Kdrq { get; set; } |
| 37 | - | 37 | + |
| 38 | /// <summary> | 38 | /// <summary> |
| 39 | /// 顾客类型 | 39 | /// 顾客类型 |
| 40 | /// </summary> | 40 | /// </summary> |
| 41 | - [SugarColumn(ColumnName = "gjlx")] | 41 | + [SugarColumn(ColumnName = "gjlx")] |
| 42 | public string Gjlx { get; set; } | 42 | public string Gjlx { get; set; } |
| 43 | - | 43 | + |
| 44 | /// <summary> | 44 | /// <summary> |
| 45 | /// 合作机构 | 45 | /// 合作机构 |
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | - [SugarColumn(ColumnName = "hgjg")] | 47 | + [SugarColumn(ColumnName = "hgjg")] |
| 48 | public string Hgjg { get; set; } | 48 | public string Hgjg { get; set; } |
| 49 | - | 49 | + |
| 50 | /// <summary> | 50 | /// <summary> |
| 51 | /// 整单业绩 | 51 | /// 整单业绩 |
| 52 | /// </summary> | 52 | /// </summary> |
| 53 | - [SugarColumn(ColumnName = "zdyj")] | 53 | + [SugarColumn(ColumnName = "zdyj")] |
| 54 | public decimal Zdyj { get; set; } | 54 | public decimal Zdyj { get; set; } |
| 55 | - | 55 | + |
| 56 | /// <summary> | 56 | /// <summary> |
| 57 | /// 实付业绩 | 57 | /// 实付业绩 |
| 58 | /// </summary> | 58 | /// </summary> |
| 59 | - [SugarColumn(ColumnName = "sfyj")] | 59 | + [SugarColumn(ColumnName = "sfyj")] |
| 60 | public decimal Sfyj { get; set; } | 60 | public decimal Sfyj { get; set; } |
| 61 | - | 61 | + |
| 62 | /// <summary> | 62 | /// <summary> |
| 63 | /// 欠款 | 63 | /// 欠款 |
| 64 | /// </summary> | 64 | /// </summary> |
| 65 | - [SugarColumn(ColumnName = "qk")] | 65 | + [SugarColumn(ColumnName = "qk")] |
| 66 | public decimal Qk { get; set; } | 66 | public decimal Qk { get; set; } |
| 67 | - | 67 | + |
| 68 | /// <summary> | 68 | /// <summary> |
| 69 | /// 储扣方式 | 69 | /// 储扣方式 |
| 70 | /// </summary> | 70 | /// </summary> |
| 71 | - [SugarColumn(ColumnName = "ckfs")] | 71 | + [SugarColumn(ColumnName = "ckfs")] |
| 72 | public string Ckfs { get; set; } | 72 | public string Ckfs { get; set; } |
| 73 | - | 73 | + |
| 74 | /// <summary> | 74 | /// <summary> |
| 75 | /// 储扣明细 | 75 | /// 储扣明细 |
| 76 | /// </summary> | 76 | /// </summary> |
| 77 | - [SugarColumn(ColumnName = "ckmx")] | 77 | + [SugarColumn(ColumnName = "ckmx")] |
| 78 | public string Ckmx { get; set; } | 78 | public string Ckmx { get; set; } |
| 79 | - | 79 | + |
| 80 | /// <summary> | 80 | /// <summary> |
| 81 | /// 付款方式 | 81 | /// 付款方式 |
| 82 | /// </summary> | 82 | /// </summary> |
| 83 | - [SugarColumn(ColumnName = "fkfs")] | 83 | + [SugarColumn(ColumnName = "fkfs")] |
| 84 | public string Fkfs { get; set; } | 84 | public string Fkfs { get; set; } |
| 85 | - | 85 | + |
| 86 | /// <summary> | 86 | /// <summary> |
| 87 | /// 付款医院 | 87 | /// 付款医院 |
| 88 | /// </summary> | 88 | /// </summary> |
| 89 | - [SugarColumn(ColumnName = "fkyy")] | 89 | + [SugarColumn(ColumnName = "fkyy")] |
| 90 | public string Fkyy { get; set; } | 90 | public string Fkyy { get; set; } |
| 91 | - | 91 | + |
| 92 | /// <summary> | 92 | /// <summary> |
| 93 | /// 付款判断 | 93 | /// 付款判断 |
| 94 | /// </summary> | 94 | /// </summary> |
| 95 | - [SugarColumn(ColumnName = "fkpd")] | 95 | + [SugarColumn(ColumnName = "fkpd")] |
| 96 | public string Fkpd { get; set; } | 96 | public string Fkpd { get; set; } |
| 97 | - | 97 | + |
| 98 | /// <summary> | 98 | /// <summary> |
| 99 | /// 客户来源 | 99 | /// 客户来源 |
| 100 | /// </summary> | 100 | /// </summary> |
| 101 | - [SugarColumn(ColumnName = "khly")] | 101 | + [SugarColumn(ColumnName = "khly")] |
| 102 | public string Khly { get; set; } | 102 | public string Khly { get; set; } |
| 103 | - | 103 | + |
| 104 | /// <summary> | 104 | /// <summary> |
| 105 | /// 推荐人 | 105 | /// 推荐人 |
| 106 | /// </summary> | 106 | /// </summary> |
| 107 | - [SugarColumn(ColumnName = "tjr")] | 107 | + [SugarColumn(ColumnName = "tjr")] |
| 108 | public string Tjr { get; set; } | 108 | public string Tjr { get; set; } |
| 109 | - | 109 | + |
| 110 | /// <summary> | 110 | /// <summary> |
| 111 | /// 是否首开订单 | 111 | /// 是否首开订单 |
| 112 | /// </summary> | 112 | /// </summary> |
| 113 | - [SugarColumn(ColumnName = "sfskdd")] | 113 | + [SugarColumn(ColumnName = "sfskdd")] |
| 114 | public string Sfskdd { get; set; } | 114 | public string Sfskdd { get; set; } |
| 115 | - | 115 | + |
| 116 | /// <summary> | 116 | /// <summary> |
| 117 | /// 简介 | 117 | /// 简介 |
| 118 | /// </summary> | 118 | /// </summary> |
| 119 | - [SugarColumn(ColumnName = "jj")] | 119 | + [SugarColumn(ColumnName = "jj")] |
| 120 | public string Jj { get; set; } | 120 | public string Jj { get; set; } |
| 121 | - | 121 | + |
| 122 | /// <summary> | 122 | /// <summary> |
| 123 | /// 上传文件 | 123 | /// 上传文件 |
| 124 | /// </summary> | 124 | /// </summary> |
| 125 | - [SugarColumn(ColumnName = "scwj")] | 125 | + [SugarColumn(ColumnName = "scwj")] |
| 126 | public string Scwj { get; set; } | 126 | public string Scwj { get; set; } |
| 127 | - | 127 | + |
| 128 | /// <summary> | 128 | /// <summary> |
| 129 | /// 会员签字 | 129 | /// 会员签字 |
| 130 | /// </summary> | 130 | /// </summary> |
| 131 | - [SugarColumn(ColumnName = "hyqz")] | 131 | + [SugarColumn(ColumnName = "hyqz")] |
| 132 | public string Hyqz { get; set; } | 132 | public string Hyqz { get; set; } |
| 133 | - | 133 | + |
| 134 | /// <summary> | 134 | /// <summary> |
| 135 | /// 备注 | 135 | /// 备注 |
| 136 | /// </summary> | 136 | /// </summary> |
| 137 | - [SugarColumn(ColumnName = "bz")] | 137 | + [SugarColumn(ColumnName = "bz")] |
| 138 | public string Bz { get; set; } | 138 | public string Bz { get; set; } |
| 139 | - | 139 | + |
| 140 | /// <summary> | 140 | /// <summary> |
| 141 | /// 开单会员 | 141 | /// 开单会员 |
| 142 | /// </summary> | 142 | /// </summary> |
| 143 | - [SugarColumn(ColumnName = "kdhy")] | 143 | + [SugarColumn(ColumnName = "kdhy")] |
| 144 | public string Kdhy { get; set; } | 144 | public string Kdhy { get; set; } |
| 145 | - | 145 | + |
| 146 | /// <summary> | 146 | /// <summary> |
| 147 | /// 开单会员名称 | 147 | /// 开单会员名称 |
| 148 | /// </summary> | 148 | /// </summary> |
| 149 | - [SugarColumn(ColumnName = "kdhyc")] | 149 | + [SugarColumn(ColumnName = "kdhyc")] |
| 150 | public string Kdhyc { get; set; } | 150 | public string Kdhyc { get; set; } |
| 151 | - | 151 | + |
| 152 | /// <summary> | 152 | /// <summary> |
| 153 | /// 开单会员手机号 | 153 | /// 开单会员手机号 |
| 154 | /// </summary> | 154 | /// </summary> |
| 155 | - [SugarColumn(ColumnName = "kdhysjh")] | 155 | + [SugarColumn(ColumnName = "kdhysjh")] |
| 156 | public string Kdhysjh { get; set; } | 156 | public string Kdhysjh { get; set; } |
| 157 | - | 157 | + |
| 158 | /// <summary> | 158 | /// <summary> |
| 159 | /// 健康师业绩 | 159 | /// 健康师业绩 |
| 160 | /// </summary> | 160 | /// </summary> |
| 161 | - [SugarColumn(ColumnName = "jksyj")] | 161 | + [SugarColumn(ColumnName = "jksyj")] |
| 162 | public string Jksyj { get; set; } | 162 | public string Jksyj { get; set; } |
| 163 | - | 163 | + |
| 164 | /// <summary> | 164 | /// <summary> |
| 165 | /// 科技部老师业绩 | 165 | /// 科技部老师业绩 |
| 166 | /// </summary> | 166 | /// </summary> |
| 167 | - [SugarColumn(ColumnName = "kjblsyj")] | 167 | + [SugarColumn(ColumnName = "kjblsyj")] |
| 168 | public string Kjblsyj { get; set; } | 168 | public string Kjblsyj { get; set; } |
| 169 | - | 169 | + |
| 170 | /// <summary> | 170 | /// <summary> |
| 171 | /// 品项信息 | 171 | /// 品项信息 |
| 172 | /// </summary> | 172 | /// </summary> |
| 173 | - [SugarColumn(ColumnName = "pxxx")] | 173 | + [SugarColumn(ColumnName = "pxxx")] |
| 174 | public string Pxxx { get; set; } | 174 | public string Pxxx { get; set; } |
| 175 | 175 | ||
| 176 | /// <summary> | 176 | /// <summary> |
| 177 | /// 开单用户 | 177 | /// 开单用户 |
| 178 | /// </summary> | 178 | /// </summary> |
| 179 | - [SugarColumn(ColumnName = "F_CreateUser")] | 179 | + [SugarColumn(ColumnName = "F_CreateUser")] |
| 180 | public string CreateUser { get; set; } | 180 | public string CreateUser { get; set; } |
| 181 | - | 181 | + |
| 182 | /// <summary> | 182 | /// <summary> |
| 183 | /// 方案其他 | 183 | /// 方案其他 |
| 184 | /// </summary> | 184 | /// </summary> |
| 185 | - [SugarColumn(ColumnName = "F_FIleUrl")] | 185 | + [SugarColumn(ColumnName = "F_FIleUrl")] |
| 186 | public string F_FIleUrl { get; set; } | 186 | public string F_FIleUrl { get; set; } |
| 187 | - | ||
| 188 | } | 187 | } |
| 189 | -} | ||
| 190 | \ No newline at end of file | 188 | \ No newline at end of file |
| 189 | +} |
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/lq_kd_pxmx/LqKdPxmxEntity.cs
| 1 | -using NCC.Common.Const; | 1 | +using System; |
| 2 | +using NCC.Common.Const; | ||
| 2 | using SqlSugar; | 3 | using SqlSugar; |
| 3 | -using System; | ||
| 4 | 4 | ||
| 5 | namespace NCC.Extend.Entitys.lq_kd_pxmx | 5 | namespace NCC.Extend.Entitys.lq_kd_pxmx |
| 6 | { | 6 | { |
| @@ -16,68 +16,71 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx | @@ -16,68 +16,71 @@ namespace NCC.Extend.Entitys.lq_kd_pxmx | ||
| 16 | /// </summary> | 16 | /// </summary> |
| 17 | [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] | 17 | [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] |
| 18 | public string Id { get; set; } | 18 | public string Id { get; set; } |
| 19 | - | 19 | + |
| 20 | /// <summary> | 20 | /// <summary> |
| 21 | /// 关联开单编号 | 21 | /// 关联开单编号 |
| 22 | /// </summary> | 22 | /// </summary> |
| 23 | - [SugarColumn(ColumnName = "glkdbh")] | 23 | + [SugarColumn(ColumnName = "glkdbh")] |
| 24 | public string Glkdbh { get; set; } | 24 | public string Glkdbh { get; set; } |
| 25 | - | 25 | + |
| 26 | /// <summary> | 26 | /// <summary> |
| 27 | /// 品项 | 27 | /// 品项 |
| 28 | /// </summary> | 28 | /// </summary> |
| 29 | - [SugarColumn(ColumnName = "px")] | 29 | + [SugarColumn(ColumnName = "px")] |
| 30 | public string Px { get; set; } | 30 | public string Px { get; set; } |
| 31 | - | 31 | + |
| 32 | /// <summary> | 32 | /// <summary> |
| 33 | /// 品项名称 | 33 | /// 品项名称 |
| 34 | /// </summary> | 34 | /// </summary> |
| 35 | - [SugarColumn(ColumnName = "pxmc")] | 35 | + [SugarColumn(ColumnName = "pxmc")] |
| 36 | public string Pxmc { get; set; } | 36 | public string Pxmc { get; set; } |
| 37 | - | 37 | + |
| 38 | /// <summary> | 38 | /// <summary> |
| 39 | /// 品项价格 | 39 | /// 品项价格 |
| 40 | /// </summary> | 40 | /// </summary> |
| 41 | - [SugarColumn(ColumnName = "pxjg")] | 41 | + [SugarColumn(ColumnName = "pxjg")] |
| 42 | public decimal Pxjg { get; set; } | 42 | public decimal Pxjg { get; set; } |
| 43 | 43 | ||
| 44 | /// <summary> | 44 | /// <summary> |
| 45 | /// 会员id | 45 | /// 会员id |
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | - [SugarColumn(ColumnName = "F_MemberId")] | 47 | + [SugarColumn(ColumnName = "F_MemberId")] |
| 48 | public string MemberId { get; set; } | 48 | public string MemberId { get; set; } |
| 49 | 49 | ||
| 50 | /// <summary> | 50 | /// <summary> |
| 51 | /// 创建时间 | 51 | /// 创建时间 |
| 52 | /// </summary> | 52 | /// </summary> |
| 53 | - [SugarColumn(ColumnName = "F_CreateTIme")] | 53 | + [SugarColumn(ColumnName = "F_CreateTIme")] |
| 54 | public DateTime? CreateTIme { get; set; } | 54 | public DateTime? CreateTIme { get; set; } |
| 55 | 55 | ||
| 56 | /// <summary> | 56 | /// <summary> |
| 57 | /// 项目次数 | 57 | /// 项目次数 |
| 58 | /// </summary> | 58 | /// </summary> |
| 59 | - [SugarColumn(ColumnName = "F_ProjectNumber")] | 59 | + [SugarColumn(ColumnName = "F_ProjectNumber")] |
| 60 | public int? ProjectNumber { get; set; } | 60 | public int? ProjectNumber { get; set; } |
| 61 | 61 | ||
| 62 | /// <summary> | 62 | /// <summary> |
| 63 | /// 是否有效 | 63 | /// 是否有效 |
| 64 | /// </summary> | 64 | /// </summary> |
| 65 | - [SugarColumn(ColumnName = "F_IsEnabled")] | 65 | + [SugarColumn(ColumnName = "F_IsEnabled")] |
| 66 | public int? IsEnabled { get; set; } | 66 | public int? IsEnabled { get; set; } |
| 67 | 67 | ||
| 68 | - | ||
| 69 | /// <summary> | 68 | /// <summary> |
| 70 | /// 来源类型 | 69 | /// 来源类型 |
| 71 | /// </summary> | 70 | /// </summary> |
| 72 | - [SugarColumn(ColumnName = "F_SourceType")] | 71 | + [SugarColumn(ColumnName = "F_SourceType")] |
| 73 | public string SourceType { get; set; } | 72 | public string SourceType { get; set; } |
| 74 | 73 | ||
| 75 | - | ||
| 76 | /// <summary> | 74 | /// <summary> |
| 77 | /// 金额合计 | 75 | /// 金额合计 |
| 78 | /// </summary> | 76 | /// </summary> |
| 79 | - [SugarColumn(ColumnName = "F_TotalPrice")] | 77 | + [SugarColumn(ColumnName = "F_TotalPrice")] |
| 80 | public decimal TotalPrice { get; set; } | 78 | public decimal TotalPrice { get; set; } |
| 81 | - | 79 | + |
| 80 | + /// <summary> | ||
| 81 | + /// 实付金额 | ||
| 82 | + /// </summary> | ||
| 83 | + [SugarColumn(ColumnName = "F_ActualPrice")] | ||
| 84 | + public decimal ActualPrice { get; set; } | ||
| 82 | } | 85 | } |
| 83 | -} | ||
| 84 | \ No newline at end of file | 86 | \ No newline at end of file |
| 87 | +} |
netcore/src/Modularity/Extend/NCC.Extend/LqKdKdjlbService.cs
| @@ -281,6 +281,7 @@ namespace NCC.Extend.LqKdKdjlb | @@ -281,6 +281,7 @@ namespace NCC.Extend.LqKdKdjlb | ||
| 281 | Pxmc = item.pxmc, | 281 | Pxmc = item.pxmc, |
| 282 | Pxjg = item.pxjg, | 282 | Pxjg = item.pxjg, |
| 283 | SourceType = item.sourceType, | 283 | SourceType = item.sourceType, |
| 284 | + ActualPrice = item.actualPrice, | ||
| 284 | }; | 285 | }; |
| 285 | allPxmxEntities.Add(lqKdPxmxEntity); | 286 | allPxmxEntities.Add(lqKdPxmxEntity); |
| 286 | 287 |
netcore/src/Modularity/Extend/NCC.Extend/LqKhxxService.cs
| @@ -336,7 +336,7 @@ namespace NCC.Extend.LqKhxx | @@ -336,7 +336,7 @@ namespace NCC.Extend.LqKhxx | ||
| 336 | } | 336 | } |
| 337 | #endregion | 337 | #endregion |
| 338 | 338 | ||
| 339 | - #region 获取客户订单类型 | 339 | + #region 获取客户订单类型(首单/升单) |
| 340 | /// <summary> | 340 | /// <summary> |
| 341 | /// 获取客户订单类型(首单/升单) | 341 | /// 获取客户订单类型(首单/升单) |
| 342 | /// </summary> | 342 | /// </summary> |