|
|
|
@@ -472,21 +472,28 @@ public class WxMicroPayController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则"); |
|
|
|
} |
|
|
|
|
|
|
|
WxPayOrder record = new WxPayOrder(); |
|
|
|
record.updateTenantInfo(user); |
|
|
|
record.setOrderId(microOrder.getId()); |
|
|
|
record.setCUserId(microOrder.getCUserId()); |
|
|
|
record.setAuthCode(authCode); |
|
|
|
record.setPayAmount(remainPrice); |
|
|
|
record.setIp(ipStr); |
|
|
|
|
|
|
|
// WxPayOrder record = new WxPayOrder(); |
|
|
|
// record.updateTenantInfo(user); |
|
|
|
// record.setOrderId(microOrder.getId()); |
|
|
|
// record.setCUserId(microOrder.getCUserId()); |
|
|
|
// record.setAuthCode(authCode); |
|
|
|
// record.setPayAmount(remainPrice); |
|
|
|
// record.setIp(ipStr); |
|
|
|
|
|
|
|
WxPayOrder qpo = new WxPayOrder(); |
|
|
|
qpo.setOrderId(microOrder.getId()); |
|
|
|
WxPayOrder po = wxPayOrderService.getByObj(qpo); |
|
|
|
if (null == po) { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
|
return wxPayOrderService.createMicroPayOrder(user, po, payWay, null); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
|
logger.error("payment wechat, order create error, req 2: " + po.toString() + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
|
logger.error("payment wechat, order create error, req 3: " + po.toString() + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
|