Skip to content

Commit 9e34baf

Browse files
928255095928255095
committed
费用支持拆分 和合并功能
1 parent 9a755fd commit 9e34baf

File tree

4 files changed

+108
-49
lines changed

4 files changed

+108
-49
lines changed

‎java110-bean/src/main/java/com/java110/dto/payFeeSub/PayFeeSubDto.java‎

Lines changed: 98 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.java110.dto.payFeeSub;
22

33
import com.java110.dto.PageDto;
4+
45
import java.io.Serializable;
56
import java.util.Date;
67

@@ -15,21 +16,25 @@
1516
public class PayFeeSubDto extends PageDto implements Serializable {
1617

1718
private String maxTime;
18-
private String amount;
19-
private String feeTypeCd;
20-
private String batchId;
21-
private String feeId;
22-
private String userId;
23-
private String preFeeId;
24-
private String payerObjName;
25-
private String incomeObjId;
26-
private String configId;
27-
private String feeFlag;
28-
private String startTime;
29-
private String endTime;
30-
private String communityId;
31-
private String payerObjType;
32-
private String payerObjId;
19+
private String amount;
20+
private String feeTypeCd;
21+
private String batchId;
22+
private String feeId;
23+
private String userId;
24+
private String preFeeId;
25+
private String payerObjName;
26+
private String incomeObjId;
27+
private String configId;
28+
private String feeFlag;
29+
private String startTime;
30+
private String endTime;
31+
private String communityId;
32+
private String payerObjType;
33+
private String payerObjId;
34+
35+
private String pcFeeId;
36+
37+
private String feeName;
3338

3439

3540
private Date createTime;
@@ -40,97 +45,128 @@ public class PayFeeSubDto extends PageDto implements Serializable {
4045
public String getMaxTime() {
4146
return maxTime;
4247
}
43-
public void setMaxTime(String maxTime) {
48+
49+
public void setMaxTime(String maxTime) {
4450
this.maxTime = maxTime;
4551
}
46-
public String getAmount() {
52+
53+
public String getAmount() {
4754
return amount;
4855
}
49-
public void setAmount(String amount) {
56+
57+
public void setAmount(String amount) {
5058
this.amount = amount;
5159
}
52-
public String getFeeTypeCd() {
60+
61+
public String getFeeTypeCd() {
5362
return feeTypeCd;
5463
}
55-
public void setFeeTypeCd(String feeTypeCd) {
64+
65+
public void setFeeTypeCd(String feeTypeCd) {
5666
this.feeTypeCd = feeTypeCd;
5767
}
58-
public String getBatchId() {
68+
69+
public String getBatchId() {
5970
return batchId;
6071
}
61-
public void setBatchId(String batchId) {
72+
73+
public void setBatchId(String batchId) {
6274
this.batchId = batchId;
6375
}
64-
public String getFeeId() {
76+
77+
public String getFeeId() {
6578
return feeId;
6679
}
67-
public void setFeeId(String feeId) {
80+
81+
public void setFeeId(String feeId) {
6882
this.feeId = feeId;
6983
}
70-
public String getUserId() {
84+
85+
public String getUserId() {
7186
return userId;
7287
}
73-
public void setUserId(String userId) {
88+
89+
public void setUserId(String userId) {
7490
this.userId = userId;
7591
}
76-
public String getPreFeeId() {
92+
93+
public String getPreFeeId() {
7794
return preFeeId;
7895
}
79-
public void setPreFeeId(String preFeeId) {
96+
97+
public void setPreFeeId(String preFeeId) {
8098
this.preFeeId = preFeeId;
8199
}
82-
public String getPayerObjName() {
100+
101+
public String getPayerObjName() {
83102
return payerObjName;
84103
}
85-
public void setPayerObjName(String payerObjName) {
104+
105+
public void setPayerObjName(String payerObjName) {
86106
this.payerObjName = payerObjName;
87107
}
88-
public String getIncomeObjId() {
108+
109+
public String getIncomeObjId() {
89110
return incomeObjId;
90111
}
91-
public void setIncomeObjId(String incomeObjId) {
112+
113+
public void setIncomeObjId(String incomeObjId) {
92114
this.incomeObjId = incomeObjId;
93115
}
94-
public String getConfigId() {
116+
117+
public String getConfigId() {
95118
return configId;
96119
}
97-
public void setConfigId(String configId) {
120+
121+
public void setConfigId(String configId) {
98122
this.configId = configId;
99123
}
100-
public String getFeeFlag() {
124+
125+
public String getFeeFlag() {
101126
return feeFlag;
102127
}
103-
public void setFeeFlag(String feeFlag) {
128+
129+
public void setFeeFlag(String feeFlag) {
104130
this.feeFlag = feeFlag;
105131
}
106-
public String getStartTime() {
132+
133+
public String getStartTime() {
107134
return startTime;
108135
}
109-
public void setStartTime(String startTime) {
136+
137+
public void setStartTime(String startTime) {
110138
this.startTime = startTime;
111139
}
112-
public String getEndTime() {
140+
141+
public String getEndTime() {
113142
return endTime;
114143
}
115-
public void setEndTime(String endTime) {
144+
145+
public void setEndTime(String endTime) {
116146
this.endTime = endTime;
117147
}
118-
public String getCommunityId() {
148+
149+
public String getCommunityId() {
119150
return communityId;
120151
}
121-
public void setCommunityId(String communityId) {
152+
153+
public void setCommunityId(String communityId) {
122154
this.communityId = communityId;
123155
}
124-
public String getPayerObjType() {
156+
157+
public String getPayerObjType() {
125158
return payerObjType;
126159
}
127-
public void setPayerObjType(String payerObjType) {
160+
161+
public void setPayerObjType(String payerObjType) {
128162
this.payerObjType = payerObjType;
129163
}
130-
public String getPayerObjId() {
164+
165+
public String getPayerObjId() {
131166
return payerObjId;
132167
}
133-
public void setPayerObjId(String payerObjId) {
168+
169+
public void setPayerObjId(String payerObjId) {
134170
this.payerObjId = payerObjId;
135171
}
136172

@@ -150,4 +186,20 @@ public String getStatusCd() {
150186
public void setStatusCd(String statusCd) {
151187
this.statusCd = statusCd;
152188
}
189+
190+
public String getPcFeeId() {
191+
return pcFeeId;
192+
}
193+
194+
public void setPcFeeId(String pcFeeId) {
195+
this.pcFeeId = pcFeeId;
196+
}
197+
198+
public String getFeeName() {
199+
return feeName;
200+
}
201+
202+
public void setFeeName(String feeName) {
203+
this.feeName = feeName;
204+
}
153205
}

‎java110-db/src/main/resources/mapper/fee/PayFeeSubV1ServiceDaoImplMapper.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
userId,t.pre_fee_id,t.pre_fee_id preFeeId,t.payer_obj_name,t.payer_obj_name
2323
payerObjName,t.income_obj_id,t.income_obj_id incomeObjId,t.config_id,t.config_id configId,t.fee_flag,t.fee_flag
2424
feeFlag,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
25-
communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId
25+
communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,pfc.fee_name feeName
2626
from pay_fee_sub t
27+
left join pay_fee_config pfc on t.config_id = pfc.config_id
2728
where 1 =1
2829
<if test="maxTime !=null and maxTime != ''">
2930
and t.max_time= #{maxTime}
@@ -43,6 +44,10 @@
4344
<if test="feeId !=null and feeId != ''">
4445
and t.fee_id= #{feeId}
4546
</if>
47+
<if test="pcFeeId !=null and pcFeeId != ''">
48+
and (t.fee_id = #{pcFeeId} or t.pre_fee_id = #{pcFeeId})
49+
</if>
50+
4651
<if test="userId !=null and userId != ''">
4752
and t.user_id= #{userId}
4853
</if>
@@ -166,6 +171,9 @@
166171
<if test="feeId !=null and feeId != ''">
167172
and t.fee_id= #{feeId}
168173
</if>
174+
<if test="pcFeeId !=null and pcFeeId != ''">
175+
and (t.fee_id = #{pcFeeId} or t.pre_fee_id = #{pcFeeId})
176+
</if>
169177
<if test="userId !=null and userId != ''">
170178
and t.user_id= #{userId}
171179
</if>

‎service-fee/src/main/java/com/java110/fee/cmd/feeSub/ListPayFeeSubCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public class ListPayFeeSubCmd extends Cmd {
5656
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
5757
super.validatePageInfo(reqJson);
5858
Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
59-
Assert.hasKeyAndValue(reqJson, "preFeeId", "preFeeId不能为空");
6059

6160
}
6261

‎service-fee/src/main/java/com/java110/fee/cmd/feeSub/SplitPayFeeCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSO
110110
throw new CmdException("费用错误未包含最大结束时间");
111111
}
112112

113-
Date splitTime = DateUtil.getDateFromStringA(reqJson.getString("splitTime"));
113+
Date splitTime = DateUtil.getDateFromStringB(reqJson.getString("splitTime"));
114114
if (splitTime.before(endTime)) {
115115
throw new CmdException("拆分时间错误，应大于计费起始时间");
116116
}

0 commit comments

Comments
 (0)