修改判断方法使用 compartTo , 逻辑没变动

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -19,12 +19,6 @@ import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
-import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
-import cn.freemud.entities.dto.order.CreateOrderAccountDto;
-import cn.freemud.entities.dto.order.CreateOrderProductDto;
-import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.*;
-import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.pay.OrderPayResponse;
@@ -71,7 +65,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
@@ -1873,16 +1866,19 @@ public class OrderAdapter {
                 OrderAccountVo accountVo = new OrderAccountVo();
                 Integer type = orderSettlement.getSettlementType();
                 accountVo.setType(type);
-                if (type == OrderSettlementType.PRODUCT_COUPON.getIndex() || type == OrderSettlementType.CASH_COUPON.getIndex()
-                        || type == OrderSettlementType.DISCOUNT_COUPON.getIndex()) {
+                if (type.compareTo(OrderSettlementType.PRODUCT_COUPON.getIndex()) == 0
+                        || type.compareTo(OrderSettlementType.CASH_COUPON.getIndex()) == 0
+                        || type.compareTo(OrderSettlementType.DISCOUNT_COUPON.getIndex()) == 0 ){
                     // fisherman ->修改成券名称
                     accountVo.setTypeName(StringUtils.isEmpty(orderSettlement.getNote()) ? "优惠券" : orderSettlement.getNote());
-                } else if (type == OrderSettlementType.FULL_REDUCTION.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.FULL_REDUCTION.getIndex())==0) {
                     accountVo.setTypeName("满减");
-                } else if (type == OrderSettlementType.POINTS.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.POINTS.getIndex())==0) {
                     accountVo.setTypeName("积分抵扣");
-                } else if (type == OrderSettlementType.FREIGHT_COUPON.getIndex()) {
+                } else if (type.compareTo(OrderSettlementType.FREIGHT_COUPON.getIndex())==0) {
                     accountVo.setTypeName("配送券");
+                }else {
+                    accountVo.setTypeName("参与活动");
                 }
                 int value = orderSettlement.getSettlementAmount().intValue();
                 accountVo.setDiscountAmount(value < 0 ? -value : value);