|
|
@@ -110,10 +110,10 @@ public class WxMicroPayController extends BaseController { |
|
|
try { |
|
|
try { |
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@@ -166,10 +166,10 @@ public class WxMicroPayController extends BaseController { |
|
|
ResultData resultData = wxPayOrderService.payOrderQuery(user, record, payWay); |
|
|
ResultData resultData = wxPayOrderService.payOrderQuery(user, record, payWay); |
|
|
return resultData; |
|
|
return resultData; |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_QUERY_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_QUERY_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@@ -215,13 +215,15 @@ public class WxMicroPayController extends BaseController { |
|
|
record.setBUserId(getUser().getId()); |
|
|
record.setBUserId(getUser().getId()); |
|
|
record.setOrderId(orderId); |
|
|
record.setOrderId(orderId); |
|
|
|
|
|
|
|
|
|
|
|
WxPayOrder po = wxPayOrderService.getById(payOrderId); |
|
|
|
|
|
record.setPayVendor(po.getPayVendor()); |
|
|
try { |
|
|
try { |
|
|
return wxPayOrderService.payOrderReverse(record); |
|
|
return wxPayOrderService.payOrderReverse(record); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@@ -342,10 +344,10 @@ public class WxMicroPayController extends BaseController { |
|
|
|
|
|
|
|
|
order = wxOrderService.saveMicroPayOrderV2(user, cUser, payment); |
|
|
order = wxOrderService.saveMicroPayOrderV2(user, cUser, payment); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("saveMicopayOrder 1" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("saveMicopayOrder 1" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("saveMicopayOrder 2" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("saveMicopayOrder 2" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage()); |
|
|
return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -448,10 +450,10 @@ public class WxMicroPayController extends BaseController { |
|
|
updateOrder.setPayment(remainPrice); |
|
|
updateOrder.setPayment(remainPrice); |
|
|
wxOrderService.saveOrUpdate(updateOrder); |
|
|
wxOrderService.saveOrUpdate(updateOrder); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("核销异常: " + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("核销异常: " + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("核销异常: " + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("核销异常: " + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@@ -477,10 +479,10 @@ public class WxMicroPayController extends BaseController { |
|
|
try { |
|
|
try { |
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
@@ -492,10 +494,10 @@ public class WxMicroPayController extends BaseController { |
|
|
map.put("end", "1"); |
|
|
map.put("end", "1"); |
|
|
return new ResultData(map); |
|
|
return new ResultData(map); |
|
|
} catch (MallinkException e) { |
|
|
} catch (MallinkException e) { |
|
|
logger.error("payment wechat, order create error, req 2: " + couponPayOrder.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 2: " + couponPayOrder.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("payment wechat, order create error, req 3: " + couponPayOrder.toString() + ", e:" + e.getMessage()); |
|
|
|
|
|
|
|
|
logger.error("payment wechat, order create error, req 3: " + couponPayOrder.toString() + ", e:" + e.getMessage(),e); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|