放假备份。完成集中控制器对接。

Van333

2022-12-29 727a69f859060093e685582fa10e5de82dcc138a

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java

@@ -9,13 +9,13 @@
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.C3mOrder;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -25,23 +25,22 @@
@AllArgsConstructor
@RequestMapping("/callback/pay")
@Slf4j
public class PayCallBackController {
public class PayCallBackController {//http://112.74.63.130:20017/callback/pay/wechatCallback


    private final C3mOrderService userOrderService;
    private final UsrAlipayConfigService alipayConfigService;
   // private final UserPayRecordService userPayRecordService;

    /**
     * 微信支付回调
     *
     * @param xmlData
     * @param request
     * @param httpResponse
     * @return
     */
    @AnonymousAccess
    @RequestMapping("wechatCallback")
    public Object wechatNotify(@RequestBody String xmlData) {
        return userOrderService.payWechatNotify(xmlData);
    public Object wechatNotify(HttpServletRequest request, HttpServletResponse httpResponse) {
        return userOrderService.payOrderInstoreNotify(request,httpResponse);
    }

    /**