Skip to content

C
cloud-platform
Commit dcda6ee5 authored by 周健威's avatar 周健威
Browse files
Options

解决冲突

parent ff3428d9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
View file @ dcda6ee5
...@@ -60,7 +60,7 @@ public class OrderMsgBiz { ...@@ -60,7 +60,7 @@ public class OrderMsgBiz {
List<String> smsParams = new ArrayList<String>(); List<String> smsParams = new ArrayList<String>();
smsParams.add(baseOrder.getRealAmount().toString()); smsParams.add(baseOrder.getRealAmount().toString());
switch (orderTypeEnum) { switch (orderTypeEnum) {
case RentVehicle: case RENT_VEHICLE:
if(orvd.getFreeDays() > 0) { if(orvd.getFreeDays() > 0) {
smstype = SmsTemplateDTO.RENT_MEMENT; smstype = SmsTemplateDTO.RENT_MEMENT;
smsParams.add(orvd.getFreeDays().toString()); smsParams.add(orvd.getFreeDays().toString());
...@@ -110,7 +110,7 @@ public class OrderMsgBiz { ...@@ -110,7 +110,7 @@ public class OrderMsgBiz {
Integer smstype; Integer smstype;
List<String> smsParams = new ArrayList<String>(); List<String> smsParams = new ArrayList<String>();
switch (orderTypeEnum) { switch (orderTypeEnum) {
case RentVehicle: case RENT_VEHICLE:
switch (handelType) { switch (handelType) {
case RENT_PAY: case RENT_PAY:
//如果公司相同 //如果公司相同
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment