|
|
@@ -262,7 +262,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
rpr.setRecordId(rr.getId());
|
|
|
rpr.setUserId(rr.getUserId());
|
|
|
rpr.setPayNo(result.getNonce_str());
|
|
|
- System.out.println("回调的金额:"+result.getTotal_fee());
|
|
|
+ System.out.println("回调的金额:" + result.getTotal_fee());
|
|
|
rpr.setPayPrice(new BigDecimal(result.getTotal_fee()).divide(new BigDecimal("100")).setScale(2));
|
|
|
rpr.setIsSuccess(ePayStatu.Paysuccess.getValue());
|
|
|
rpr.setRemark("微信支付支付成功");
|
|
|
@@ -274,8 +274,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
}
|
|
|
} else if (rpr.getIsSuccess() != ePayStatu.Paysuccess.getValue()) {
|
|
|
rpr.setPayNo(result.getNonce_str());
|
|
|
- System.out.println("回调的金额:"+result.getTotal_fee());
|
|
|
- rpr.setPayPrice(new BigDecimal(result.getTotal_fee()).divide(new BigDecimal("100")).setScale(2));
|
|
|
+ System.out.println("回调的金额:" + result.getTotal_fee());
|
|
|
+ rpr.setPayPrice(new BigDecimal(result.getTotal_fee()).divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
rpr.setIsSuccess(ePayStatu.Paysuccess.getValue());
|
|
|
rpr.setRemark(rpr.getRemark() + "微信支付支付成功");
|
|
|
int updateRpr = repairPayRecordService.updateRepairPayRecord(rpr);
|
|
|
@@ -299,7 +299,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
RepairTrackRecord rtr = new RepairTrackRecord();
|
|
|
rtr.setRecordId(rr.getId());
|
|
|
rtr.setMaintenanceState(eRecordStatu.Maintenance.getValue());
|
|
|
- rtr.setContent("订单支付:"+rpr.getPayPrice().toString());
|
|
|
+ rtr.setContent("订单支付:" + rpr.getPayPrice().toString());
|
|
|
rtr.setUserId(rr.getUserId());
|
|
|
rtr.setUserZzstr("用户");
|
|
|
int insertRtr = repairTrackRecordService.insertRepairTrackRecord(rtr);
|
|
|
@@ -317,7 +317,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("支付回调失败错误信息:" + e.getMessage());
|
|
|
throw new Exception("支付回调失败!");
|
|
|
}
|
|
|
}
|
|
|
@@ -3877,7 +3877,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
|
|
|
//查询用户的微校卡号
|
|
|
RepairUser user = repairUserService.getRepairById(recordData.getUserId());
|
|
|
- if(user == null){
|
|
|
+ if (user == null) {
|
|
|
throw new Exception("关单失败");
|
|
|
}
|
|
|
List<String> cardNumber = new ArrayList<>();
|
|
|
@@ -3967,7 +3967,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
|
|
|
}
|
|
|
|
|
|
RepairUser user = repairUserService.getRepairById(recordData.getUserId());
|
|
|
- if(user == null){
|
|
|
+ if (user == null) {
|
|
|
throw new Exception("关单失败");
|
|
|
}
|
|
|
List<String> cardNumber = new ArrayList<>();
|