|
|
|
@@ -69,27 +69,30 @@ public class WxMicroPayController extends BaseController { |
|
|
|
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); |
|
|
|
String authCode = paramMap.get("authCode"); |
|
|
|
String totalFeeStr = paramMap.get("totalFee"); |
|
|
|
return saveMicopayOrder(authCode, totalFeeStr, EnumPayWay.PAY_WAY_WECHAT_MA, request); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isBlank(authCode)) { |
|
|
|
private ResultData saveMicopayOrder(String authCode,String totalFeeStr,EnumPayWay payWay,HttpServletRequest request) { |
|
|
|
if (StringUtils.isBlank(authCode)) { |
|
|
|
logger.error("authCode不能为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不能为空"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(totalFeeStr)) { |
|
|
|
logger.error("totalFee不能为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "totalFee不能为空"); |
|
|
|
} |
|
|
|
if (!checkAuthCode(authCode)) { |
|
|
|
logger.error("authCode不符合规则"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "authCode不符合规则"); |
|
|
|
} |
|
|
|
|
|
|
|
String ipStr = IPUtil.getIpAddr(request); |
|
|
|
if (StringUtils.isBlank(totalFeeStr)) { |
|
|
|
logger.error("totalFee不能为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "totalFee不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
String ipStr = IPUtil.getIpAddr(request); |
|
|
|
|
|
|
|
WxMerchantBUser user = getUser(); |
|
|
|
|
|
|
|
WxOrder order = null; |
|
|
|
try { |
|
|
|
order = wxOrderService.saveMicroPayOrder(user, totalFeeStr); |
|
|
|
order = wxOrderService.saveMicroPayOrder(user, totalFeeStr,payWay); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("saveMicopayOrder 1" + e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
@@ -104,9 +107,8 @@ public class WxMicroPayController extends BaseController { |
|
|
|
record.setAuthCode(authCode); |
|
|
|
record.setPayAmount(order.getPayment()); |
|
|
|
record.setIp(ipStr); |
|
|
|
|
|
|
|
try { |
|
|
|
return wxPayOrderService.createMicroPayOrder(user, record, EnumPayWay.PAY_WAY_WECHAT_MA, null); |
|
|
|
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
@@ -115,7 +117,8 @@ public class WxMicroPayController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "查询付款码支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}") |
|
|
|
@PostMapping("order_query") |
|
|
|
public ResultData queryMicopayOrder(@RequestBody Map<String, String> paramMap) { |
|
|
|
|