mirror of
https://github.com/dromara/payment-spring-boot.git
synced 2026-03-19 17:03:43 +08:00
bugfix
This commit is contained in:
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.enumeration;
|
package cn.felord.payment.wechat.enumeration;
|
||||||
|
|
||||||
@@ -27,23 +26,66 @@ package cn.felord.payment.wechat.enumeration;
|
|||||||
* @since 1.0.0.RELEASE
|
* @since 1.0.0.RELEASE
|
||||||
*/
|
*/
|
||||||
public enum CouponBgColor {
|
public enum CouponBgColor {
|
||||||
|
/**
|
||||||
|
* Color 010 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR010("#63B359"),
|
COLOR010("#63B359"),
|
||||||
|
/**
|
||||||
|
* Color 020 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR020("#2C9F67"),
|
COLOR020("#2C9F67"),
|
||||||
|
/**
|
||||||
|
* Color 030 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR030("#509FC9"),
|
COLOR030("#509FC9"),
|
||||||
|
/**
|
||||||
|
* Color 040 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR040("#5885CF"),
|
COLOR040("#5885CF"),
|
||||||
|
/**
|
||||||
|
* Color 050 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR050("#9062C0"),
|
COLOR050("#9062C0"),
|
||||||
|
/**
|
||||||
|
* Color 060 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR060("#D09A45"),
|
COLOR060("#D09A45"),
|
||||||
|
/**
|
||||||
|
* Color 070 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR070("#E4B138"),
|
COLOR070("#E4B138"),
|
||||||
|
/**
|
||||||
|
* Color 080 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR080("#EE903C"),
|
COLOR080("#EE903C"),
|
||||||
|
/**
|
||||||
|
* Color 090 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR090("#DD6549"),
|
COLOR090("#DD6549"),
|
||||||
|
/**
|
||||||
|
* Color 100 coupon bg color.
|
||||||
|
*/
|
||||||
COLOR100("#CC463D");
|
COLOR100("#CC463D");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Color.
|
||||||
|
*/
|
||||||
private final String color;
|
private final String color;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instantiates a new Coupon bg color.
|
||||||
|
*
|
||||||
|
* @param color the color
|
||||||
|
*/
|
||||||
CouponBgColor(String color) {
|
CouponBgColor(String color) {
|
||||||
this.color = color;
|
this.color = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Color string.
|
||||||
|
*
|
||||||
|
* @return the string
|
||||||
|
*/
|
||||||
public String color() {
|
public String color() {
|
||||||
return this.color;
|
return this.color;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3;
|
package cn.felord.payment.wechat.v3;
|
||||||
|
|
||||||
@@ -212,7 +211,7 @@ public class WechatMarketingFavorApi extends AbstractApi {
|
|||||||
private RequestEntity<?> startAndRestartAndPauseStockFunction(WechatPayV3Type type, String stockId) {
|
private RequestEntity<?> startAndRestartAndPauseStockFunction(WechatPayV3Type type, String stockId) {
|
||||||
WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3();
|
WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3();
|
||||||
String mchId = v3.getMchId();
|
String mchId = v3.getMchId();
|
||||||
Map<String, String> body = new HashMap<>();
|
Map<String, String> body = new HashMap<>(1);
|
||||||
body.put("stock_creator_mchid", mchId);
|
body.put("stock_creator_mchid", mchId);
|
||||||
|
|
||||||
URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA))
|
URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA))
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3;
|
package cn.felord.payment.wechat.v3;
|
||||||
|
|
||||||
@@ -98,7 +97,7 @@ public class WechatPayCallback {
|
|||||||
String data = this.callback(params, EventType.COUPON);
|
String data = this.callback(params, EventType.COUPON);
|
||||||
CouponConsumeData consumeData = MAPPER.readValue(data, CouponConsumeData.class);
|
CouponConsumeData consumeData = MAPPER.readValue(data, CouponConsumeData.class);
|
||||||
consumeDataConsumer.accept(consumeData);
|
consumeDataConsumer.accept(consumeData);
|
||||||
Map<String, Object> responseBody = new HashMap<>();
|
Map<String, Object> responseBody = new HashMap<>(2);
|
||||||
responseBody.put("code", 200);
|
responseBody.put("code", 200);
|
||||||
responseBody.put("message", "SUCCESS");
|
responseBody.put("message", "SUCCESS");
|
||||||
return responseBody;
|
return responseBody;
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3.model;
|
package cn.felord.payment.wechat.v3.model;
|
||||||
|
|
||||||
@@ -72,7 +71,7 @@ public class StocksCreateParams {
|
|||||||
/**
|
/**
|
||||||
* 扩展属性
|
* 扩展属性
|
||||||
*/
|
*/
|
||||||
private String ext_info;
|
private String extInfo;
|
||||||
/**
|
/**
|
||||||
* 批次使用规则
|
* 批次使用规则
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3.model;
|
package cn.felord.payment.wechat.v3.model;
|
||||||
|
|
||||||
@@ -37,28 +36,14 @@ public class StocksQueryParams {
|
|||||||
* 必填
|
* 必填
|
||||||
* <p>
|
* <p>
|
||||||
* 条件查询批次列表API 页码从0开始,默认第0页,传递1可能出错。
|
* 条件查询批次列表API 页码从0开始,默认第0页,传递1可能出错。
|
||||||
* <p>
|
|
||||||
* 查询代金券可用商户API 分页页码,最大1000。
|
|
||||||
* <p>
|
|
||||||
* 查询代金券可用单品API 最大500。
|
|
||||||
*/
|
*/
|
||||||
private Integer offset = 0;
|
private Integer offset = 0;
|
||||||
/**
|
/**
|
||||||
* 必填
|
* 必填
|
||||||
* <p>
|
* <p>
|
||||||
* 条件查询批次列表API 分页大小,最大10。
|
* 条件查询批次列表API 分页大小,最大10。
|
||||||
* <p>
|
|
||||||
* 查询代金券可用商户API 最大50。
|
|
||||||
* <p>
|
|
||||||
* 查询代金券可用单品API 最大100。
|
|
||||||
*/
|
*/
|
||||||
private Integer limit = 10;
|
private Integer limit = 10;
|
||||||
/* *//**
|
|
||||||
* 根据API而定
|
|
||||||
* <p>
|
|
||||||
* 批次ID
|
|
||||||
*//*
|
|
||||||
private String stockId;*/
|
|
||||||
/**
|
/**
|
||||||
* 选填
|
* 选填
|
||||||
* <p>
|
* <p>
|
||||||
|
|||||||
@@ -14,14 +14,18 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3.model.combine;
|
package cn.felord.payment.wechat.v3.model.combine;
|
||||||
|
|
||||||
import cn.felord.payment.wechat.v3.model.H5Info;
|
import cn.felord.payment.wechat.v3.model.H5Info;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
/**
|
||||||
|
* 合单支付 H5场景信息.
|
||||||
|
*
|
||||||
|
* @author felord.cn
|
||||||
|
* @since 1.0.0.RELEASE
|
||||||
|
*/
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Data
|
@Data
|
||||||
public class CombineH5SceneInfo extends CombineSceneInfo {
|
public class CombineH5SceneInfo extends CombineSceneInfo {
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
package cn.felord.payment.wechat.v3.model.payscore;
|
package cn.felord.payment.wechat.v3.model.payscore;
|
||||||
|
|
||||||
@@ -85,7 +84,7 @@ public class CompleteServiceOrderParams {
|
|||||||
* <p>
|
* <p>
|
||||||
* 代金券或立减金优惠的参数,说明详见代金券或立减金优惠
|
* 代金券或立减金优惠的参数,说明详见代金券或立减金优惠
|
||||||
*/
|
*/
|
||||||
private String goods_tag;
|
private String goodsTag;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user