Merge remote-tracking branch 'origin/master'

liujie

2023-10-07 44311853fa68f04db11d341bd374a4ac9b5ea567

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

@@ -141,7 +141,7 @@
     * @param response
     */
    @ResponseBody
    @PostMapping("/base/appUser/addVipPaymentWeChatCallback")
    @PostMapping("/base/pointMer/exchangeGoodPaymentWeChatCallback")
    public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
@@ -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);