diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java index dccdb8f..64fbe17 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashAuditServiceImpl.java @@ -205,7 +205,7 @@ public class CashAuditServiceImpl implements CashAuditService { message1.setTitle("现金管理--收款处理(负责人)"); message1.setType(0); message1.setTypeId(order.getId()); - message1.setMarket(Integer.valueOf(order.getMarket())); + message1.setMarket(Integer.valueOf(order.getReceivedMarket())); String marketName1 = marketMapper.getMarketNameById(String.valueOf(message1.getMarket())); message1.setMarketName(marketName1); message1.setQueryId(86); @@ -219,7 +219,7 @@ public class CashAuditServiceImpl implements CashAuditService { message2.setTitle("现金管理--收款处理"); message2.setType(0); message2.setTypeId(order.getId()); - message2.setMarket(Integer.valueOf(order.getMarket())); + message2.setMarket(Integer.valueOf(order.getReceivedMarket())); String marketName2 = marketMapper.getMarketNameById(String.valueOf(message2.getMarket())); message2.setMarketName(marketName2); message2.setQueryId(74); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index b3d05df..5609f50 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -227,7 +227,7 @@ select crc.id,jwcode,name,market,ra.activity_name as activity, order_code,bank_code,goods_name,good_num,num_unit,permanent_gold,free_gold, payment_currency,payment_amount,pay_type,pay_time,crc.status,submitter_id, - voucher,remark,version + voucher,remark,version,received_market from cash_record_collection crc left join recharge_activity ra on ra.id = crc.activity where order_code=#{orderCode}