| @@ -11,6 +11,7 @@ import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| @@ -1427,7 +1428,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } else { | } else { | ||||
| // 延迟10秒后分账 | // 延迟10秒后分账 | ||||
| new Thread(() -> { | new Thread(() -> { | ||||
| String tenantId = record.getTenantId(); | |||||
| TenantEntity tenantEntity = record; | |||||
| Long orderId = record.getOrderId(); | Long orderId = record.getOrderId(); | ||||
| Long payOrderId = record.getId(); | Long payOrderId = record.getId(); | ||||
| try { | try { | ||||
| @@ -1437,14 +1438,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| // 支付分账 | // 支付分账 | ||||
| logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| logger.info("收银台订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| try { | try { | ||||
| wxOrderService.shareForMicroPay(order, orderId, payOrderId); | |||||
| wxOrderService.shareForMicroPay(tenantEntity, orderId, payOrderId); | |||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| logger.error("订单分账失败: " + e.getMessage()); | |||||
| logger.error("收银台订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| logger.error("收银台订单分账失败: " + e.getMessage()); | |||||
| } | } | ||||
| logger.info("订单分账结束: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| logger.info("收银台订单分账结束: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| }).start(); | }).start(); | ||||
| } | } | ||||
| } | } | ||||
| @@ -1523,7 +1524,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| merchantSubsidy.setId(idWorker.nextId()); | merchantSubsidy.setId(idWorker.nextId()); | ||||
| merchantSubsidy.setTenantId(record.getTenantId()); | merchantSubsidy.setTenantId(record.getTenantId()); | ||||
| merchantSubsidy.setOrderId(record.getOrderId()); | merchantSubsidy.setOrderId(record.getOrderId()); | ||||
| merchantSubsidy.setOrderType(EnumOrderType.NATIVEPAY.getCode()); | |||||
| merchantSubsidy.setOrderType(EnumOrderType.MICROPAY.getCode()); | |||||
| WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId()); | WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId()); | ||||
| merchantSubsidy.setMerchantId(wxMerchantBUser.getMerchantId()); | merchantSubsidy.setMerchantId(wxMerchantBUser.getMerchantId()); | ||||
| merchantSubsidy.setCouponOrderId(0L); | merchantSubsidy.setCouponOrderId(0L); | ||||