|
|
|
@@ -415,6 +415,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
} |
|
|
|
wxCouponOrder = wxCouponOrderService.getById(couponOrderId); |
|
|
|
} |
|
|
|
|
|
|
|
WxPayOrder couponPayOrder = null; |
|
|
|
Integer remainPrice = payPrice; |
|
|
|
if (wxCouponOrder != null) { |
|
|
|
@@ -437,12 +438,12 @@ public class WxMicroPayController extends BaseController { |
|
|
|
|
|
|
|
if (remainPrice > 0) { |
|
|
|
if (StringUtils.isBlank(authCode)) { |
|
|
|
logger.error("authCode不能为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不能为空"); |
|
|
|
logger.error("微信收款码/authCode不能为空"); |
|
|
|
return new ResultData(ErrorCode.MICRO_PAY_NO_AUTHCODE.getCode(), "请提供微信收款码"); |
|
|
|
} |
|
|
|
if (!checkAuthCode(authCode)) { |
|
|
|
logger.error("authCode不符合规则"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则"); |
|
|
|
logger.error("微信收款码/authCode不符合规则: {}", authCode); |
|
|
|
return new ResultData(ErrorCode.MICRO_PAY_ERR_AUTHCODE.getCode(), "请扫描微信收款码"); |
|
|
|
} |
|
|
|
|
|
|
|
WxPayOrder record = new WxPayOrder(); |
|
|
|
|