antissoft / lvqianmeiye_ERP

Commit 4b31ecb4b4844aa24bbda0a2fdca104f5980ba10

Authored by “wangming”
1 parent e745bcc2

feat: 更新开发环境配置和DTO字段 

- 修改开发环境API地址配置，切换为localhost
- 在多个DTO类中新增isEffective字段，表示是否有效
- 更新LqKdKdjlbListQueryInput和TransferCardInput类，调整字段类型以支持decimal数据类型
- 优化代码格式，移除多余空行
Inline Side-by-side
Showing 7 changed files with 160 additions and 37 deletions
antis-ncc-admin/.env.development
  View file @4b31ecb
... ... @@ -2,6 +2,6 @@
2 2  
3 3 VUE_CLI_BABEL_TRANSPILE_MODULES = true
4 4 # VUE_APP_BASE_API = 'http://lvqian.antissoft.com'
5   -VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
6   -# VUE_APP_BASE_API = 'http://localhost:2011'
  5 +# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
  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/LqHytkHytkListQueryInput.cs
  View file @4b31ecb
... ... @@ -12,72 +12,72 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
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 md { get; set; }
20   -
  20 +
21 21 /// <summary>
22 22 /// 门店编号
23 23 /// </summary>
24 24 public string mdbh { get; set; }
25   -
  25 +
26 26 /// <summary>
27 27 /// 门店名称
28 28 /// </summary>
29 29 public string mdmc { get; set; }
30   -
  30 +
31 31 /// <summary>
32 32 /// 会员
33 33 /// </summary>
34 34 public string hy { get; set; }
35   -
  35 +
36 36 /// <summary>
37 37 /// 会员姓名
38 38 /// </summary>
39 39 public string hymc { get; set; }
40   -
  40 +
41 41 /// <summary>
42 42 /// 会员账号
43 43 /// </summary>
44 44 public string hyzh { get; set; }
45   -
  45 +
46 46 /// <summary>
47 47 /// 顾客类型
48 48 /// </summary>
49 49 public string gklx { get; set; }
50   -
  50 +
51 51 /// <summary>
52 52 /// 退卡总金额
53 53 /// </summary>
54 54 public decimal? tkje { get; set; }
55   -
  55 +
56 56 /// <summary>
57 57 /// 手工费用
58 58 /// </summary>
59 59 public decimal? sgfy { get; set; }
60   -
  60 +
61 61 /// <summary>
62 62 /// 备注
63 63 /// </summary>
64 64 public string bz { get; set; }
65   -
  65 +
66 66 /// <summary>
67 67 /// 退卡时间
68 68 /// </summary>
69 69 public string tksj { get; set; }
70   -
  70 +
71 71 /// <summary>
72 72 /// 操作人员
73 73 /// </summary>
74 74 public string czry { get; set; }
75   -
  75 +
76 76 /// <summary>
77 77 /// 退卡状态
78 78 /// </summary>
79 79 public string tkzt { get; set; }
80   -
  80 +
81 81 /// <summary>
82 82 /// 退卡原因
83 83 /// </summary>
... ... @@ -87,6 +87,11 @@ namespace NCC.Extend.Entitys.Dto.LqHytkHytk
87 87 /// 退卡附件
88 88 /// </summary>
89 89 public string fileUrl { get; set; }
90   -
  90 +
  91 + /// <summary>
  92 + /// 是否有效
  93 + /// </summary>
  94 + public int isEffective { get; set; } = 0;
  95 +
91 96 }
92 97 }
93 98 \ No newline at end of file
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/LqKdKdjlbListQueryInput.cs
  View file @4b31ecb
... ... @@ -48,21 +48,20 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
48 48 /// 合作机构
49 49 /// </summary>
50 50 public string hgjg { get; set; }
51   -
52 51 /// <summary>
53 52 /// 整单业绩
54 53 /// </summary>
55   - public string zdyj { get; set; }
  54 + public decimal? zdyj { get; set; }
56 55  
57 56 /// <summary>
58 57 /// 实付业绩
59 58 /// </summary>
60   - public string sfyj { get; set; }
  59 + public decimal? sfyj { get; set; }
61 60  
62 61 /// <summary>
63 62 /// 欠款
64 63 /// </summary>
65   - public string qk { get; set; }
  64 + public decimal? qk { get; set; }
66 65  
67 66 /// <summary>
68 67 /// 储扣方式
... ... @@ -135,5 +134,10 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
135 134 /// </summary>
136 135 public string CreateUser { get; set; }
137 136  
  137 + /// <summary>
  138 + /// 是否有效
  139 + /// </summary>
  140 + public int isEffective { get; set; } = 0;
  141 +
138 142 }
139 143 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqKdKdjlb/TransferCardInput.cs
  View file @4b31ecb
