Просмотр исходного кода

[刷卡支付][收银台]:刷卡支付成功

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
3b973b0efd
3 измененных файлов: 15 добавлений и 20 удалений
  1. +1
    -16
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +14
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

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

@@ -139,13 +139,7 @@ public class WxMicroPayController extends BaseController {

try {
ResultData resultData = wxPayOrderService.payOrderQuery(appInfo, record);
if (resultData.code == ErrorCode.PAY_ORDER_PAYING.getCode()) {
return resultData;
} else if (resultData.code == ErrorCode.PAY_ORDER_NOT_PAY.getCode()) {
return resultData;
} else if (resultData.code == ErrorCode.PAY_ORDER_ERROR.getCode()) {
return resultData;
}
return resultData;
} catch (MallinkException e) {
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
@@ -153,15 +147,6 @@ public class WxMicroPayController extends BaseController {
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage());
return new ResultData(ErrorCode.PAY_ORDER_QUERY_ERROR, e.getMessage());
}


WxPayOrder payOrder = wxPayOrderService.getById(payOrderId);
if (payOrder != null) {
return new ResultData(payOrder);
} else {
logger.error("payment wechat, order query error, req 4: payOrderId" + payOrderId);
return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND.getCode(), "支付订单未找到");
}
}

@ApiOperation(value = "撤销刷卡支付订单", notes = "{\"payOrderId\":\"String\",\"orderId\":\"String\"}")


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

@@ -649,7 +649,6 @@ public class WxOrderServiceImpl implements WxOrderService {
logger.error("成长值:" + e.getMessage());
}

//// TODO 支付发券
return ret;
}



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

@@ -650,6 +650,12 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
try {
if (StringUtils.isBlank(record.getPayOrderNo()))
record.setPayOrderNo(String.valueOf(record.getId()));

WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(record.getId());
if(payOrder != null) {
record.setPayOrderStatus(payOrder.getPayOrderStatus());
}

String response = wechatPayOrderQuery(appInfo, record);

logger.info("pay order query, " + record.toString() + ", response: " + response);
@@ -927,9 +933,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode());
order.setUpdateDate(new Date());
try {
wxPayOrderMapper.updateByPrimaryKeySelective(record);
wxOrderMapper.updateByPrimaryKeySelective(order);
} catch (Exception e) {
logger.error("pay order update error: " + record.toString());
logger.error("order update error: " + record.toString());
throw new MallinkException(ErrorCode.DB_FAIL);
}
return new ResultData(Result.SUCCESS, "订单撤销成功", returnMap);
@@ -1171,6 +1177,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
try {
record.setUpdateTime(currentDate);
record.setTransactionId(transactionId);
record.setFailReason("");
wxPayOrderMapper.updateByPrimaryKeySelective(record);
} catch (Exception e) {
logger.error(e.getMessage());
@@ -1212,9 +1219,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
WxPayOrder updateOrder = new WxPayOrder();
updateOrder.setId(record.getId());
updateOrder.setOrderId(record.getOrderId());
updateOrder.setcUserId(userQ.getId());
updateOrder.setUpdateTime(currentDate);
updateOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
updateOrder.setTransactionId(transactionId);
updateOrder.setFailReason("");
try {
wxPayOrderMapper.updateByPrimaryKeySelective(updateOrder);
} catch (Exception e) {
@@ -1223,7 +1232,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
}

// 修改订单状态
order.setCUserId(user1.getId());
order.setCUserId(userQ.getId());
try {
int _count = wxOrderService.microPayOrderSuccess(order);
if (_count > 1) {
@@ -1234,6 +1243,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新");
}

// TODO 支付发券

/*
Map<String, String> msgMap = new HashMap<>();
try {


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