diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java index 5620522..5ede137 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java @@ -5,15 +5,17 @@ import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; -import com.muyu.market.server.config.MyAliPayConfig; import com.muyu.data.AliPay; +import com.muyu.market.server.config.MyAliPayConfig; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; + + import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -26,9 +28,7 @@ public class AliPayController { private static final String FORMAT_JSON = "JSON"; private static final String CHARSET_UTF8 = "UTF-8"; private static final String SIGN_TYPE_RSA2 = "RSA2"; - - - @Resource + @Autowired private MyAliPayConfig myAliPayConfig; @GetMapping("/pay") @@ -41,7 +41,7 @@ public class AliPayController { aliPay.setTraceNo(UUID.randomUUID().toString().replaceAll("-","")); aliPay.setTotalAmount("100"); aliPay.setSubject("笔记本华硕"); - + //===== request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\"," + "\"total_amount\":\"" + aliPay.getTotalAmount() + "\"," + "\"subject\":\"" + aliPay.getSubject() + "\"," @@ -59,6 +59,7 @@ public class AliPayController { } + @PostMapping("/notify") // 注意这里必须是POST接口 public String payNotify(HttpServletRequest request) throws Exception { if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) { @@ -71,7 +72,6 @@ public class AliPayController { // System.out.println(name + " = " + request.getParameter(name)); } - String tradeNo = params.get("out_trade_no"); String gmtPayment = params.get("gmt_payment"); String alipayTradeNo = params.get("trade_no"); diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/MyapiController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/MyapiController.java index aa94b07..0653dca 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/MyapiController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/MyapiController.java @@ -75,6 +75,7 @@ public class MyapiController { return Result.success(null,"操作成功"); } + /** * 删除 * @param myapiId @@ -86,6 +87,9 @@ public class MyapiController { myapiService.removeById(myapiId); return Result.success(null,"操作成功"); } + + + /** * 回显接口 * @param myapiId diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/PartyController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/PartyController.java index ce9580e..1725481 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/PartyController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/PartyController.java @@ -25,6 +25,6 @@ public class PartyController { //测试 public static void main(String[] args) { - SelectPhoneUtil.queryMobileLocation("18790307917"); + SelectPhoneUtil.queryMobileLocation("15066755856"); } }