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

[支付打印][刷卡支付]

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
9300a12672
3 измененных файлов: 16 добавлений и 12 удалений
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  3. +12
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

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

@@ -74,8 +74,9 @@ public interface WxCouponOrderService {


/** /**
* B端刷卡支付发券 * B端刷卡支付发券
* @param order
* @param bUser
* @param tenantId
* @param orderId
* @param cUserId
*/ */
boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId); boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId);




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

@@ -104,6 +104,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
if (page.getSize() > 0) { if (page.getSize() > 0) {
WxMallConfig config = page.getList().get(0); WxMallConfig config = page.getList().get(0);
if (config.getValue() == EnumEnableType.Disable.getCode()) { if (config.getValue() == EnumEnableType.Disable.getCode()) {
logger.info(configKey + ": disabled ");
return false; return false;
} }
} }


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

@@ -1284,6 +1284,16 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新");
} }


// B端刷卡支付发券
logger.info("订单刷卡发券 开始");
try {
wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getcUserId());
} catch (Exception e) {
logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId());
logger.error("订单刷卡发券失败: " +e.getMessage());
}
logger.info("订单刷卡发券 结束");

// 延迟3秒后分账 // 延迟3秒后分账
new Thread(() -> { new Thread(() -> {
String tenantId = record.getTenantId(); String tenantId = record.getTenantId();
@@ -1296,23 +1306,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }


// 支付分账 // 支付分账
logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId);
try { try {
wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId);
logger.info("订单分账: orderId: {}, payOrderId: {}", orderId, payOrderId);
} catch (Exception e) { } catch (Exception e) {
logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId);
logger.error("订单分账失败: " +e.getMessage()); logger.error("订单分账失败: " +e.getMessage());
} }
logger.info("订单分账结束: orderId: {}, payOrderId: {}", orderId, payOrderId);
}).start(); }).start();


// B端刷卡支付发券
try {
wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getcUserId());
} catch (Exception e) {
logger.error("订单刷卡失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId());
logger.error("订单刷卡失败: " +e.getMessage());
}
} }


@Override @Override


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