Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

 cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java

@@ -141,8 +141,8 @@
     * @param response
     */
    @ResponseBody
    @PostMapping("/base/appUser/addVipPaymentWeChatCallback")
    public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
    @PostMapping("/base/pointMer/exchangeGoodPaymentWeChatCallback")
    public void exchangeGoodPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
            if(null != map){
@@ -169,7 +169,7 @@
     * @param response
     */
    @ResponseBody
    @PostMapping("/base/appUser/addVipPaymentAliCallback")
    @PostMapping("/base/pointMer/exchangeGoodPaymentAliCallback")
    public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.alipayCallback(request);