Skip to content

Commit 973a469

Browse files
egzosnegzosn
committed
根据最新的接口功能实现案例
1 parent a888fb5 commit 973a469

8 files changed

Lines changed: 48 additions & 42 deletions

File tree

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.egzosn.pay.ali.bean.AliTransferOrder;
2626
import com.egzosn.pay.ali.bean.AliTransferType;
2727
import com.egzosn.pay.ali.bean.OrderSettle;
28+
import com.egzosn.pay.common.bean.AssistOrder;
2829
import com.egzosn.pay.common.bean.CertStoreType;
2930
import com.egzosn.pay.common.bean.NoticeParams;
3031
import com.egzosn.pay.common.bean.PayOrder;
@@ -283,7 +284,7 @@ public String payBack(HttpServletRequest request) {
283284
*/
284285
@RequestMapping("query")
285286
public Map<String, Object> query(QueryOrder order) {
286-
return service.query(order.getTradeNo(), order.getOutTradeNo());
287+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
287288
}
288289

289290
/**
@@ -311,7 +312,7 @@ public Map<String, Object> settle(OrderSettle order) {
311312
*/
312313
@RequestMapping("close")
313314
public Map<String, Object> close(QueryOrder order) {
314-
return service.close(order.getTradeNo(), order.getOutTradeNo());
315+
return service.close(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
315316
}
316317

317318
/**

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.egzosn.pay.common.api.PayConfigStorage;
2727
import com.egzosn.pay.common.api.PayMessageInterceptor;
2828
import com.egzosn.pay.common.api.PayService;
29+
import com.egzosn.pay.common.bean.AssistOrder;
2930
import com.egzosn.pay.common.bean.MethodType;
3031
import com.egzosn.pay.common.bean.NoticeParams;
3132
import com.egzosn.pay.common.bean.PayMessage;
@@ -419,7 +420,7 @@ public String payBackOld(HttpServletRequest request, @PathVariable Integer payId
419420
@RequestMapping("query")
420421
public Map<String, Object> query(QueryOrder order) {
421422
PayResponse payResponse = service.getPayResponse(order.getPayId());
422-
return payResponse.getService().query(order.getTradeNo(), order.getOutTradeNo());
423+
return payResponse.getService().query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
423424
}
424425
/**
425426
* 查询
@@ -444,7 +445,7 @@ public Map<String, Object> unionQuery(UnionQueryOrder order,String transactionTy
444445
@RequestMapping("close")
445446
public Map<String, Object> close(QueryOrder order) {
446447
PayResponse payResponse = service.getPayResponse(order.getPayId());
447-
return payResponse.getService().close(order.getTradeNo(), order.getOutTradeNo());
448+
return payResponse.getService().close(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
448449
}
449450

450451
/**

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayoneerPayController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.springframework.web.bind.annotation.ResponseBody;
1414
import org.springframework.web.bind.annotation.RestController;
1515

16+
import com.egzosn.pay.common.bean.AssistOrder;
1617
import com.egzosn.pay.common.bean.DefaultCurType;
1718
import com.egzosn.pay.common.bean.PayOrder;
1819
import com.egzosn.pay.common.bean.RefundOrder;
@@ -160,7 +161,7 @@ public String payBack(HttpServletRequest request) throws IOException {
160161
*/
161162
@RequestMapping("query")
162163
public Map<String, Object> query(QueryOrder order) {
163-
return service.query(order.getTradeNo(), order.getOutTradeNo());
164+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
164165
}
165166

166167

@@ -172,7 +173,7 @@ public Map<String, Object> query(QueryOrder order) {
172173
*/
173174
@RequestMapping("close")
174175
public Map<String, Object> close(QueryOrder order) {
175-
return service.close(order.getTradeNo(), order.getOutTradeNo());
176+
return service.close(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
176177
}
177178

178179
/**

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,23 @@
22
package com.egzosn.pay.demo.controller;
33

44

5-
import com.egzosn.pay.common.api.PayService;
5+
import java.io.ByteArrayOutputStream;
6+
import java.io.IOException;
7+
import java.math.BigDecimal;
8+
import java.util.HashMap;
9+
import java.util.Map;
10+
import java.util.UUID;
11+
12+
import javax.imageio.ImageIO;
13+
import javax.servlet.http.HttpServletRequest;
14+
15+
import org.springframework.web.bind.annotation.RequestMapping;
16+
import org.springframework.web.bind.annotation.RestController;
17+
18+
import static com.egzosn.pay.union.bean.UnionTransactionType.WEB;
19+
20+
import com.egzosn.pay.common.bean.AssistOrder;
621
import com.egzosn.pay.common.bean.CertStoreType;
7-
import com.egzosn.pay.common.bean.MethodType;
822
import com.egzosn.pay.common.bean.PayOrder;
923
import com.egzosn.pay.common.bean.RefundOrder;
1024
import com.egzosn.pay.common.http.HttpConfigStorage;
@@ -17,21 +31,6 @@
1731
import com.egzosn.pay.union.bean.UnionTransactionType;
1832
import com.egzosn.pay.web.support.HttpRequestNoticeParams;
1933

20-
import org.springframework.web.bind.annotation.RequestMapping;
21-
import org.springframework.web.bind.annotation.RestController;
22-
23-
import javax.annotation.PostConstruct;
24-
import javax.imageio.ImageIO;
25-
import javax.servlet.http.HttpServletRequest;
26-
import java.io.ByteArrayOutputStream;
27-
import java.io.IOException;
28-
import java.math.BigDecimal;
29-
import java.util.HashMap;
30-
import java.util.Map;
31-
import java.util.UUID;
32-
33-
import static com.egzosn.pay.union.bean.UnionTransactionType.WEB;
34-
3534
/**
3635
* 银联相关
3736
*
@@ -271,7 +270,7 @@ public String payBack(HttpServletRequest request) {
271270
*/
272271
@RequestMapping("query")
273272
public Map<String, Object> query(QueryOrder order) {
274-
return service.query(order.getTradeNo(), order.getOutTradeNo());
273+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
275274
}
276275

277276

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public String payBack(HttpServletRequest request) {
303303
*/
304304
@RequestMapping("query")
305305
public Map<String, Object> query(QueryOrder order) {
306-
return service.query(order.getTradeNo(), order.getOutTradeNo());
306+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
307307
}
308308

309309

@@ -315,7 +315,7 @@ public Map<String, Object> query(QueryOrder order) {
315315
*/
316316
@RequestMapping("close")
317317
public Map<String, Object> close(QueryOrder order) {
318-
return service.close(order.getTradeNo(), order.getOutTradeNo());
318+
return service.close(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
319319
}
320320

321321
/**

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3CombinePayController.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
import org.springframework.web.bind.annotation.RequestMapping;
1616
import org.springframework.web.bind.annotation.RestController;
1717

18+
import com.egzosn.pay.common.bean.AssistOrder;
1819
import com.egzosn.pay.common.bean.CertStoreType;
1920
import com.egzosn.pay.common.bean.RefundOrder;
21+
import com.egzosn.pay.common.bean.RefundResult;
2022
import com.egzosn.pay.demo.request.QueryOrder;
2123
import com.egzosn.pay.demo.service.handler.WxV3CombinePayMessageHandler;
2224
import com.egzosn.pay.web.support.HttpRequestNoticeParams;
@@ -51,8 +53,8 @@ public void init() {
5153
wxPayConfigStorage.setMchId("1602947765");
5254
//V3密钥 https://pay.weixin.qq.com/wiki/doc/apiv3/wechatpay/wechatpay3_2.shtml
5355
wxPayConfigStorage.setV3ApiKey("9bd8f0e7af4841299d782406b7774f57");
54-
wxPayConfigStorage.setNotifyUrl("http://sailinmu.iok.la/wxV3/payBack.json");
55-
wxPayConfigStorage.setReturnUrl("http://sailinmu.iok.la/wxV3/payBack.json");
56+
wxPayConfigStorage.setNotifyUrl("http://sailinmu.iok.la/wxV3combine/payBack.json");
57+
wxPayConfigStorage.setReturnUrl("http://sailinmu.iok.la/wxV3combine/payBack.json");
5658
wxPayConfigStorage.setInputCharset("utf-8");
5759
//使用证书时设置为true
5860
wxPayConfigStorage.setCertSign(true);
@@ -93,7 +95,7 @@ public String toPay() {
9395
subOrder.setAmount(new CombineAmount(121));
9496
subOrder.setOutTradeNo("子单商户订单号 ");
9597
subOrder.setDescription("商品描述");
96-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
98+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
9799
subOrders.add(subOrder);
98100
order.setSubOrders(subOrders);
99101
order.setTransactionType(WxTransactionType.COMBINE_H5);
@@ -121,7 +123,7 @@ public Map jsapi() {
121123
subOrder.setAmount(new CombineAmount(111));
122124
subOrder.setOutTradeNo("子单商户订单号 ");
123125
subOrder.setDescription("商品描述");
124-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
126+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
125127
subOrders.add(subOrder);
126128
order.setSubOrders(subOrders);
127129
Map orderInfo = service.orderInfo(order);
@@ -150,7 +152,7 @@ public Map<String, Object> app() {
150152
subOrder.setAmount(new CombineAmount(211));
151153
subOrder.setOutTradeNo("子单商户订单号 ");
152154
subOrder.setDescription("商品描述");
153-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
155+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
154156
subOrders.add(subOrder);
155157
order.setSubOrders(subOrders);
156158
Map orderInfo = service.orderInfo(order);
@@ -179,7 +181,7 @@ public byte[] toWxQrPay() throws IOException {
179181
subOrder.setAmount(new CombineAmount(131));
180182
subOrder.setOutTradeNo("子单商户订单号 ");
181183
subOrder.setDescription("商品描述");
182-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
184+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
183185
subOrders.add(subOrder);
184186
order.setSubOrders(subOrders);
185187

@@ -210,7 +212,7 @@ public String getQrPay() {
210212
subOrder.setAmount(new CombineAmount(115));
211213
subOrder.setOutTradeNo("子单商户订单号 ");
212214
subOrder.setDescription("商品描述");
213-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
215+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
214216
subOrders.add(subOrder);
215217
order.setSubOrders(subOrders);
216218
//获取对应的支付账户操作工具（可根据账户id）
@@ -244,7 +246,7 @@ public String payBack(HttpServletRequest request) {
244246
*/
245247
@RequestMapping("query")
246248
public Map<String, Object> query(QueryOrder order) {
247-
return service.query(order.getTradeNo(), order.getOutTradeNo());
249+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
248250
}
249251

250252

@@ -262,7 +264,7 @@ public Map<String, Object> close() {
262264
CombineSubOrder subOrder = new CombineSubOrder();
263265
subOrder.setMchid("子单商户号");
264266
subOrder.setOutTradeNo("子单商户订单号 ");
265-
subOrder.setSubMchid("二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
267+
subOrder.setSubMchid("服务商必填----二级商户商户号，由微信支付生成并下发。服务商子商户的商户号，被合单方。直连商户不用传二级商户号。 ");
266268
subOrders.add(subOrder);
267269
order.setSubOrders(subOrders);
268270
return service.close(order);
@@ -275,7 +277,7 @@ public Map<String, Object> close() {
275277
* @return 返回支付方申请退款后的结果
276278
*/
277279
@RequestMapping("refund")
278-
public WxRefundResult refund(RefundOrder order) {
280+
public RefundResult refund(RefundOrder order) {
279281

280282
return service.refund(order);
281283
}

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3PayController.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
import org.springframework.web.bind.annotation.RequestMapping;
1717
import org.springframework.web.bind.annotation.RestController;
1818

19+
import com.egzosn.pay.common.bean.AssistOrder;
1920
import com.egzosn.pay.common.bean.CertStoreType;
2021
import com.egzosn.pay.common.bean.PayOrder;
2122
import com.egzosn.pay.common.bean.RefundOrder;
23+
import com.egzosn.pay.common.bean.RefundResult;
2224
import com.egzosn.pay.demo.request.QueryOrder;
2325
import com.egzosn.pay.demo.service.handler.WxV3PayMessageHandler;
2426
import com.egzosn.pay.web.support.HttpRequestNoticeParams;
@@ -178,7 +180,7 @@ public String payBack(HttpServletRequest request) {
178180
*/
179181
@RequestMapping("query")
180182
public Map<String, Object> query(QueryOrder order) {
181-
return service.query(order.getTradeNo(), order.getOutTradeNo());
183+
return service.query(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
182184
}
183185

184186

@@ -190,7 +192,7 @@ public Map<String, Object> query(QueryOrder order) {
190192
*/
191193
@RequestMapping("close")
192194
public Map<String, Object> close(QueryOrder order) {
193-
return service.close(order.getTradeNo(), order.getOutTradeNo());
195+
return service.close(new AssistOrder(order.getTradeNo(), order.getOutTradeNo()));
194196
}
195197

196198
/**
@@ -200,7 +202,7 @@ public Map<String, Object> close(QueryOrder order) {
200202
* @return 返回支付方申请退款后的结果
201203
*/
202204
@RequestMapping("refund")
203-
public WxRefundResult refund(RefundOrder order) {
205+
public RefundResult refund(RefundOrder order) {
204206

205207
return service.refund(order);
206208
}

‎pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/WxV3CombinePayMessageHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
import com.egzosn.pay.common.api.PayService;
1212
import com.egzosn.pay.common.bean.PayOutMessage;
1313
import com.egzosn.pay.common.exception.PayErrorException;
14-
import com.egzosn.pay.wx.v3.bean.combine.CombinePayMessage;
14+
import com.egzosn.pay.wx.v3.bean.sharing.ProfitSharingPayMessage;
1515

1616
/**
1717
* 微信合单支付回调处理器
1818
* Created by ZaoSheng on 2016/6/1.
1919
*/
20-
public class WxV3CombinePayMessageHandler implements PayMessageHandler<CombinePayMessage, PayService> {
20+
public class WxV3CombinePayMessageHandler implements PayMessageHandler<ProfitSharingPayMessage, PayService> {
2121

2222
private final Logger LOG = LoggerFactory.getLogger(DefaultPayMessageHandler.class);
2323

2424
@Override
25-
public PayOutMessage handle(CombinePayMessage payMessage, Map<String, Object> context, PayService payService) throws PayErrorException {
25+
public PayOutMessage handle(ProfitSharingPayMessage payMessage, Map<String, Object> context, PayService payService) throws PayErrorException {
2626
LOG.info("回调支付消息处理器，回调消息：{}", JSON.toJSONString(payMessage));
2727
return payService.successPayOutMessage(payMessage);
2828
}

0 commit comments

Comments
 (0)