Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh-look' into qa

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

@@ -2280,7 +2280,8 @@ public class OrderAdapter {
                 accountVo.setType(type);
                 if (type == OrderSettlementType.PRODUCT_COUPON.getIndex() || type == OrderSettlementType.CASH_COUPON.getIndex()
                         || type == OrderSettlementType.DISCOUNT_COUPON.getIndex()) {
-                    accountVo.setTypeName("优惠券");
+                    // fisherman ->修改成券名称
+                    accountVo.setTypeName(StringUtils.isEmpty(orderSettlement.getNote()) ? "优惠券" : orderSettlement.getNote());
                 } else if (type == OrderSettlementType.FULL_REDUCTION.getIndex()) {
                     accountVo.setTypeName("满减");
                 } else if (type == OrderSettlementType.POINTS.getIndex()) {