From 19e54584a27407d76c3a65e763218657ec167eca Mon Sep 17 00:00:00 2001 From: lbw Date: Wed, 3 Feb 2021 13:24:11 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20#2?= =?UTF-8?q?351=20=E3=80=90=E6=94=AF=E4=BB=98=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81YunGouOS=20=E5=B0=8F=E5=BE=AE=E5=95=86?= =?UTF-8?q?=E6=88=B7=E6=94=AF=E4=BB=98=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/pay/config/MergePayConfig.java | 22 ------------- .../pigx/pay/config/PayCommonProperties.java | 32 ------------------- .../controller/PayGoodsOrderController.java | 21 ++++++------ .../handler/impl/WeChatMpPayOrderHandler.java | 3 -- .../YungouosMergePayNotifyCallbakHandler.java | 14 +++----- .../impl/YungouosMergePayOrderHandler.java | 20 ++++-------- .../pay/service/PayGoodsOrderService.java | 6 ++-- .../impl/PayGoodsOrderServiceImpl.java | 10 +++--- .../pigx/pay/utils/PayChannelNameEnum.java | 7 ++-- 9 files changed, 33 insertions(+), 102 deletions(-) delete mode 100644 pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/MergePayConfig.java delete mode 100644 pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayCommonProperties.java diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/MergePayConfig.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/MergePayConfig.java deleted file mode 100644 index 5bb7c8787..000000000 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/MergePayConfig.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.pig4cloud.pigx.pay.config; - -import lombok.Data; - -/** - * @author lengleng - * @date 2021/1/4 - *

