支付页面通知

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/constant/TradeConstant.java

@@ -57,13 +57,13 @@ public interface TradeConstant {
     static final String TRANSFER_URL = "https://apis.5upay.com/transferAccount/order";
 
     /**
-     * 下单通知地址
+     * 下单服务器回调地址
      */
     static final String ORDER_NOTIFY_URL = NOTIFY_DOMAIN + "/maintain/order/notify";
     /**
-     * 下单回调地址
+     * 下单页面回调地址
      */
-    static final String ORDER_CALLBACK_URL = NOTIFY_DOMAIN + "/maintain/order/notify";
+    static final String ORDER_CALLBACK_URL = NOTIFY_DOMAIN + "/PageMine/orderMine/myOrder/index?requestId=%s&merchantId=%s";
     /**
      * 退款回调地址
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OnlinePayServiceImpl.java

@@ -58,11 +58,12 @@ public class OnlinePayServiceImpl  implements OnlinePayService {
     public WechatUnifiedOrder order(OmsOrder omsOrder, List<OmsOrderItem> orderItemList, OmsOrderModifyParam orderParam){
         OrderBuilder builder = new OrderBuilder(TradeConstant.PARTNER_ID);
         Long orderAmount = omsOrder.getPayAmount().multiply(new BigDecimal("100")).longValue();
+        String requestId = omsOrder.getId().toString();
         builder.setRequestId(omsOrder.getId().toString())
                 .setOrderAmount(String.valueOf(orderAmount)) //单位：分
                 .setOrderCurrency("CNY")
                 .setNotifyUrl(TradeConstant.ORDER_NOTIFY_URL)
-                .setCallbackUrl(TradeConstant.ORDER_CALLBACK_URL)
+                .setCallbackUrl(String.format(TradeConstant.ORDER_CALLBACK_URL, requestId, TradeConstant.PARTNER_ID))
                 .setRemark(omsOrder.getNote())
                 .setPaymentModeCode(TradeConstant.MINIAPPS_WEIXIN_PAY_P2P)
                 //.setAuthCode("")