xiaohanzi 5 лет назад
Родитель
Сommit
b4ccc2df65
2 измененных файлов: 20 добавлений и 12 удалений
  1. +18
    -11
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 18
- 11
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Просмотреть файл

@@ -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 {


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Просмотреть файл

@@ -650,6 +650,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
if (result.isSuccess()) {
record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode());
record.setUpdateTime(new Date());
record.setFailReason("");
try {
wxPayOrderMapper.updateById(record);
} catch (Exception e) {
@@ -666,7 +667,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
try {
verifyPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper<>(verifyPayOrderQ));
} catch (Exception e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
}
if (verifyPayOrder != null) {
verifyPayOrderQ = new WxPayOrder();


Загрузка…
Отмена
Сохранить