diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index a3b192c..4a0be2e 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -5,6 +5,7 @@ import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.cash.CashRecordDone; import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.cash.CashRefundMapper; +import com.example.demo.service.cash.MarketService; import com.example.demo.service.cash.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -28,10 +29,13 @@ public class CashRefundServiceImpl implements RefundService { @Autowired private CashRefundMapper cashRefundMapper; + @Autowired + private MarketService marketService; @Override public PageInfo select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) { PageHelper.startPage(pageNum, pageSize); // System.out.println(goldDetail.getMarkets()); + cashRecordDone.setMarket(String.valueOf(marketService.getMarketById(Integer.valueOf(cashRecordDone.getMarket())))); List list = cashRefundMapper.select(cashRecordDone); return new PageInfo<>(list); } diff --git a/src/main/resources/cashMapper/CashRecordMapper.xml b/src/main/resources/cashMapper/CashRecordMapper.xml deleted file mode 100644 index 3a018e2..0000000 --- a/src/main/resources/cashMapper/CashRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 6aaa514..ff7bcd0 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -81,11 +81,11 @@ update cash_record set status = 11 - where order_code =2 and id = #{id} + where order_type =2 and id = #{id} update cash_record set status = #{status},executor = #{executor},reject_reason = #{rejectReason} - where order_code =2 and id = #{id} + where order_type =2 and id = #{id} update cash_record set refund_currency = #{refundCurrency}, @@ -95,7 +95,7 @@ refund_remark = #{refundRemark}, refund_voucher = #{refundVoucher}, status = #{status} - where order_code =2 and id = #{id} + where order_type =2 and id = #{id}