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

@@ -33,4 +33,15 @@ public class CouponConstants {
      * 券使用
      * 券使用
      */
      */
     public static final String COUPON_USE_DESC_FORMAT = "已选{0}张";
     public static final String COUPON_USE_DESC_FORMAT = "已选{0}张";
+
+
+    /**
+     * 支持用券
+     */
+    public static final String USE_COUPON_SUPPORT = "Y";
+
+    /**
+     *  不支持用券
+     */
+    public static final String USE_COUPON_NOTSUPPORT = "N";
 }
 }

@@ -60,6 +60,8 @@ public class ShoppingController {
                 .appVersion(appVersion).build();
                 .appVersion(appVersion).build();
         logger.info("in ufo.order.payment, req {}", req);
         logger.info("in ufo.order.payment, req {}", req);
         PaymentResponse paymentResponse = buyerOrderService.payment(req);
         PaymentResponse paymentResponse = buyerOrderService.payment(req);
+        //支持用券标记
+        paymentResponse.getRecommendedCouponInfo().setUseSupport(activityTypeEnum.isCouponFlag() ? CouponConstants.USE_COUPON_SUPPORT : CouponConstants.USE_COUPON_NOTSUPPORT);
         return new ApiResponse.ApiResponseBuilder().code(200).data(paymentResponse).message("结算成功").build();
         return new ApiResponse.ApiResponseBuilder().code(200).data(paymentResponse).message("结算成功").build();
     }
     }
 
 

@@ -34,4 +34,11 @@ public class RecommendedCouponInfo {
      * 描述
      * 描述
      */
      */
     private String desc;
     private String desc;
+
+    /**
+     * 是否支持用券 Y支持,其他不支持
+     * since 6.9.6
+     */
+    @JSONField(name = "is_use_support")
+    private String useSupport;
 }
 }