diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java index 07f4c90ce..a468c692e 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java @@ -68,7 +68,7 @@ public class NotifyController { */ @RequestMapping("/native/pay/{platform}") public String pay(@PathVariable String platform, @RequestBody JSONObject json) { - if (PayCst.Platform.WECHAT.equalsIgnoreCase(platform)) { + if (PayCst.Type.WECHAT.equalsIgnoreCase(platform)) { // 微信 WechatNotifyReqDto reqDto = JSONObject.parseObject(json.toJSONString(), WechatNotifyReqDto.class); log.info("【微信支付回调】收到微信支付回调 data: {}", JSONObject.toJSONString(reqDto)); @@ -80,7 +80,7 @@ public class NotifyController { PayNotifyRespDTO respDTO = dataDto.convertToPayNotifyRespDTO(); orderInfoCustomService.payCallBackOrder(respDTO.getMchOrderNo(), respDTO, PayChannelCst.NATIVE, 0); return "success"; - } else if (PayCst.Platform.ALIPAY.equalsIgnoreCase(platform)) { + } else if (PayCst.Type.ALIPAY.equalsIgnoreCase(platform)) { // 支付宝 return "success"; } @@ -92,7 +92,7 @@ public class NotifyController { */ @RequestMapping("/native/refund/{platform}") public String refund(@PathVariable String platform, @RequestBody JSONObject json) { - if (PayCst.Platform.WECHAT.equalsIgnoreCase(platform)) { + if (PayCst.Type.WECHAT.equalsIgnoreCase(platform)) { // 微信 WechatNotifyReqDto reqDto = JSONObject.parseObject(json.toJSONString(), WechatNotifyReqDto.class); log.info("【微信退款回调】收到微信退款回调 data: {}", JSONObject.toJSONString(reqDto)); @@ -100,7 +100,7 @@ public class NotifyController { log.info("【微信退款回调】解密数据 {}", decrypted); return "success"; - } else if (PayCst.Platform.ALIPAY.equalsIgnoreCase(platform)) { + } else if (PayCst.Type.ALIPAY.equalsIgnoreCase(platform)) { // 支付宝 return "success"; } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java index 14efd7a33..8a4660b24 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java @@ -30,7 +30,7 @@ public class DistributionPayController { /** * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/ltPayOrder") @@ -42,7 +42,7 @@ public class DistributionPayController { /** * 运营端小程序余额充值 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 */ @PostMapping("/mchRecharge") @Debounce(value = "#payParam.userId") diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java index c597608e8..790cb28df 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java @@ -59,7 +59,7 @@ public class OrderPayController { /** * 充值并付款 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/rechargePayOrder") @@ -99,7 +99,7 @@ public class OrderPayController { /** * js支付 *

- * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/jsPay") @@ -111,7 +111,7 @@ public class OrderPayController { /** * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/ltPayOrder") @@ -167,7 +167,8 @@ public class OrderPayController { } /** - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * 空订单支付/h5页面支付 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 * checkOrderPay.orderAmount 必填 */ diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java index 7774747eb..8ba4a662d 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java @@ -53,7 +53,7 @@ public class VipPayController { /** * js支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/jsPayVip") @@ -66,7 +66,7 @@ public class VipPayController { /** * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/ltPayVip") @@ -139,6 +139,7 @@ public class VipPayController { } /** + * 会员退款 * cashRefund 是否是现金退款 * 会员退款(先调用 退款前置接口 refundVipBefore) * 最大退款金额为 充值金额 inAmount diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java index b3ed19e21..a4ceb8157 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java @@ -90,7 +90,7 @@ public class UGbOrderController { /** * 生成订单 * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/exchange") diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java index fea395e55..9b893a87a 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java @@ -54,7 +54,7 @@ public class UPointGoodsController { /** * 生成订单 * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/exchange") diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java index 87f93945e..a0744a840 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java @@ -45,7 +45,7 @@ public class UPpOrderController { /** * 小程序支付 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 */ @PostMapping("/pay") diff --git a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java index f2db120dc..3f1d72561 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java @@ -62,11 +62,11 @@ public class EntryManagerMqListener { channel.basicNack(deliveryTag, false, false); return; } - Long shopId = Long.valueOf(split[0]); - if (shopId == null) { + if (split[0]==null) { channel.basicNack(deliveryTag, false, false); return; } + Long shopId = Long.valueOf(split[0]); if (hasMessageId(msg)) { return; } @@ -81,10 +81,10 @@ public class EntryManagerMqListener { EntryManager.uploadParamImage(entry); List platform = new ArrayList<>(); if (PayCst.EntryStatus.WAIT.equals(entry.getAlipayStatus())) { - platform.add(PayCst.Platform.ALIPAY); + platform.add(PayCst.Type.ALIPAY); } if (PayCst.EntryStatus.WAIT.equals(entry.getWechatStatus())) { - platform.add(PayCst.Platform.WECHAT); + platform.add(PayCst.Type.WECHAT); } EntryRespDto resp = EntryManager.entryMerchant(entry, platform.toArray(new String[0])); ShopDirectMerchant merchant = new ShopDirectMerchant(); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java b/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java index f480ce98d..2e76dd89d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java @@ -46,18 +46,9 @@ public interface SystemConstants { /** - * 三方支付类型 + * 小程序APPID */ - class PayType { - /** - * 微信支付 - */ - public static final String WECHAT = "wechatPay"; - - /** - * 支付宝支付 - */ - public static final String ALIPAY = "alipay"; + class PayAppId { /** * 微信小程序支付 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java index bc0365296..587adb002 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; /** * 小程序支付 其它类型 - * payType 必填 支付方式，aliPay 支付宝，wechatPay 微信 + * payType 必填 支付方式，ALIPAY 支付宝，WECHAT 微信 * openId 必填 * @author ww */ @@ -32,7 +32,7 @@ public class LtPayOtherDTO { @NotNull(message = "兑换数量不能为空") private int number; /** - * 支付方式 支付方式，aliPay 支付宝，wechatPay 微信 + * 支付方式，ALIPAY 支付宝，WECHAT 微信 */ private String payType; /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java index 05b7ece75..1709d844f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java @@ -1,7 +1,6 @@ package com.czg.order.dto; -import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -26,7 +25,7 @@ public class MkDistributionPayDTO implements Serializable { private Long userId; /** * 支付类型 - * {@link com.czg.constants.SystemConstants.PayType} + * {@link com.czg.PayCst.Type} */ private String payType; private String returnUrl; diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java index 4c50b2ba0..5ba69d428 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java @@ -80,13 +80,13 @@ public class EntryManager { List> tasks = new ArrayList<>(); if (platform == null || platform.length == 0) { - platform = new String[]{PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY}; + platform = new String[]{PayCst.Type.WECHAT, PayCst.Type.ALIPAY}; } - if (ArrayUtil.contains(platform, PayCst.Platform.WECHAT)) { + if (ArrayUtil.contains(platform, PayCst.Type.WECHAT)) { tasks.add(() -> WechatEntryManager.entryMerchant(null, reqDto)); } - if (ArrayUtil.contains(platform, PayCst.Platform.ALIPAY)) { + if (ArrayUtil.contains(platform, PayCst.Type.ALIPAY)) { tasks.add(() -> AlipayIsvEntryManager.entryMerchant(null, reqDto)); } @@ -102,11 +102,11 @@ public class EntryManager { for (AsyncTaskExecutor.TaskResult result : results) { // 合并两个进件结果 EntryThirdRespDto respDto = result.result(); - if (PayCst.Platform.WECHAT.equals(respDto.getPlatform())) { + if (PayCst.Type.WECHAT.equals(respDto.getPlatform())) { entryRespDto.setWechatApplyId(respDto.getEntryId()); entryRespDto.setWechatStatus(respDto.getStatus()); entryRespDto.setWechatErrorMsg(respDto.getErrorMsg()); - } else if (PayCst.Platform.ALIPAY.equals(respDto.getPlatform())) { + } else if (PayCst.Type.ALIPAY.equals(respDto.getPlatform())) { entryRespDto.setAlipayOrderId(respDto.getEntryId()); entryRespDto.setAlipayStatus(respDto.getStatus()); entryRespDto.setAlipayErrorMsg(respDto.getErrorMsg()); @@ -384,9 +384,9 @@ public class EntryManager { // verifyEntryParam(merchantDto); // uploadParamImage(merchantDto); //// System.out.println(merchantDto); - EntryRespDto respDto = entryMerchant(merchantDto, PayCst.Platform.WECHAT); -// entryMerchant(merchantDto, PayCst.Platform.ALIPAY); -// entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY); + EntryRespDto respDto = entryMerchant(merchantDto, PayCst.Type.WECHAT); +// entryMerchant(merchantDto, PayCst.Type.ALIPAY); +// entryMerchant(merchantDto, PayCst.Type.WECHAT, PayCst.Type.ALIPAY); System.out.println(respDto); } diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java index 3602ba2a2..8da16d67b 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java @@ -21,15 +21,16 @@ public interface PayCst { String ALIPAY_ERROR_MSG_KEY = "message"; /** - * 平台 + * 支付类型 */ - class Platform { + class Type { /** - * 微信 + * 微信支付 */ public static final String WECHAT = "WECHAT"; + /** - * 支付宝 + * 支付宝支付 */ public static final String ALIPAY = "ALIPAY"; } diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java index 6dc32e0b1..7907074db 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java @@ -1,6 +1,5 @@ package com.czg; -import com.czg.constants.SystemConstants; import com.czg.exception.CzgException; import com.czg.pay.*; import com.czg.third.alipay.AlipayIsvPayManager; @@ -21,9 +20,9 @@ public class PayManager { * @return 结果 */ public static Map jsapiPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { - if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) { + if (PayCst.Type.WECHAT.equals(paramsDto.getPayType())) { return WechatPayManager.jsapiPay(null, paramsDto, merchantDTO); - } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) { + } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPayType())) { return AlipayIsvPayManager.jsapiPay(null, paramsDto, merchantDTO); } else { throw new CzgException("不支持的支付平台"); @@ -37,9 +36,9 @@ public class PayManager { * @return 结果 */ public static Map barPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) { - if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) { + if (PayCst.Type.WECHAT.equals(paramsDto.getPayType())) { return WechatPayManager.barPay(null, paramsDto, merchantDTO); - } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) { + } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPayType())) { return AlipayIsvPayManager.barPay(null, paramsDto, merchantDTO); } else { throw new CzgException("不支持的支付平台"); @@ -50,9 +49,9 @@ public class PayManager { * 查询订单状态 */ public static QueryOrderRespDTO queryOrderStatus(String platform, String orderNo, NativeMerchantDTO merchantDTO) { - if (SystemConstants.PayType.WECHAT.equals(platform)) { + if (PayCst.Type.WECHAT.equals(platform)) { return WechatPayManager.queryOrder(null, orderNo, merchantDTO); - } else if (SystemConstants.PayType.ALIPAY.equals(platform)) { + } else if (PayCst.Type.ALIPAY.equals(platform)) { return AlipayIsvPayManager.queryOrder(null, orderNo, merchantDTO); } else { throw new CzgException("不支持的支付平台"); @@ -63,9 +62,9 @@ public class PayManager { * 退款 */ public static RefundRespDTO refund(CzgRefundReq paramsDto, String notifyUrl, NativeMerchantDTO merchantDTO) { - if (PayCst.Platform.WECHAT.equals(paramsDto.getPlatform())) { + if (PayCst.Type.WECHAT.equals(paramsDto.getPlatform())) { return WechatPayManager.refundOrder(null, paramsDto, notifyUrl, merchantDTO); - } else if (PayCst.Platform.ALIPAY.equals(paramsDto.getPlatform())) { + } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPlatform())) { return AlipayIsvPayManager.refundOrder(null, paramsDto, notifyUrl, merchantDTO); } else { throw new CzgException("不支持的支付平台"); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java index 20553c16a..45b65c0bf 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java @@ -106,9 +106,9 @@ public class PayParamsDto { AssertUtil.isBlank(appId, "appId不能为空"); AssertUtil.isBlank(openId, "用户唯一标识不能为空"); - if (PayCst.Platform.WECHAT.equals(platform)) { + if (PayCst.Type.WECHAT.equals(platform)) { AssertUtil.isBlank(merchantId, "商户ID不能为空"); - } else if (PayCst.Platform.ALIPAY.equals(platform)) { + } else if (PayCst.Type.ALIPAY.equals(platform)) { AssertUtil.isBlank(payParams, "支付参数不能为空"); alipayAuthInfo = JSONObject.parseObject(payParams, AlipayAuthInfoDto.class); AssertUtil.isNull(alipayAuthInfo, "支付参数错误"); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java index 44a5576c3..4d79c703a 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java @@ -129,7 +129,7 @@ public class WechatPayNotifyDataDto { .setMchOrderNo(outTradeNo) .setThirdOrderNo(transactionId) .setAmount(getPayAmount()) - .setPlatform(PayCst.Platform.WECHAT) + .setPlatform(PayCst.Type.WECHAT) .setExtData(attach) .setPaySuccessTime(time) .setErrorMsg(tradeStateDesc); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java index 926d01265..942b3374e 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java @@ -31,7 +31,6 @@ import com.czg.dto.resp.EntryThirdRespDto; import com.czg.dto.resp.QueryStatusResp; import com.czg.exception.CzgException; import com.czg.third.alipay.dto.config.AlipayConfigDto; -import com.czg.third.wechat.dto.resp.WechatQueryStateResp; import com.czg.utils.UploadFileUtil; import lombok.extern.slf4j.Slf4j; @@ -60,7 +59,7 @@ public class AlipayEntryManager { */ public static QueryStatusResp queryMerchantEntryStatus(AlipayConfigDto configDto, String merchantCode) { QueryStatusResp queryStatusResp = new QueryStatusResp(); - queryStatusResp.setPlatform(PayCst.Platform.ALIPAY); + queryStatusResp.setPlatform(PayCst.Type.ALIPAY); queryStatusResp.setMerchantCode(merchantCode); AntMerchantExpandIndirectZftorderQueryRequest request = new AntMerchantExpandIndirectZftorderQueryRequest(); @@ -158,7 +157,7 @@ public class AlipayEntryManager { public static EntryThirdRespDto entryMerchant(AlipayConfigDto configDto, AggregateMerchantDto reqDto) { AntMerchantExpandIndirectZftCreateModel entryReqDto = buildEntryParams(reqDto); EntryThirdRespDto respDto = new EntryThirdRespDto() - .setPlatform(PayCst.Platform.ALIPAY); + .setPlatform(PayCst.Type.ALIPAY); try { AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest(); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java index 32d5aef14..87b0b5fa3 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java @@ -30,7 +30,7 @@ public class AlipayIsvEntryManager { configDto = AlipayConfigDto.getThirdDefaultConfig(); } QueryStatusResp respDto = new QueryStatusResp() - .setPlatform(PayCst.Platform.ALIPAY); + .setPlatform(PayCst.Type.ALIPAY); AlipayClient.setApiClient(configDto); try { @@ -104,7 +104,7 @@ public class AlipayIsvEntryManager { } AlipayClient.setApiClient(configDto); EntryThirdRespDto respDto = new EntryThirdRespDto() - .setPlatform(PayCst.Platform.ALIPAY); + .setPlatform(PayCst.Type.ALIPAY); try { String batchNo = createRequest(configDto, reqDto); respDto.setEntryId(batchNo); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java index 159f0fb88..0d9be3d3b 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java @@ -43,7 +43,7 @@ public class AlipayIsvPayManager { model.setTotalAmount(getYuanAmountByFen(paramsDto.getAmount())); model.setSubject(paramsDto.getSubject()); model.setBody(paramsDto.getBody()); - model.setNotifyUrl(paramsDto.getNotifyUrl() + "/" + PayCst.Platform.ALIPAY); + model.setNotifyUrl(paramsDto.getNotifyUrl() + "/" + PayCst.Type.ALIPAY); model.setExtendParams(new ExtendParams()); CustomizedParams customizedParams = new CustomizedParams(); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java index 74e647650..39621969e 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java @@ -1,7 +1,6 @@ package com.czg.third.wechat; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONWriter; import com.czg.PayCst; @@ -15,7 +14,10 @@ import com.czg.third.wechat.dto.req.entry.*; import com.czg.third.wechat.dto.req.entry.business.WechatEntryBusinessReqDto; import com.czg.third.wechat.dto.req.entry.business.WechatEntryIdentityReqDto; import com.czg.third.wechat.dto.req.entry.business.WechatEntryLicenseReqDto; -import com.czg.third.wechat.dto.req.entry.business.sales.*; +import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryMiniProgramReqDto; +import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntrySalesInfoReqDto; +import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryStoreInfoReqDto; +import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryWebInfoReqDto; import com.czg.third.wechat.dto.req.entry.id.WechatEntryIdCardReqDto; import com.czg.third.wechat.dto.resp.WechatAuditDetail; import com.czg.third.wechat.dto.resp.WechatQueryStateResp; @@ -50,7 +52,7 @@ public class WechatEntryManager { */ public static QueryStatusResp queryMerchantEntryStatus(WechatPayConfigDto configDto, String applyId) { QueryStatusResp queryStatusResp = new QueryStatusResp(); - queryStatusResp.setPlatform(PayCst.Platform.WECHAT); + queryStatusResp.setPlatform(PayCst.Type.WECHAT); queryStatusResp.setMerchantCode(applyId); String resp = WechatReqUtils.getReq(configDto, "/v3/applyment4sub/applyment/applyment_id/" + applyId, Map.of()); @@ -109,7 +111,7 @@ public class WechatEntryManager { */ public static EntryThirdRespDto entryMerchant(WechatPayConfigDto configDto, AggregateMerchantDto reqDto) { EntryThirdRespDto respDto = new EntryThirdRespDto() - .setPlatform(PayCst.Platform.WECHAT); + .setPlatform(PayCst.Type.WECHAT); try { WechatEntryReqDto entryReqDto = buildEntryParams(configDto, reqDto); log.info("微信进件参数：{}", JSONObject.toJSONString(entryReqDto)); diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java index 85d2b71cd..51475f0f0 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java @@ -56,7 +56,7 @@ public class WechatPayManager { reqData.put("sub_mchid", merchantDTO.getWechatMerchantId()); reqData.put("description", paramsDto.getSubject()); reqData.put("out_trade_no", paramsDto.getMchOrderNo()); - reqData.put("notify_url", paramsDto.getNotifyUrl() + "/" + PayCst.Platform.WECHAT); + reqData.put("notify_url", paramsDto.getNotifyUrl() + "/" + PayCst.Type.WECHAT); reqData.put("attach", paramsDto.getExtParam()); JSONObject amount = new JSONObject(); @@ -267,7 +267,7 @@ public class WechatPayManager { refundParam.put("out_trade_no", paramsDto.getMchOrderNo()); refundParam.put("out_refund_no", paramsDto.getMchRefundNo()); refundParam.put("reason", paramsDto.getRefundReason()); - refundParam.put("notify_url", notifyUrl + "/" + PayCst.Platform.WECHAT); + refundParam.put("notify_url", notifyUrl + "/" + PayCst.Type.WECHAT); JSONObject amount = new JSONObject(); amount.put("total", paramsDto.getOrderTotalAmount()); @@ -291,7 +291,7 @@ public class WechatPayManager { .setThirdRefundNo(object.getString("refund_id")) .setRefundTime(object.getString("success_time")) .setOriginalData(resp) - .setPlatform(PayCst.Platform.WECHAT); + .setPlatform(PayCst.Type.WECHAT); JSONObject resAmount = object.getJSONObject("amount"); if (resAmount != null) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java index 38601ff4c..deaf98a9c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java @@ -1,13 +1,13 @@ package com.czg.service.order.service.impl; import cn.hutool.core.util.IdUtil; +import com.czg.PayCst; import com.czg.account.entity.ShopUser; import com.czg.account.entity.UserInfo; import com.czg.account.service.ShopUserService; import com.czg.account.service.UserInfoService; import com.czg.constant.TableValueConstant; import com.czg.constants.PayTypeConstants; -import com.czg.constants.SystemConstants; import com.czg.enums.CzgPayEnum; import com.czg.exception.CzgException; import com.czg.market.service.MkDistributionConfigService; @@ -83,7 +83,7 @@ public class DistributionPayServiceImpl implements DistributionPayService { } else { UserInfo userInfo = userInfoService.getById(userId); initInfo.setPayment(orderPayment).setShopUser(shopUserInfo) - .setOpenId(SystemConstants.PayType.ALIPAY.equals(payParam.getPayType()) ? userInfo.getAlipayOpenId() : userInfo.getWechatOpenId()); + .setOpenId(PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? userInfo.getAlipayOpenId() : userInfo.getWechatOpenId()); } return initInfo; } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java index 7f3fa8ca4..24ed0fe46 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.digest.MD5; import com.alibaba.fastjson2.JSONObject; +import com.czg.PayCst; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; @@ -242,7 +243,7 @@ public class OrderPayServiceImpl implements OrderPayService { CzgPayBaseReq.ltPayReq( payOrderNo, "充值并支付", rechargeDetail.getAmount().multiply(PayService.MONEY_RATE).longValue(), payParam.getPayType(), - "wechatPay".equals(payParam.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId(), clintIp)); + PayCst.Type.WECHAT.equals(payParam.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId(), clintIp)); } @Override diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 590e46968..e7a56bdfa 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.PayAdapter; import com.czg.PayAdapterFactory; +import com.czg.PayCst; import com.czg.constant.PayChannelCst; import com.czg.constants.ParamCodeCst; import com.czg.constants.PayTypeConstants; -import com.czg.constants.SystemConstants; import com.czg.enums.CzgPayEnum; import com.czg.exception.CzgException; import com.czg.order.dto.LtPayOtherDTO; @@ -64,7 +64,10 @@ public class PayServiceImpl implements PayService { } else if (shopMerchant.getChannel().equals(PayChannelCst.POLY)) { payData = shopMerchant.getPolyPayJson(); } - bizData.setSubAppid(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? shopMerchant.getAlipayAppId() : shopMerchant.getWechatAppId()); + if (!PayCst.Type.WECHAT.equals(bizData.getPayType()) && !PayCst.Type.ALIPAY.equals(bizData.getPayType())) { + throw new CzgException("支付方式错误"); + } + bizData.setSubAppid(PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? shopMerchant.getAlipayAppId() : shopMerchant.getWechatAppId()); if (payType.equals(CzgPayEnum.MICRO_PAY)) { checkMicroPay(bizData, shopMerchant); } @@ -203,7 +206,7 @@ public class PayServiceImpl implements PayService { return sysParamsService.getSysParamValue(ParamCodeCst.System.POLY_DOMAIN); } - private String getNotifyUrl(String channel) { + private String getNotifyUrl(String channel) { String notifyUrl = ""; if (channel.equals(PayChannelCst.NATIVE)) { notifyUrl = sysParamsService.getSysParamValue(ParamCodeCst.System.NATIVE_PAY_NOTIFY_URL); @@ -229,11 +232,11 @@ public class PayServiceImpl implements PayService { if (firstTwoDigits >= 10 && firstTwoDigits <= 15) { //微信支付 bizData.setSubAppid(shopMerchant.getWechatAppId()); - bizData.setPayType(SystemConstants.PayType.WECHAT); + bizData.setPayType(PayCst.Type.WECHAT); } else if (firstTwoDigits >= 25 && firstTwoDigits <= 30) { //支付宝支付 bizData.setSubAppid(shopMerchant.getAlipayAppId()); - bizData.setPayType(SystemConstants.PayType.ALIPAY); + bizData.setPayType(PayCst.Type.ALIPAY); } else { throw new CzgException("扫描码非法或暂不支持"); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java index 6feb1f464..385bb3cc3 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java @@ -75,8 +75,8 @@ public class ShopMerchantServiceImpl extends ServiceImpl> jsPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { - AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); - bizData.setPayType(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "ALIPAY" : "WECHAT"); + AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); + bizData.setPayType(PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "ALIPAY" : "WECHAT"); bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.jsPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); } private CzgResult> ltPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) { - AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + ("aliPay".equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); + AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序"); bizData.polyBase(shopMerchant.getStoreId(), notifyUrl); return PolyPayUtils.ltPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData); }