diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index 5c35695..139d798 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -74,5 +74,5 @@ public class Detail implements Serializable { private String sortOrder; private List areas; - + private Boolean hasIndexMatch; } diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java index 86e554f..e2ada20 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/RefundMapper.java @@ -105,5 +105,11 @@ public interface RefundMapper { // "", // "" // }) + //查询退款商品 List select(Detail detail); + //检查product是否有type值 + boolean isIndexTypeExist(@Param("name") String name); + } + + diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java index e3fb481..da62e67 100644 --- a/src/main/java/com/example/demo/mapperLink/DouMapper.java +++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java @@ -9,6 +9,8 @@ import java.util.List; @Mapper public interface DouMapper { int add(Records Records); + //添加充值审核记录到审核表 + void addDouAudit(Records records); Member searchinfo(Searchinfo jwcode); Integer searchId(@Param("jwcode")String jwcode); List getYve(Yve yve); diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index 1c4d176..facd657 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -118,6 +118,12 @@ public class RefundServiceImpl implements RefundService { @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)") @Override public PageInfo searchForPage(Integer pageNum, Integer pageSize, Detail detail) { + // 如果 refundGoods 存在,则判断是否匹配 index 表中的 remark + if (detail.getRefundGoods() != null && !detail.getRefundGoods().trim().isEmpty()) { + boolean matchExists = refundMapper.isIndexTypeExist(detail.getRefundGoods()); + detail.setHasIndexMatch(matchExists); // 设置标志位 + } + PageHelper.startPage(pageNum, pageSize); List list = refundMapper.select(detail); return new PageInfo<>(list); @@ -152,4 +158,6 @@ public class RefundServiceImpl implements RefundService { return result; } + + } \ No newline at end of file diff --git a/src/main/java/com/example/demo/sevice/RefundService.java b/src/main/java/com/example/demo/sevice/RefundService.java index 209bf41..3b709de 100644 --- a/src/main/java/com/example/demo/sevice/RefundService.java +++ b/src/main/java/com/example/demo/sevice/RefundService.java @@ -23,4 +23,5 @@ public interface RefundService { PageInfo searchForPage(Integer pageNum, Integer pageSize, Detail detail); List getRefundA(RefundA refundA); + } diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index f84d14e..01cb596 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -83,8 +83,20 @@ AND d.refund_type LIKE CONCAT('%', #{refundType}, '%') - - AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%') + + + + + AND d.refund_goods IN ( + SELECT name FROM `index` + WHERE type = 1 AND remark = #{refundGoods} + ) + + + + AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%') + + AND d.create_time BETWEEN #{startDate} AND #{endDate} @@ -140,4 +152,11 @@ ORDER BY detaily_id DESC + + \ No newline at end of file diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index 3fdbb36..47d7476 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -8,6 +8,17 @@ insert into fx_yaoqing_records (uid,content,money,money_free,money_buy,time,type,data) values(#{uid},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1,#{data}) + + + insert into audit_records ( + nickname,jwcode,areas,data,content,money,money_free,money_buy,time,type) + values(#{nickname},{jwcode},#{areas},#{data},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1) + + + + + +