解决冲突

dcda6ee5 · 周健威 · ff3428d9 · dcda6ee5
Commit dcda6ee5 authored Jul 16, 2019 by 周健威
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OrderMsgBiz.java ...n/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java +2 -2

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
@@ -60,7 +60,7 @@ public class OrderMsgBiz {
            List<String> smsParams = new ArrayList<String>();
            smsParams.add(baseOrder.getRealAmount().toString());
            switch (orderTypeEnum) {
-                case RentVehicle:
+                case RENT_VEHICLE:
                    if(orvd.getFreeDays() > 0) {
                        smstype = SmsTemplateDTO.RENT_MEMENT;
                        smsParams.add(orvd.getFreeDays().toString());
@@ -110,7 +110,7 @@ public class OrderMsgBiz {
            Integer smstype;
            List<String> smsParams = new ArrayList<String>();
            switch (orderTypeEnum) {
-                case RentVehicle:
+                case RENT_VEHICLE:
                    switch (handelType) {
                        case RENT_PAY:
                            //如果公司相同