|
|
@@ -110,8 +110,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = {Exception.class})
|
|
|
public CommonResult pay(WxPayRequest wpr, BindingResult bindingResult) throws Exception {
|
|
|
- System.out.println("进入微信支付====");
|
|
|
- System.out.println("微信支付参数====：" + JSON.toJSON(wpr));
|
|
|
+ System.out.println(TimeExchange.getTime() + "进入微信支付====");
|
|
|
+ System.out.println(TimeExchange.getTime() + "微信支付参数====：" + JSON.toJSON(wpr));
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
String st = paramUtils.getParamError(bindingResult);
|
|
|
return CommonResult.fail(st);
|
|
|
@@ -133,6 +133,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
+ System.out.println(TimeExchange.getTime() + "微信支付判断全部通过");
|
|
|
//返回0表示等于0，返回1表示大于0，返回-1表示小于0
|
|
|
if (wpr.getTotalPrice().compareTo(BigDecimal.ZERO) < 0 || wpr.getTotalPrice().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
if (oldRpr == null) {
|
|
|
@@ -195,8 +196,11 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
String Sign = WxUtil.getSign(params, wxOpenidConfig.getShsecret());//参数 + 商户密钥
|
|
|
params.put("sign", Sign);
|
|
|
String retXml = WxUtil.getRequestXml(params);
|
|
|
+ System.out.println(TimeExchange.getTime() + "微信支付提交的参数：" + retXml);
|
|
|
+
|
|
|
String msg = HttpUtils.post("https://api.mch.weixin.qq.com/pay/unifiedorder", retXml);
|
|
|
- System.out.println(msg);
|
|
|
+
|
|
|
+ System.out.println(TimeExchange.getTime() + "微信返回的信息：" + msg);
|
|
|
|
|
|
// 支付失败
|
|
|
if (msg.indexOf("FAIL") > -1) {
|
|
|
@@ -239,7 +243,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
@Transactional(rollbackFor = {Exception.class})
|
|
|
@PassToken
|
|
|
public void returnPay(HttpServletRequest request, HttpServletResponse response) throws Exception {
|
|
|
- System.out.println("进入支付回调====");
|
|
|
+ System.out.println(TimeExchange.getTime() + "进入支付回调====");
|
|
|
try {
|
|
|
BufferedReader reader = null;// BufferedReader 字符输入流
|
|
|
reader = request.getReader();
|
|
|
@@ -253,11 +257,13 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
request.getReader().close();
|
|
|
JaxbUtil requestBinder = new JaxbUtil(PayResult.class, PayResult.class);
|
|
|
PayResult result = requestBinder.fromXml(xmlString);// Xml到Java，用fromXML()方法
|
|
|
+ System.out.println(TimeExchange.getTime() + "支付回调返回的参数：" + result);
|
|
|
String recordNo = result.getOut_trade_no();
|
|
|
- System.out.println("支付成功回调，维修单号：" + recordNo);
|
|
|
+ System.out.println(TimeExchange.getTime() + "支付成功回调，维修单号：" + recordNo);
|
|
|
RepairRecord rr = repairRecordService.queryRepairByRecordno(recordNo);
|
|
|
// 支付成功
|
|
|
if (result.getResult_code().equals("SUCCESS") && rr != null) {
|
|
|
+ System.out.println(TimeExchange.getTime() + "支付成功回调，维修单号：" + recordNo);
|
|
|
RepairPayRecord rpr = repairPayRecordService.getRepairPayByRecordId(rr.getId());
|
|
|
if (rpr == null) {
|
|
|
// 保存支付信息
|
|
|
@@ -313,6 +319,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
|
|
|
response.getWriter().write(returnMsg);// 发送成功消息返回给微信
|
|
|
} else {
|
|
|
+ System.out.println(TimeExchange.getTime() + "支付失败回调，维修单号：" + recordNo);
|
|
|
String returnMsg = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[MESSAGE]]></return_msg></xml>";
|
|
|
response.getWriter().write(returnMsg);// 发送消息返回给微信
|
|
|
throw new Exception("支付回调失败！");
|
|
|
@@ -320,7 +327,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
} catch (Exception e) {
|
|
|
String returnMsg = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[MESSAGE]]></return_msg></xml>";
|
|
|
response.getWriter().write(returnMsg);// 发送消息返回给微信
|
|
|
- System.out.println("支付回调失败错误信息：" + e.getMessage());
|
|
|
+ System.out.println(TimeExchange.getTime() + "支付回调失败错误信息：" + e.getMessage());
|
|
|
throw new Exception("支付回调失败！");
|
|
|
}
|
|
|
}
|
|
|
@@ -1264,7 +1271,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = {Exception.class})
|
|
|
public CommonResult receiveOrders(int recordId, int userId) throws Exception {
|
|
|
- System.out.println("待处理池接单，报修单ID：" + recordId+"，用户ID："+userId);
|
|
|
+ System.out.println("待处理池接单，报修单ID：" + recordId + "，用户ID：" + userId);
|
|
|
|
|
|
try {
|
|
|
Date nowDate = new Date();
|
|
|
@@ -1444,7 +1451,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
}
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
- System.out.println("待处理池接单失败1，异常信息："+e.getMessage());
|
|
|
+ System.out.println("待处理池接单失败1，异常信息：" + e.getMessage());
|
|
|
throw new Exception("抢单失败！");
|
|
|
}
|
|
|
|
夏文涛