Merge branch 'hjc_road_coupon' into dev_bd_rm_consumer_od

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyCouponVo.java

@@ -18,6 +18,8 @@ public class CandyCouponVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 4073256621782131606L;
 
     /* --- --- --- CandyCoupon */
+    @ApiModelProperty(value = "券id",example = "")
+    private String couponId;
     @ApiModelProperty(value = "标题",example = "标题")
     private String title;
     @ApiModelProperty(value = "标注",example = "标注")

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -79,6 +79,7 @@ public class CouponBaseUtil {
         LocalDateTime now = LocalDateTime.now();
         CandyCouponVo vo = CandyCouponVo.getNew();
         List<CandyCouponRulesVo> rulesVoList = ObjectUtil.getCandyCouponRulesVos();
+        vo.setCouponId(dtoItem.getCouponId());
         vo.setTitle(dtoItem.getTitle());
         vo.setExpireAt(DateUtil.format(dtoItem.getDuedAt(), DateUtil.Formatter.yyyy_MM_dd));
         vo.setValFace(dtoItem.getValFace());