Skip to content
GitLab
Commit e47b47ab authored by dingzhiwei's avatar dingzhiwei
Browse files

重新优化计全付支付接口

parent 29a249b5
Hide whitespace changes
Inline Side-by-side
docs/sql/init.sql
View file @ e47b47ab
......@@ -758,10 +758,10 @@ VALUES ('pppay', 'PayPal支付', 1, 0, 1,
-- 计全付支付通道
INSERT INTO t_pay_interface_define (if_code, if_name, is_mch_mode, is_isv_mode, config_page_type, isv_params, isvsub_mch_params, normal_mch_params, way_codes, icon, bg_color, state, remark)
VALUES ('jeepluspay', '计全付', 1, 0, 1,
VALUES ('plspay', '计全付', 1, 0, 1,
NULL,
NULL,
'[{"name":"signType","desc":"签名方式","type":"radio","verify":"required","values":"MD5,RSA2","titles":"MD5,RSA2"},{"name":"merchantNo","desc":"计全付商户号","type":"text","verify":"required"},{"name":"appId","desc":"应用ID","type":"text","verify":"required"},{"name":"appSecret","desc":"md5秘钥","type":"textarea","verify":"required","star":"1"},{"name":"rsa2AppPrivateKey","desc":"RSA2: 应用私钥","type":"textarea","verify":"required","star":"1"},{"name":"rsa2PayPublicKey","desc":"RSA2: 支付网关公钥","type":"textarea","verify":"required","star":"1"}]',
'[{"wayCode": "ALI_APP"}, {"wayCode": "ALI_BAR"}, {"wayCode": "ALI_JSAPI"}, {"wayCode": "ALI_LITE"}, {"wayCode": "ALI_PC"}, {"wayCode": "ALI_QR"}, {"wayCode": "ALI_WAP"}, {"wayCode": "WX_APP"}, {"wayCode": "WX_BAR"}, {"wayCode": "WX_H5"}, {"wayCode": "WX_JSAPI"}, {"wayCode": "WX_LITE"}, {"wayCode": "WX_NATIVE"}]',
'http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/jeepluspay.svg', '#0CACFF', 1, '计全付');
'http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/plspay.svg', '#0CACFF', 1, '计全付');
docs/sql/patch.sql
View file @ e47b47ab
......@@ -256,12 +256,12 @@ VALUES ('wxpay', '微信支付官方', 1, 1, 2,
alter table t_sys_log modify `opt_req_param` TEXT DEFAULT NULL COMMENT '操作请求参数';
alter table t_sys_log modify `opt_res_info` TEXT DEFAULT NULL COMMENT '操作响应结果';
## -- ++++ [v1.14.0] ===> [v1.15.0] ++++
-- 增加计全付支付通道
INSERT INTO t_pay_interface_define (if_code, if_name, is_mch_mode, is_isv_mode, config_page_type, isv_params, isvsub_mch_params, normal_mch_params, way_codes, icon, bg_color, state, remark)
VALUES ('jeepluspay', '计全付', 1, 0, 1,
VALUES ('plspay', '计全付', 1, 0, 1,
NULL,
NULL,
'[{"name":"signType","desc":"签名方式","type":"radio","verify":"required","values":"MD5,RSA2","titles":"MD5,RSA2"},{"name":"merchantNo","desc":"计全付商户号","type":"text","verify":"required"},{"name":"appId","desc":"应用ID","type":"text","verify":"required"},{"name":"appSecret","desc":"md5秘钥","type":"textarea","verify":"required","star":"1"},{"name":"rsa2AppPrivateKey","desc":"RSA2: 应用私钥","type":"textarea","verify":"required","star":"1"},{"name":"rsa2PayPublicKey","desc":"RSA2: 支付网关公钥","type":"textarea","verify":"required","star":"1"}]',
'[{"wayCode": "ALI_APP"}, {"wayCode": "ALI_BAR"}, {"wayCode": "ALI_JSAPI"}, {"wayCode": "ALI_LITE"}, {"wayCode": "ALI_PC"}, {"wayCode": "ALI_QR"}, {"wayCode": "ALI_WAP"}, {"wayCode": "WX_APP"}, {"wayCode": "WX_BAR"}, {"wayCode": "WX_H5"}, {"wayCode": "WX_JSAPI"}, {"wayCode": "WX_LITE"}, {"wayCode": "WX_NATIVE"}]',
'http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/jeepluspay.svg', '#0CACFF', 1, '计全付');
'http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/plspay.svg', '#0CACFF', 1, '计全付');
jeepay-core/src/main/java/com/jeequan/jeepay/core/constants/CS.java
View file @ e47b47ab
......@@ -147,7 +147,7 @@ public class CS {
String YSFPAY = "ysfpay"; // 云闪付开放平台
String XXPAY = "xxpay"; // 小新支付
String PPPAY = "pppay"; // Paypal 支付
String JEEPLUSPAY = "jeepluspay"; // 计全支付plus
String PLSPAY = "plspay"; // 计全支付plus
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/NormalMchParams.java
View file @ e47b47ab
......@@ -18,7 +18,7 @@ package com.jeequan.jeepay.core.model.params;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.model.params.alipay.AlipayNormalMchParams;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.pppay.PpPayNormalMchParams;
import com.jeequan.jeepay.core.model.params.wxpay.WxpayNormalMchParams;
import com.jeequan.jeepay.core.model.params.xxpay.XxpayNormalMchParams;
......@@ -42,8 +42,8 @@ public abstract class NormalMchParams {
return JSONObject.parseObject(paramsStr, XxpayNormalMchParams.class);
}else if (CS.IF_CODE.PPPAY.equals(ifCode)){
return JSONObject.parseObject(paramsStr, PpPayNormalMchParams.class);
}else if (CS.IF_CODE.JEEPLUSPAY.equals(ifCode)){
return JSONObject.parseObject(paramsStr, JeepluspayNormalMchParams.class);
}else if (CS.IF_CODE.PLSPAY.equals(ifCode)){
return JSONObject.parseObject(paramsStr, PlspayNormalMchParams.class);
}
return null;
}
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/jeepluspay/JeepluspayConfig.java → jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayConfig.java
View file @ e47b47ab
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.core.model.params.jeepluspay;
package com.jeequan.jeepay.core.model.params.plspay;
import lombok.Data;
......@@ -25,7 +25,7 @@ import lombok.Data;
* @date 2022/8/11 14:32
*/
@Data
public class JeepluspayConfig {
public class PlspayConfig {
/** 签名类型 */
public static final String DEFAULT_SIGN_TYPE = "MD5";
......
jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/jeepluspay/JeepluspayNormalMchParams.java → jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/plspay/PlspayNormalMchParams.java
View file @ e47b47ab
......@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.core.model.params.jeepluspay;
package com.jeequan.jeepay.core.model.params.plspay;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
......@@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils;
* @date 2022/8/11 14:32
*/
@Data
public class JeepluspayNormalMchParams extends NormalMchParams {
public class PlspayNormalMchParams extends NormalMchParams {
/** 商户号 */
private String merchantNo;
......@@ -54,7 +54,7 @@ public class JeepluspayNormalMchParams extends NormalMchParams {
@Override
public String deSenData() {
JeepluspayNormalMchParams mchParams = this;
PlspayNormalMchParams mchParams = this;
if (StringUtils.isNotBlank(this.appSecret)) {
mchParams.setAppSecret(StringKit.str2Star(this.appSecret, 4, 4, 6));
}
......
jeepay-payment/pom.xml
View file @ e47b47ab
......@@ -130,7 +130,7 @@
<artifactId>jeepay-sdk-java</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${projectRootDir}/libs/jeepay-sdk-java-pls-1.0.0.jar</systemPath>
<systemPath>${projectRootDir}/libs/jeepay-sdk-java-pls-1.2.0.jar</systemPath>
</dependency>
</dependencies>
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayChannelNoticeService.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelNoticeService.java
View file @ e47b47ab
......@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.exception.ResponseException;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.pay.channel.AbstractChannelNoticeService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -42,11 +42,11 @@ import javax.servlet.http.HttpServletRequest;
*/
@Service
@Slf4j
public class JeepluspayChannelNoticeService extends AbstractChannelNoticeService {
public class PlspayChannelNoticeService extends AbstractChannelNoticeService {
@Override
public String getIfCode() {
return CS.IF_CODE.JEEPLUSPAY;
return CS.IF_CODE.PLSPAY;
}
@Override
......@@ -103,7 +103,7 @@ public class JeepluspayChannelNoticeService extends AbstractChannelNoticeService
log.info("验签参数为空 [sign] :{}", sign);
return false;
}
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
jsonParams.remove("sign");
// 获取md5秘钥,生成签名
String newSign = JeepayKit.getSign(jsonParams, normalMchParams.getAppSecret());
......@@ -114,7 +114,7 @@ public class JeepluspayChannelNoticeService extends AbstractChannelNoticeService
}
// 支付状态: 0-订单生成, 1-支付中, 2-支付成功, 3-支付失败, 4-已撤销, 5-已退款, 6-订单关闭
String status = jsonParams.getString("state");
if (!JeepluspayConfig.PAY_STATE_SUCCESS.equals(status)) {
if (!PlspayConfig.PAY_STATE_SUCCESS.equals(status)) {
log.info("订单状态错误！ state = {}", status);
return false;
}
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayChannelRefundNoticeService.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayChannelRefundNoticeService.java
View file @ e47b47ab
......@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.RefundOrder;
import com.jeequan.jeepay.core.exception.ResponseException;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.pay.channel.AbstractChannelRefundNoticeService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -42,11 +42,11 @@ import javax.servlet.http.HttpServletRequest;
*/
@Service
@Slf4j
public class JeepluspayChannelRefundNoticeService extends AbstractChannelRefundNoticeService {
public class PlspayChannelRefundNoticeService extends AbstractChannelRefundNoticeService {
@Override
public String getIfCode() {
return CS.IF_CODE.JEEPLUSPAY;
return CS.IF_CODE.PLSPAY;
}
@Override
......@@ -105,7 +105,7 @@ public class JeepluspayChannelRefundNoticeService extends AbstractChannelRefundN
log.info("验签参数为空 [sign] :{}", sign);
return false;
}
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
jsonParams.remove("sign");
// 获取md5秘钥,生成签名
String newSign = JeepayKit.getSign(jsonParams, normalMchParams.getAppSecret());
......@@ -116,7 +116,7 @@ public class JeepluspayChannelRefundNoticeService extends AbstractChannelRefundN
}
// 退款状态 0-订单生成 1-退款中 2-退款成功 3-退款失败 4-退款关闭
String status = jsonParams.getString("state");
if (!JeepluspayConfig.REFUND_STATE_SUCCESS.equals(status)) {
if (!PlspayConfig.REFUND_STATE_SUCCESS.equals(status)) {
log.info("订单状态错误！ state = {}", status);
return false;
}
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayKit.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayKit.java
View file @ e47b47ab
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.jeequan.jeepay.Jeepay;
import com.jeequan.jeepay.JeepayClient;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.core.utils.SpringBeansUtil;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
......@@ -25,7 +25,7 @@ import org.apache.commons.lang3.StringUtils;
* @date 2022/8/23 16:29
*/
@Slf4j
public class JeepluspayKit {
public class PlspayKit {
public static PayOrderCreateResponse payRequest(PayOrder payOrder, MchAppConfigContext mchAppConfigContext, PayOrderCreateReqModel model) throws JeepayException {
......@@ -33,7 +33,7 @@ public class JeepluspayKit {
// 发起统一下单
PayOrderCreateResponse response = new PayOrderCreateResponse();
ConfigContextQueryService configContextQueryService = SpringBeansUtil.getBean(ConfigContextQueryService.class);
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
// 构建请求数据
PayOrderCreateRequest request = new PayOrderCreateRequest();
model.setMchNo(normalMchParams.getMerchantNo()); // 商户号
......@@ -46,11 +46,11 @@ public class JeepluspayKit {
model.setBody(payOrder.getBody()); // 商品描述
request.setBizModel(model);
if (normalMchParams.getSignType().equals(JeepluspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
if (normalMchParams.getSignType().equals(PlspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getAppSecret(), Jeepay.getApiBase());
response = jeepayClient.execute(request);
} else if (normalMchParams.getSignType().equals(JeepluspayConfig.SIGN_TYPE_RSA2)) {
} else if (normalMchParams.getSignType().equals(PlspayConfig.SIGN_TYPE_RSA2)) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getRsa2AppPrivateKey(), Jeepay.getApiBase());
response = jeepayClient.executeByRSA2(request);
}
......@@ -59,13 +59,13 @@ public class JeepluspayKit {
public static Boolean checkPayResp(JeepayResponse response , MchAppConfigContext mchAppConfigContext) {
ConfigContextQueryService configContextQueryService = SpringBeansUtil.getBean(ConfigContextQueryService.class);
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
boolean isSuccess = false;
if (normalMchParams.getSignType().equals(JeepluspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
if (normalMchParams.getSignType().equals(PlspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
isSuccess = response.isSuccess(normalMchParams.getAppSecret());
} else if (normalMchParams.getSignType().equals(JeepluspayConfig.SIGN_TYPE_RSA2)) {
} else if (normalMchParams.getSignType().equals(PlspayConfig.SIGN_TYPE_RSA2)) {
isSuccess = response.isSuccessByRsa2(normalMchParams.getRsa2PayPublicKey());
}
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayPayOrderQueryService.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayPayOrderQueryService.java
View file @ e47b47ab
......@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.jeequan.jeepay.Jeepay;
import com.jeequan.jeepay.JeepayClient;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.model.PayOrderQueryReqModel;
import com.jeequan.jeepay.pay.channel.IPayOrderQueryService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
......@@ -42,13 +42,13 @@ import org.springframework.stereotype.Service;
*/
@Service
@Slf4j
public class JeepluspayPayOrderQueryService implements IPayOrderQueryService {
public class PlspayPayOrderQueryService implements IPayOrderQueryService {
@Autowired
private ConfigContextQueryService configContextQueryService;
@Override
public String getIfCode() {
return CS.IF_CODE.JEEPLUSPAY;
return CS.IF_CODE.PLSPAY;
}
@Override
......@@ -56,31 +56,31 @@ public class JeepluspayPayOrderQueryService implements IPayOrderQueryService {
PayOrderQueryRequest request = new PayOrderQueryRequest();
PayOrderQueryReqModel model = new PayOrderQueryReqModel();
try {
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
model.setMchNo(normalMchParams.getMerchantNo()); // 商户号
model.setAppId(normalMchParams.getAppId()); // 应用ID
model.setMchOrderNo(payOrder.getPayOrderId()); // 支付订单号
request.setBizModel(model);
// 发起请求
PayOrderQueryResponse response = new PayOrderQueryResponse();
if (StringUtils.isEmpty(normalMchParams.getSignType()) || normalMchParams.getSignType().equals(JeepluspayConfig.DEFAULT_SIGN_TYPE)) {
if (StringUtils.isEmpty(normalMchParams.getSignType()) || normalMchParams.getSignType().equals(PlspayConfig.DEFAULT_SIGN_TYPE)) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getAppSecret(), Jeepay.getApiBase());
response = jeepayClient.execute(request);
} else if (normalMchParams.getSignType().equals(JeepluspayConfig.SIGN_TYPE_RSA2)) {
} else if (normalMchParams.getSignType().equals(PlspayConfig.SIGN_TYPE_RSA2)) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getRsa2AppPrivateKey(), Jeepay.getApiBase());
response = jeepayClient.executeByRSA2(request);
}
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
// 请求响应状态
if (isSuccess) {
// 如果查询请求成功
if (JeepluspayConfig.PAY_STATE_SUCCESS.equals(String.valueOf(response.get().getState()))) {
if (PlspayConfig.PAY_STATE_SUCCESS.equals(String.valueOf(response.get().getState()))) {
return ChannelRetMsg.confirmSuccess(response.get().getPayOrderId());
} else if (JeepluspayConfig.PAY_STATE_FAIL.equals(String.valueOf(response.get().getState()))) {
} else if (PlspayConfig.PAY_STATE_FAIL.equals(String.valueOf(response.get().getState()))) {
// 失败
return ChannelRetMsg.confirmFail();
}
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayPaymentService.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayPaymentService.java
View file @ e47b47ab
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
......@@ -17,11 +17,11 @@ import org.springframework.stereotype.Service;
* @date 2022/8/11 15:37
*/
@Service
public class JeepluspayPaymentService extends AbstractPaymentService {
public class PlspayPaymentService extends AbstractPaymentService {
@Override
public String getIfCode() {
return CS.IF_CODE.JEEPLUSPAY;
return CS.IF_CODE.PLSPAY;
}
@Override
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/JeepluspayRefundService.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/PlspayRefundService.java
View file @ e47b47ab
......@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay;
package com.jeequan.jeepay.pay.channel.plspay;
import com.jeequan.jeepay.Jeepay;
import com.jeequan.jeepay.JeepayClient;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.entity.RefundOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayNormalMchParams;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayNormalMchParams;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.RefundOrderCreateReqModel;
import com.jeequan.jeepay.model.RefundOrderQueryReqModel;
......@@ -44,11 +44,11 @@ import org.springframework.stereotype.Service;
* @date 2022/8/16 15:28
*/
@Service
public class JeepluspayRefundService extends AbstractRefundService {
public class PlspayRefundService extends AbstractRefundService {
@Override
public String getIfCode() {
return CS.IF_CODE.JEEPLUSPAY;
return CS.IF_CODE.PLSPAY;
}
@Override
......@@ -58,7 +58,7 @@ public class JeepluspayRefundService extends AbstractRefundService {
@Override
public ChannelRetMsg refund(RefundOrderRQ bizRQ, RefundOrder refundOrder, PayOrder payOrder, MchAppConfigContext mchAppConfigContext) throws Exception {
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
RefundOrderCreateRequest request = new RefundOrderCreateRequest();
RefundOrderCreateReqModel model = new RefundOrderCreateReqModel();
model.setMchNo(normalMchParams.getMerchantNo()); // 商户号
......@@ -76,21 +76,21 @@ public class JeepluspayRefundService extends AbstractRefundService {
try {
// 发起退款
RefundOrderCreateResponse response = new RefundOrderCreateResponse();
if (normalMchParams.getSignType().equals(JeepluspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
if (normalMchParams.getSignType().equals(PlspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getAppSecret(), Jeepay.getApiBase());
response = jeepayClient.execute(request);
} else if (normalMchParams.getSignType().equals(JeepluspayConfig.SIGN_TYPE_RSA2)) {
} else if (normalMchParams.getSignType().equals(PlspayConfig.SIGN_TYPE_RSA2)) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getRsa2AppPrivateKey(), Jeepay.getApiBase());
response = jeepayClient.executeByRSA2(request);
}
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
// 退款发送成功
if (isSuccess) {
if (JeepluspayConfig.REFUND_STATE_SUCCESS.equals(response.get().getState().toString())) {
if (PlspayConfig.REFUND_STATE_SUCCESS.equals(response.get().getState().toString())) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_SUCCESS);
}
channelRetMsg.setChannelOrderId(response.get().getRefundOrderId());
......@@ -111,30 +111,30 @@ public class JeepluspayRefundService extends AbstractRefundService {
RefundOrderQueryRequest request = new RefundOrderQueryRequest();
RefundOrderQueryReqModel model = new RefundOrderQueryReqModel();
try {
JeepluspayNormalMchParams normalMchParams = (JeepluspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.JEEPLUSPAY);
PlspayNormalMchParams normalMchParams = (PlspayNormalMchParams) configContextQueryService.queryNormalMchParams(mchAppConfigContext.getMchNo(), mchAppConfigContext.getAppId(), CS.IF_CODE.PLSPAY);
model.setMchNo(normalMchParams.getMerchantNo()); // 商户号
model.setAppId(normalMchParams.getAppId()); // 应用ID
model.setRefundOrderId(refundOrder.getRefundOrderId()); // 退款订单号
request.setBizModel(model);
// 发起请求
RefundOrderQueryResponse response = new RefundOrderQueryResponse();
if (normalMchParams.getSignType().equals(JeepluspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
if (normalMchParams.getSignType().equals(PlspayConfig.DEFAULT_SIGN_TYPE) || StringUtils.isEmpty(normalMchParams.getSignType())) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getAppSecret(), Jeepay.getApiBase());
response = jeepayClient.execute(request);
} else if (normalMchParams.getSignType().equals(JeepluspayConfig.SIGN_TYPE_RSA2)) {
} else if (normalMchParams.getSignType().equals(PlspayConfig.SIGN_TYPE_RSA2)) {
JeepayClient jeepayClient = JeepayClient.getInstance(normalMchParams.getAppId(), normalMchParams.getRsa2AppPrivateKey(), Jeepay.getApiBase());
response = jeepayClient.executeByRSA2(request);
}
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
// 请求响应状态
if (isSuccess) {
// 如果查询请求成功
if (JeepluspayConfig.PAY_STATE_SUCCESS.equals(response.get().getState().toString())) {
if (PlspayConfig.PAY_STATE_SUCCESS.equals(response.get().getState().toString())) {
return ChannelRetMsg.confirmSuccess(response.get().getRefundOrderId());
} else if (JeepluspayConfig.PAY_STATE_FAIL.equals(response.get().getState().toString())) {
} else if (PlspayConfig.PAY_STATE_FAIL.equals(response.get().getState().toString())) {
// 失败
return ChannelRetMsg.confirmFail();
}
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliApp.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliApp.java
View file @ e47b47ab
......@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -39,8 +39,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/6 16:20
*/
@Service("jeepluspayPaymentByAliAppService") //Service Name需保持全局唯一性
public class AliApp extends JeepluspayPaymentService {
@Service("plspayPaymentByAliAppService") //Service Name需保持全局唯一性
public class AliApp extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -57,7 +57,7 @@ public class AliApp extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_APP);
model.setWayCode(PlspayConfig.ALI_APP);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 支付宝app支付参数
......@@ -66,9 +66,9 @@ public class AliApp extends JeepluspayPaymentService {
model.setChannelExtra(channelExtra.toString());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -79,8 +79,8 @@ public class AliApp extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliBar.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliBar.java
View file @ e47b47ab
......@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -41,8 +41,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/11 15:37
*/
@Service("jeepluspayPaymentByAliBarService") //Service Name需保持全局唯一性
public class AliBar extends JeepluspayPaymentService {
@Service("plspayPaymentByAliBarService") //Service Name需保持全局唯一性
public class AliBar extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -64,7 +64,7 @@ public class AliBar extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_BAR);
model.setWayCode(PlspayConfig.ALI_BAR);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 用户付款码值
......@@ -73,13 +73,13 @@ public class AliBar extends JeepluspayPaymentService {
model.setChannelExtra(channelExtra.toString());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
// 下单成功
if (isSuccess) {
if (JeepluspayConfig.PAY_STATE_SUCCESS.equals(response.getData().getString("orderState"))) {
if (PlspayConfig.PAY_STATE_SUCCESS.equals(response.getData().getString("orderState"))) {
// 支付成功
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_SUCCESS);
}else {
......@@ -89,8 +89,8 @@ public class AliBar extends JeepluspayPaymentService {
channelRetMsg.setChannelOrderId(response.get().getPayOrderId());
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliJsapi.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliJsapi.java
View file @ e47b47ab
......@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -41,8 +41,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/15 09:46
*/
@Service("jeepluspayPaymentByAliJsapiService") //Service Name需保持全局唯一性
public class AliJsapi extends JeepluspayPaymentService {
@Service("plspayPaymentByAliJsapiService") //Service Name需保持全局唯一性
public class AliJsapi extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -64,7 +64,7 @@ public class AliJsapi extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_JSAPI);
model.setWayCode(PlspayConfig.ALI_JSAPI);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 支付宝用户ID
......@@ -73,9 +73,9 @@ public class AliJsapi extends JeepluspayPaymentService {
model.setChannelExtra(channelExtra.toString());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -86,8 +86,8 @@ public class AliJsapi extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliLite.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliLite.java
View file @ e47b47ab
......@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.alibaba.fastjson.JSONObject;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.exception.BizException;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -41,8 +41,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/17 17:24
*/
@Service("jeepluspayPaymentByAliLiteService") //Service Name需保持全局唯一性
public class AliLite extends JeepluspayPaymentService {
@Service("plspayPaymentByAliLiteService") //Service Name需保持全局唯一性
public class AliLite extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -64,7 +64,7 @@ public class AliLite extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_LITE);
model.setWayCode(PlspayConfig.ALI_LITE);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 支付宝用户ID
......@@ -73,9 +73,9 @@ public class AliLite extends JeepluspayPaymentService {
model.setChannelExtra(channelExtra.toString());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -86,8 +86,8 @@ public class AliLite extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliPc.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliPc.java
View file @ e47b47ab
......@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -38,8 +38,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/17 14:51
*/
@Service("jeepluspayPaymentByAliPcService") //Service Name需保持全局唯一性
public class AliPc extends JeepluspayPaymentService {
@Service("plspayPaymentByAliPcService") //Service Name需保持全局唯一性
public class AliPc extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -57,14 +57,14 @@ public class AliPc extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_PC);
model.setWayCode(PlspayConfig.ALI_PC);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -84,8 +84,8 @@ public class AliPc extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliQr.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliQr.java
View file @ e47b47ab
......@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -39,8 +39,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/15 09:46
*/
@Service("jeepluspayPaymentByAliQrService") //Service Name需保持全局唯一性
public class AliQr extends JeepluspayPaymentService {
@Service("plspayPaymentByAliQrService") //Service Name需保持全局唯一性
public class AliQr extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -58,14 +58,14 @@ public class AliQr extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_QR);
model.setWayCode(PlspayConfig.ALI_QR);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -79,8 +79,8 @@ public class AliQr extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/jeepluspay/payway/AliWap.java → jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/plspay/payway/AliWap.java
View file @ e47b47ab
......@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jeequan.jeepay.pay.channel.jeepluspay.payway;
package com.jeequan.jeepay.pay.channel.plspay.payway;
import com.jeequan.jeepay.core.constants.CS;
import com.jeequan.jeepay.core.entity.PayOrder;
import com.jeequan.jeepay.core.model.params.jeepluspay.JeepluspayConfig;
import com.jeequan.jeepay.core.model.params.plspay.PlspayConfig;
import com.jeequan.jeepay.exception.JeepayException;
import com.jeequan.jeepay.model.PayOrderCreateReqModel;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayKit;
import com.jeequan.jeepay.pay.channel.jeepluspay.JeepluspayPaymentService;
import com.jeequan.jeepay.pay.channel.plspay.PlspayKit;
import com.jeequan.jeepay.pay.channel.plspay.PlspayPaymentService;
import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.msg.ChannelRetMsg;
......@@ -38,8 +38,8 @@ import org.springframework.stereotype.Service;
* @site https://www.jeequan.com
* @date 2022/8/17 14:46
*/
@Service("jeepluspayPaymentByAliWapService") //Service Name需保持全局唯一性
public class AliWap extends JeepluspayPaymentService {
@Service("plspayPaymentByAliWapService") //Service Name需保持全局唯一性
public class AliWap extends PlspayPaymentService {
@Override
public String preCheck(UnifiedOrderRQ rq, PayOrder payOrder) {
......@@ -57,14 +57,14 @@ public class AliWap extends JeepluspayPaymentService {
// 构建请求数据
PayOrderCreateReqModel model = new PayOrderCreateReqModel();
// 支付方式
model.setWayCode(JeepluspayConfig.ALI_WAP);
model.setWayCode(PlspayConfig.ALI_WAP);
// 异步通知地址
model.setNotifyUrl(getNotifyUrl());
// 发起统一下单
PayOrderCreateResponse response = JeepluspayKit.payRequest(payOrder, mchAppConfigContext, model);
PayOrderCreateResponse response = PlspayKit.payRequest(payOrder, mchAppConfigContext, model);
// 下单返回状态
Boolean isSuccess = JeepluspayKit.checkPayResp(response, mchAppConfigContext);
Boolean isSuccess = PlspayKit.checkPayResp(response, mchAppConfigContext);
if (isSuccess) {
// 下单成功
......@@ -84,8 +84,8 @@ public class AliWap extends JeepluspayPaymentService {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.WAITING);
} else {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
channelRetMsg.setChannelErrCode(response.get().getErrCode());
channelRetMsg.setChannelErrMsg(response.get().getErrMsg());
channelRetMsg.setChannelErrCode(response.getCode()+"");
channelRetMsg.setChannelErrMsg(response.getMsg());
}
} catch (JeepayException e) {
channelRetMsg.setChannelState(ChannelRetMsg.ChannelState.CONFIRM_FAIL);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment