Merge branch 'dev-coupon-recommend' into test6.9.6

@@ -55,6 +55,10 @@ public class ShoppingCoupon {
     @JSONField(name = "is_selected_support")
     private String isSelectedSupport;
 
+    //即将过期,Y 是
+    @JSONField(name = "is_expired_soon")
+    private String isExpiredSoon;
+
     //使用说明
     private List<String> notes;
 }

@@ -48,6 +48,7 @@ public class CouponSupport {
 
             shoppingCoupon.setSelected(OrderConstant.N_STR);
             shoppingCoupon.setIsSelectedSupport(OrderConstant.Y_STR);
+            shoppingCoupon.setIsExpiredSoon(userCouponsBo.getIsExpiredSoon());
 
             shoppingCoupon.setNotes(userCouponsBo.getNotes());
 

@@ -53,6 +53,9 @@ public class CouponConvert {
         //优惠券说明
         couponBo.setNotes(Lists.newArrayList(coupon.getRemark()));
 
+        //即将过期
+        couponBo.setIsExpiredSoon(isExpiredSoon(userCoupon) ? Constants.YES : Constants.NO);
+
         if (couponType != null){
             couponBo.setCouponType(couponType.getId());
             couponBo.setCouponTypeName(couponType.getCaption());