Merge branch 'feature-储值卡增加积分配置ID1039801-zxh-20211124' into qa

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

@@ -1883,16 +1883,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);