公众号支付配置重构,增加枚举,增加积分抵扣限制

This commit is contained in:
hupeng
2020-03-01 17:52:30 +08:00
parent b2754e5560
commit a2e56fe072
44 changed files with 467 additions and 247 deletions

View File

@ -24,4 +24,16 @@ public interface ShopConstants {
*/
String REDIS_ORDER_OUTTIME_UNCONFIRM = "order:unconfirm:";
/**
* 微信支付service
*/
String YSHOP_WEIXIN_PAY_SERVICE = "yshop_weixin_pay_service";
/**
* 微信公众号service
*/
String YSHOP_WEIXIN_MP_SERVICE = "yshop_weixin_mp_service";
}

View File

@ -0,0 +1,23 @@
package co.yixiang.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 应用来源相关枚举
*/
@Getter
@AllArgsConstructor
public enum AppFromEnum {
WEIXIN_H5("weixinh5","weixinh5"),
H5("h5","H5"),
WECHAT("wechat","公众号"),
ROUNTINE("routine","小程序");
private String value;
private String desc;
}

View File

@ -0,0 +1,25 @@
package co.yixiang.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 账单相关枚举
*/
@Getter
@AllArgsConstructor
public enum BillEnum {
PM_0(0,"支出"),
PM_1(1,"获得"),
STATUS_0(0,"默认"),
STATUS_1(1,"有效"),
STATUS_2(2,"无效");
private Integer value;
private String desc;
}

View File

@ -0,0 +1,35 @@
package co.yixiang.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import javax.persistence.criteria.CriteriaBuilder;
/**
* 订单相关枚举
*/
@Getter
@AllArgsConstructor
public enum OrderInfoEnum {
STATUS_0(0,"默认"),
STATUS_1(1,"待收货"),
STATUS_2(2,"已收货"),
STATUS_3(3,"已完成"),
PAY_STATUS_0(0,"未支付"),
PAY_STATUS_1(1,"已支付"),
REFUND_STATUS_0(0,"未支付"),
REFUND_STATUS_1(1,"退款中"),
REFUND_STATUS_2(2,"已退款"),
BARGAIN_STATUS_1(1,"参与中"),
BARGAIN_STATUS_2(2,"参与失败"),
BARGAIN_STATUS_3(3,"参与成功");
private Integer value;
private String desc;
}

View File

@ -0,0 +1,21 @@
package co.yixiang.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 支付相关枚举
*/
@Getter
@AllArgsConstructor
public enum PayTypeEnum {
WEIXIN("weixin","微信支付"),
YUE("yue","余额支付");
private String value;
private String desc;
}

View File

@ -49,7 +49,6 @@ public class GlobalExceptionHandler {
*/
@ExceptionHandler(value = BadRequestException.class)
public ResponseEntity<ApiError> badRequestException(BadRequestException e) {
System.out.println("88888");
// 打印堆栈信息
log.error(ThrowableUtil.getStackTrace(e));
return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage()));