... ... @@ -28,7 +28,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
28 28 /// 转出会员签名
29 29 /// </summary>
30 30 [Required(ErrorMessage = "传出会员签名不能为空")]
31   - [StringLength(50, ErrorMessage = "传出会员签名长度不能超过50个字符")]
32 31 [Display(Name = "传出会员签名")]
33 32 public string SignatureFile { get; set; }
34 33  
... ... @@ -77,14 +76,6 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
77 76 public int TransferQuantity { get; set; }
78 77  
79 78 /// <summary>
80   - /// 品项ID
81   - /// </summary>
82   - [Required(ErrorMessage = "品项ID不能为空")]
83   - [StringLength(50, ErrorMessage = "品项ID长度不能超过50个字符")]
84   - [Display(Name = "品项ID")]
85   - public string ItemId { get; set; }
86   -
87   - /// <summary>
88 79 /// 品项名称
89 80 /// </summary>
90 81 [Required(ErrorMessage = "品项名称不能为空")]
... ... @@ -100,12 +91,5 @@ namespace NCC.Extend.Entitys.Dto.LqKdKdjlb
100 91 [Display(Name = "品项价格")]
101 92 public decimal ItemPrice { get; set; }
102 93  
103   - /// <summary>
104   - /// 来源类型
105   - /// </summary>
106   - [StringLength(50, ErrorMessage = "来源类型长度不能超过50个字符")]
107   - [Display(Name = "来源类型")]
108   - public string SourceType { get; set; } = "转卡";
109   -
110 94 }
111 95 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhHyhk/LqXhHyhkListQueryInput.cs
  View file @4b31ecb
... ... @@ -74,5 +74,10 @@ namespace NCC.Extend.Entitys.Dto.LqXhHyhk
74 74 /// </summary>
75 75 public string czry { get; set; }
76 76  
  77 + /// <summary>
  78 + /// 是否有效
  79 + /// </summary>
  80 + public int isEffective { get; set; } = 0;
  81 +
77 82 }
78 83 }
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsInput.cs 0 → 100644
  View file @4b31ecb
  1 +using System;
  2 +
  3 +namespace NCC.Extend.Entitys.Dto.LqXmzl
  4 +{
  5 + /// <summary>
  6 + /// 品项维度统计输入参数
  7 + /// </summary>
  8 + public class LqXmzlStatisticsInput
  9 + {
  10 + /// <summary>
  11 + /// 开始时间
  12 + /// </summary>
  13 + public DateTime? StartTime { get; set; }
  14 +
  15 + /// <summary>
  16 + /// 结束时间
  17 + /// </summary>
  18 + public DateTime? EndTime { get; set; }
  19 +
  20 + /// <summary>
  21 + /// 门店ID
  22 + /// </summary>
  23 + public string StoreId { get; set; }
  24 +
  25 + /// <summary>
  26 + /// 品项分类
  27 + /// </summary>
  28 + public string Category { get; set; }
  29 +
  30 + /// <summary>
  31 + /// 品项ID（单个品项统计）
  32 + /// </summary>
  33 + public string ItemId { get; set; }
  34 + }
  35 +}
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXmzl/LqXmzlStatisticsOutput.cs 0 → 100644
  View file @4b31ecb
  1 +using System;
  2 +
  3 +namespace NCC.Extend.Entitys.Dto.LqXmzl
  4 +{
  5 + /// <summary>
  6 + /// 品项维度统计输出参数
  7 + /// </summary>
  8 + public class LqXmzlStatisticsOutput
  9 + {
  10 + /// <summary>
  11 + /// 品项ID
  12 + /// </summary>
  13 + public string ItemId { get; set; }
  14 +
  15 + /// <summary>
  16 + /// 品项名称
  17 + /// </summary>
  18 + public string ItemName { get; set; }
  19 +
  20 + /// <summary>
  21 + /// 品项编号
  22 + /// </summary>
  23 + public string ItemNumber { get; set; }
  24 +
  25 + /// <summary>
  26 + /// 开卡业绩
  27 + /// </summary>
  28 + public decimal BillingAmount { get; set; }
  29 +
  30 + /// <summary>
  31 + /// 开卡业绩占比
  32 + /// </summary>
  33 + public decimal BillingAmountRatio { get; set; }
  34 +
  35 + /// <summary>
  36 + /// 购买总人数
  37 + /// </summary>
  38 + public int TotalBuyers { get; set; }
  39 +
  40 + /// <summary>
  41 + /// 品项占比
  42 + /// </summary>
  43 + public decimal ItemRatio { get; set; }
  44 +
  45 + /// <summary>
  46 + /// 复购人数
  47 + /// </summary>
  48 + public int RepeatBuyers { get; set; }
  49 +
  50 + /// <summary>
  51 + /// 复购率
  52 + /// </summary>
  53 + public decimal RepeatBuyRate { get; set; }
  54 +
  55 + /// <summary>
  56 + /// 消耗业绩
  57 + /// </summary>
  58 + public decimal ConsumeAmount { get; set; }
  59 +
  60 + /// <summary>
  61 + /// 消耗占比
  62 + /// </summary>
  63 + public decimal ConsumeAmountRatio { get; set; }
  64 +
  65 + /// <summary>
  66 + /// 消耗购买次数
  67 + /// </summary>
  68 + public int ConsumePurchaseCount { get; set; }
  69 +
  70 + /// <summary>
  71 + /// 消耗赠送次数
  72 + /// </summary>
  73 + public int ConsumeGiftCount { get; set; }
  74 +
  75 + /// <summary>
  76 + /// 消耗体验次数
  77 + /// </summary>
  78 + public int ConsumeExperienceCount { get; set; }
  79 +
  80 + /// <summary>
  81 + /// 退卡业绩
  82 + /// </summary>
  83 + public decimal RefundAmount { get; set; }
  84 +
  85 + /// <summary>
  86 + /// 退卡次数
  87 + /// </summary>
  88 + public int RefundCount { get; set; }
  89 + }
  90 +}
... ...