From 0af2fc99e7fd4925376776496f4784d5e12ca558 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:33:42 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 8891f9b..82dae7f 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -104,6 +104,9 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+ @Value("${wx.appletsAppid}")
+ private String appletsAppid;
+
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -886,10 +889,6 @@
order.setPayMoney(payMoney);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
-// this.updateById(order);
-
-
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
@@ -898,7 +897,7 @@
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
+ paymentOrder.setAppid(appletsAppid);
paymentOrder.setOpenid(appUser.getOpenid());
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
@@ -912,7 +911,7 @@
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -925,6 +924,24 @@
}
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ QueryOrder queryOrder = new QueryOrder();
+ /**
+ * 原请求订单号(必填) 字段长度最长：32位
+ */
+ queryOrder.setOriginalMerOrderId("202108310351001");
+ /**
+ * 1：支付查询 2：退款查询 3：确认收货查询 4：结算查询 5：充值查询 6：转账查询 7：异步分账查询(必填) 字段长度最长：1位
+ */
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ }
+ }).start();
+
return ResultUtil.success(payCode);
}
@@ -1055,7 +1072,7 @@
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
@@ -1074,7 +1091,7 @@
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -1256,7 +1273,7 @@
complete.setSplitList(splitList);
TrhRequest<Complete> request = new TrhRequest();
InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -1315,7 +1332,7 @@
TrhRequest<Transfer> request1 = new TrhRequest();
InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
- if(!"0000".equals(execute1.getResult())){
+ if(!"0000".equals(execute1.getCode())){
return ResultUtil.error(execute1.getMsg());
}
JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
--
Gitblit v1.7.1