1.订单适用活动接口订单优惠活动金额格式化；

2.订单适用活动接口新增返回订单优惠活动截止时间；

src/main/java/com/sqx/modules/activity/service/impl/ActivityServiceImpl.java

@@ -411,7 +411,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
         }
 
         // 优惠金额
-        double discountAmount = 0.0;
+        Double discountAmount = 0.0;
 
         // 计算活动优惠金额
         if (ActivityTypeEnum.TIME.getTypeCode().equals(type)) {
@@ -453,8 +453,9 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
         OrderSuitActivityVO vo = new OrderSuitActivityVO();
         vo.setActivityId(shopActivityBO.getActivityId());
         vo.setActivityTitle(shopActivityBO.getTitle());
+        vo.setActivityEndTime(shopActivityBO.getEndTime());
         vo.setActivityType(type);
-        vo.setDiscountAmount(discountAmount);
+        vo.setDiscountAmount(Double.parseDouble(String.format("%.2f", discountAmount)));
         vo.setGoodsIds(applyGoodsIds);
         vo.setGoodsNames(applyGoodsNames);
         return vo;

src/main/java/com/sqx/modules/activity/vo/OrderSuitActivityVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,6 +26,9 @@ public class OrderSuitActivityVO {
     @ApiModelProperty("活动类型")
     private String activityType;
 
+    @ApiModelProperty("活动结束时间")
+    private Date activityEndTime;
+
     @ApiModelProperty("预计优惠金额")
     private Double discountAmount;