diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java index bf7aea60..a8a1369a 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeDepositServiceImpl.java @@ -203,7 +203,7 @@ public class PayConsumeDepositServiceImpl extends BaseServiceImpl tradeQueryWrapper = new QueryWrapper<>(); tradeQueryWrapper.eq("order_id", order_id); PayConsumeTrade trade_row_tmp = payConsumeTradeService.findOne(tradeQueryWrapper); - // 固定死, 是门店收银还是店铺收银。, 统一店铺收银 - payment_store_id = trade_row_tmp.getStore_id(); + if(trade_row_tmp!=null) { + payment_store_id = trade_row_tmp.getStore_id(); + orderSubject = trade_row_tmp.getTrade_title(); + } } QueryWrapper channelQueryWrapper = new QueryWrapper<>(); @@ -1306,6 +1309,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl