From 348fe9b5f1ce9688f547f0cc7198f880a189d23c Mon Sep 17 00:00:00 2001
From: xiafang <felord@qq.com>
Date: Tue, 20 Jun 2023 09:34:20 +0800
Subject: [PATCH] =?UTF-8?q?enhance:=20=E4=BB=A3=E9=87=91=E5=88=B8=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E5=88=B8=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/enumeration/CouponBgColor.java     | 36 +++++++++++++------
 .../payment/wechat/v3/model/PatternInfo.java  | 14 +++++++-
 .../model/busifavor/DisplayPatternInfo.java   | 21 ++++++++---
 3 files changed, 56 insertions(+), 15 deletions(-)

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
      * <ol>
@@ -42,7 +42,7 @@ public class DisplayPatternInfo {
      * </ol>
      * 仅支持通过 <a target= "_blank" href= "https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/marketing/chapter3_1.shtml">图片上传API</a> 接口获取的图片URL地址。
      *
-     * @see WechatMarketingFavorApi#marketingImageUpload(MultipartFile)
+     * @see WechatMediaApi#marketingImageUpload(MultipartFile)
      */
     private String merchantLogoUrl;
     /**
@@ -54,7 +54,7 @@ public class DisplayPatternInfo {
      * </ol>
      * 仅支持通过 <a target= "_blank" href= "https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/marketing/chapter3_1.shtml">图片上传API</a> 接口获取的图片URL地址。
      *
-     * @see WechatMarketingFavorApi#marketingImageUpload(MultipartFile)
+     * @see WechatMediaApi#marketingImageUpload(MultipartFile)
      */
     private String couponImageUrl;
     /**
@@ -69,4 +69,17 @@ public class DisplayPatternInfo {
      * 商户名称,字数上限为16个
      */
     private String merchantName;
+
+    /**
+     * Sets background color.
+     *
+     * @param backgroundColor the background color
+     */
+    public void setBackgroundColor(CouponBgColor backgroundColor) {
+        this.backgroundColor = backgroundColor.getValue();
+    }
+
+    private void setBackgroundColor(String backgroundColor) {
+        this.backgroundColor = backgroundColor;
+    }
 }
\ No newline at end of file