| @@ -1,52 +1,27 @@ | |||||
| package com.iformall.controller.callback; | package com.iformall.controller.callback; | ||||
| import com.alibaba.fastjson.JSON; | |||||
| import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | |||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.AliPayCUser; | import com.iformall.domain.po.AliPayCUser; | ||||
| import com.iformall.domain.po.WxMall; | import com.iformall.domain.po.WxMall; | ||||
| import com.iformall.domain.po.msg.FmInsideNotifyPaySuccessMsg; | |||||
| import com.iformall.domain.po.msg.FmInsideNotifyRefundSuccessMsg; | |||||
| import com.iformall.enums.*; | |||||
| import com.iformall.exception.BizMessageException; | |||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mq.MqBaseProducer; | |||||
| import com.iformall.pay.WxPayment; | |||||
| import com.iformall.service.AliPayCUserService; | import com.iformall.service.AliPayCUserService; | ||||
| import com.iformall.service.WxMallService; | import com.iformall.service.WxMallService; | ||||
| import com.iformall.service.WxPayOrderService; | |||||
| import com.iformall.service.WxRefundOrderService; | |||||
| import com.iformall.service.WxSubsidyService; | |||||
| import com.iformall.service.pay.alipay.AliPayUtil; | import com.iformall.service.pay.alipay.AliPayUtil; | ||||
| import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig; | import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig; | ||||
| import com.iformall.service.pay.alipay.api.result.UserAuthData; | import com.iformall.service.pay.alipay.api.result.UserAuthData; | ||||
| import com.iformall.utils.XmlUtil; | |||||
| import org.apache.commons.io.IOUtils; | |||||
| import org.jdom2.JDOMException; | |||||
| import org.junit.platform.commons.util.StringUtils; | import org.junit.platform.commons.util.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.http.MediaType; | |||||
| import org.springframework.web.bind.annotation.PostMapping; | import org.springframework.web.bind.annotation.PostMapping; | ||||
| import org.springframework.web.bind.annotation.RequestBody; | import org.springframework.web.bind.annotation.RequestBody; | ||||
| import org.springframework.web.bind.annotation.RequestMapping; | import org.springframework.web.bind.annotation.RequestMapping; | ||||
| import org.springframework.web.bind.annotation.ResponseBody; | import org.springframework.web.bind.annotation.ResponseBody; | ||||
| import org.springframework.web.bind.annotation.RestController; | import org.springframework.web.bind.annotation.RestController; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.io.ByteArrayOutputStream; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import java.io.InputStream; | |||||
| import java.io.PrintWriter; | import java.io.PrintWriter; | ||||
| import java.nio.charset.Charset; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| import java.util.SortedMap; | |||||
| import java.util.TreeMap; | |||||
| @RestController | @RestController | ||||
| @RequestMapping("/alipay/notify") | @RequestMapping("/alipay/notify") | ||||
| @@ -54,16 +29,6 @@ public class AliPayController extends BaseController { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @Autowired | |||||
| private WxPayOrderService wxPayOrderService; | |||||
| @Autowired | |||||
| private WxSubsidyService wxSubsidyService; | |||||
| @Autowired | |||||
| private MqBaseProducer mqBaseProducer; | |||||
| @Autowired | @Autowired | ||||
| private AliPayUtil alipayUtil; | private AliPayUtil alipayUtil; | ||||