- * 聚合支付 - */ -@Data -public class MergePayConfig { - /** - * 前端回调地址 - */ - private String returnUrl; - - /** - * 服务端回调地址 - */ - private String notifyUrl; -} diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayCommonProperties.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayCommonProperties.java deleted file mode 100644 index 44574f4f4..000000000 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayCommonProperties.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.pig4cloud.pigx.pay.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.context.annotation.Configuration; - -/** - * @author lengleng - * @date 2019-06-18 - */ -@Data -@RefreshScope -@Configuration -@ConfigurationProperties(prefix = "pigx.pay") -public class PayCommonProperties { - - /** - * 支付宝支付参数 - */ - private AliPayConfig aliPayConfig; - - /** - * 微信支付参数 - */ - private WxPayConfig wxPayConfig; - - /** - * 聚合支付参数 - */ - private MergePayConfig mergePayConfig; -} \ No newline at end of file diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java index 7239ef5b5..7b60065f4 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java @@ -51,13 +51,16 @@ import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - /** * 商品 * @@ -77,7 +80,6 @@ public class PayGoodsOrderController { private final ObjectMapper objectMapper; - /** * 商品订单 * @param goods 商品 @@ -165,8 +167,7 @@ public class PayGoodsOrderController { /** * 分页查询 - * - * @param page 分页对象 + * @param page 分页对象 * @param payGoodsOrder 商品订单表 * @return */ @@ -178,7 +179,6 @@ public class PayGoodsOrderController { /** * 通过id查询商品订单表 - * * @param goodsOrderId id * @return R */ @@ -190,7 +190,6 @@ public class PayGoodsOrderController { /** * 新增商品订单表 - * * @param payGoodsOrder 商品订单表 * @return R */ @@ -204,7 +203,6 @@ public class PayGoodsOrderController { /** * 修改商品订单表 - * * @param payGoodsOrder 商品订单表 * @return R */ @@ -218,7 +216,6 @@ public class PayGoodsOrderController { /** * 通过id删除商品订单表 - * * @param goodsOrderId id * @return R */ diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java index de2036fdc..b8f338308 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java @@ -46,9 +46,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - /** * @author lengleng * @date 2019-05-31 diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java index 478393f4e..3d18aeecf 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayNotifyCallbakHandler.java @@ -1,5 +1,7 @@ package com.pig4cloud.pigx.pay.handler.impl; +import java.util.Map; + import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; @@ -19,8 +21,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.Map; - /** * @author lengleng * @date 2021/1/4 @@ -42,7 +42,6 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb /** * 初始化执行 - * * @param params */ @Override @@ -53,7 +52,6 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb /** * 去重处理 - * * @param params 回调报文 * @return */ @@ -70,7 +68,6 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb /** * 验签逻辑 - * * @param params 回调报文 * @return */ @@ -81,7 +78,6 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb /** * 解析报文 - * * @param params * @return */ @@ -97,7 +93,8 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb if (OrderStatusEnum.SUCCESS.getStatus().equals(mergeCode)) { goodsOrder.setStatus(OrderStatusEnum.SUCCESS.getStatus()); tradeOrder.setStatus(OrderStatusEnum.SUCCESS.getStatus()); - } else { + } + else { goodsOrder.setStatus(OrderStatusEnum.FAIL.getStatus()); tradeOrder.setStatus(OrderStatusEnum.FAIL.getStatus()); } @@ -111,10 +108,8 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb return "SUCCESS"; } - /** * 保存回调记录 - * * @param params 回调报文 * @param result 处理结果 */ @@ -125,4 +120,5 @@ public class YungouosMergePayNotifyCallbakHandler extends AbstractPayNotifyCallb MapUtil.renameKey(params, PayConstants.MERGE_OUT_TRADE_NO, PayConstants.OUT_TRADE_NO); saveRecord(params, result, record, notifyId, recordService); } + } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java index 3be36ec4e..4ea96357c 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/YungouosMergePayOrderHandler.java @@ -24,8 +24,7 @@ import org.springframework.stereotype.Service; * @author lengleng * @date 2021/1/4 *

- * https://open.pay.yungouos.com/#/api/api/pay/merge/nativePay - * 服务商聚合支付模式 + * https://open.pay.yungouos.com/#/api/api/pay/merge/nativePay 服务商聚合支付模式 */ @Slf4j @Service("MERGE_PAY") @@ -87,21 +86,15 @@ public class YungouosMergePayOrderHandler extends AbstractPayOrderHandler { PayChannel channel = ChannelPayApiConfigKit.get(); String money = NumberUtil.div(tradeOrder.getAmount(), "100", 2).toString(); - return MergePay.nativePay(tradeOrder.getOrderId(), money, "100106279016" - , tradeOrder.getBody() - , "1" - , tradeOrder.getBody() - , commonProperties.getMergePayConfig().getNotifyUrl() - , commonProperties.getMergePayConfig().getReturnUrl() - , "" - , "" - , "" - , "759492493EBC43B498955E261E1A494F"); + + return MergePay.nativePay(tradeOrder.getOrderId(), money, channel.getChannelMchId(), tradeOrder.getBody(), "1", + TenantContextHolder.getTenantId().toString(), + ChannelPayApiConfigKit.get().getNotifyUrl() + "/pay/notify/merge/callbak", + ChannelPayApiConfigKit.get().getReturnUrl(), "", "", "", channel.getParam()); } /** * 更新订单信息 - * * @param goodsOrder 商品订单 * @param tradeOrder 交易订单 */ @@ -110,4 +103,5 @@ public class YungouosMergePayOrderHandler extends AbstractPayOrderHandler { tradeOrderMapper.updateById(tradeOrder); goodsOrderMapper.updateById(goodsOrder); } + } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayGoodsOrderService.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayGoodsOrderService.java index cafc64763..ca247b0ec 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayGoodsOrderService.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayGoodsOrderService.java @@ -17,11 +17,11 @@ package com.pig4cloud.pigx.pay.service; +import java.util.Map; + import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; -import java.util.Map; - /** * 商品 * @@ -33,7 +33,7 @@ public interface PayGoodsOrderService extends IService { /** * 购买商品 * @param goodsOrder goods - * @param isMerge 是否是服务商 + * @param isMerge 是否是服务商 * @return */ Map buy(PayGoodsOrder goodsOrder, boolean isMerge); diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java index 611336b89..0d1186d5c 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java @@ -16,6 +16,11 @@ */ package com.pig4cloud.pigx.pay.service.impl; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.handler.PayOrderHandler; @@ -28,10 +33,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - /** * 商品 * @@ -50,7 +51,6 @@ public class PayGoodsOrderServiceImpl extends ServiceImpl