diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java index 3fbcb9a..21df791 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java @@ -28,41 +28,57 @@ public enum CouponBgColor { /** * Color 010 coupon bg color. */ - COLOR010, + COLOR010("Color010"), /** * COLOR 020 coupon bg color. */ - COLOR020, + COLOR020("Color010"), /** * COLOR 030 coupon bg color. */ - COLOR030, + COLOR030("Color010"), /** * COLOR 040 coupon bg color. */ - COLOR040, + COLOR040("Color010"), /** * COLOR 050 coupon bg color. */ - COLOR050, + COLOR050("Color010"), /** * COLOR 060 coupon bg color. */ - COLOR060, + COLOR060("Color010"), /** * COLOR 070 coupon bg color. */ - COLOR070, + COLOR070("Color010"), /** * COLOR 080 coupon bg color. */ - COLOR080, + COLOR080("Color010"), /** * COLOR 090 coupon bg color. */ - COLOR090, + COLOR090("Color010"), /** * COLOR 100 coupon bg color. */ - COLOR100 + COLOR100("Color010"); + + + private final String value; + + CouponBgColor(String value) { + this.value = value; + } + + /** + * Gets value. + * + * @return the value + */ + public String getValue() { + return value; + } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java index bba01e6..aec6d70 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java @@ -31,7 +31,7 @@ public class PatternInfo { /** * 背景色 */ - private CouponBgColor backgroundColor; + private String backgroundColor; /** * 券详情图片 */ @@ -49,4 +49,16 @@ public class PatternInfo { */ private String merchantName; + /** + * Sets background color. + * + * @param backgroundColor the background color + */ + public void setBackgroundColor(CouponBgColor backgroundColor) { + this.backgroundColor = backgroundColor.name(); + } + + private void setBackgroundColor(String backgroundColor) { + this.backgroundColor = backgroundColor; + } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/DisplayPatternInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/DisplayPatternInfo.java index 54fc45d..09e50a3 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/DisplayPatternInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/busifavor/DisplayPatternInfo.java @@ -17,7 +17,7 @@ package cn.felord.payment.wechat.v3.model.busifavor; import cn.felord.payment.wechat.enumeration.CouponBgColor; -import cn.felord.payment.wechat.v3.WechatMarketingFavorApi; +import cn.felord.payment.wechat.v3.WechatMediaApi; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -33,7 +33,7 @@ public class DisplayPatternInfo { /** * 背景颜色 */ - private CouponBgColor backgroundColor; + private String backgroundColor; /** * 商户logo *