diff --git a/pom.xml b/pom.xml index 5ccf92d..ccb267f 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,11 @@ 3.1.3 + org.mybatis + mybatis + 3.5.13 + + org.springframework.boot spring-boot-devtools runtime diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index 03172a5..309ab82 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -1,5 +1,6 @@ package com.example.demo; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/RechargeController.java index 52e751e..839f099 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/RechargeController.java @@ -2,6 +2,7 @@ package com.example.demo.controller; import com.example.demo.domain.entity.Recharge; import com.example.demo.domain.vo.Page; +import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.Result; //import com.example.demo.controller.KafkaProducer; import com.example.demo.sevice.RechargeService; @@ -110,4 +111,10 @@ public class RechargeController { return Result.success(rechargeService.searchForPage(page.getPageNum(), page.getPageSize(), page.getRechargeVo())); } } + + @PostMapping("/RechargeA") + public Result searchRechargeA(@RequestBody RechargeA rechargeA) { + List result = rechargeService.getRechargeA(rechargeA.getFlags()); + return Result.success(result); + } } diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java index 4d28055..6481863 100644 --- a/src/main/java/com/example/demo/domain/entity/DetailY.java +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -9,6 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @Data @NoArgsConstructor @@ -51,7 +52,7 @@ public class DetailY implements Serializable { private String orderCode; private Integer refundFlag; - private String updateTypes; + private List updateTypes; // @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") // @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -72,4 +73,7 @@ public class DetailY implements Serializable { private BigDecimal sumR; private BigDecimal sumF; private BigDecimal sumT; + + private String sortField; + private String sortOrder; } diff --git a/src/main/java/com/example/demo/domain/vo/RechargeA.java b/src/main/java/com/example/demo/domain/vo/RechargeA.java new file mode 100644 index 0000000..f29325c --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/RechargeA.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RechargeA { + private Integer Raudit; + private BigDecimal SumRaudit; + private BigDecimal SumRaudit1; + private BigDecimal SumRaudit2; + + private String flag; + + private String flags; + private String token; +} diff --git a/src/main/java/com/example/demo/domain/vo/ResultA.java b/src/main/java/com/example/demo/domain/vo/ResultA.java new file mode 100644 index 0000000..59e8022 --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/ResultA.java @@ -0,0 +1,25 @@ +package com.example.demo.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResultA { + private Integer Rresult; + private Integer Yresult; + private Integer Nresult; + private BigDecimal SumRresult; + private BigDecimal SumYresult; + private BigDecimal SumNresult; + private BigDecimal SumRresult1; + private BigDecimal SumYresult1; + private BigDecimal SumNresult1; + private BigDecimal SumRresult2; + private BigDecimal SumYresult2; + private BigDecimal SumNresult2; +} diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index 062821a..399d6fe 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -58,7 +58,17 @@ public interface ConsumeMapper { "and detail_y.consume_type= #{consumeType}", "AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}", "", + + "", + " ", + " ", + " ORDER BY ${sortField} ${sortOrder}", + " ", + " ", + " ", "ORDER BY detail_y.create_time DESC", + " ", + "", "" }) List select(ConsumeDetail consumeDetail); diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index d766ac3..9bc9565 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java @@ -49,34 +49,53 @@ public interface DetailYMapper { "", "GROUP BY", "user_gold.jwcode", - "ORDER BY ", - "Rcoin DESC", + + "", + " ", + " ", + " ORDER BY ${sortField} ${sortOrder}", + " ", + " ", + " ", + "ORDER BY ", + "Rcoin DESC", + " ", + "", "" }) List selectgold(DetailYgold detailYgold); - @Select({ - "" - - }) +// @Select({ +// "" +// +// }) List select(DetailY detailY); @Select({ diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java index 6d5f895..ef5f71b 100644 --- a/src/main/java/com/example/demo/mapper/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java @@ -2,6 +2,7 @@ package com.example.demo.mapper; import com.example.demo.domain.entity.Recharge; +import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.RechargeVo; import org.apache.ibatis.annotations.*; @@ -10,6 +11,8 @@ import java.util.List; @Mapper public interface RechargeMapper { + List getRechargeA(@Param("flags") List flags); + @Insert({ "INSERT INTO recharge", "(jwcode,order_code,activity_id,paid_gold,free_gold,recharge_gold,pay_way,recharge_way,recharge_time,recharge_voucher,admin_id,remark,flag,admin_name)", @@ -65,7 +68,17 @@ public interface RechargeMapper { "and user.area=#{area}", "and audit.status=#{status}", "", + "", + " ", + " ", + " ORDER BY ${sortField} ${sortOrder}", + " ", + " ", + " ", "ORDER BY recharge.create_time DESC", + " ", + "", + "" }) List select(RechargeVo rechargeVo); @@ -73,4 +86,5 @@ public interface RechargeMapper { @Select({"select count(*) from detail", "where jwcode=#{jwcode} and update_type='0'"}) int getAllByjwAndup(String jwcode); + } diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java index 89f96f8..1b04fe9 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/RefundMapper.java @@ -90,7 +90,17 @@ public interface RefundMapper { "AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')", "AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')", "AND d.create_time BETWEEN #{startDate} AND #{endDate}", + + "", + " ", + " ", + " ORDER BY ${sortField} ${sortOrder}", + " ", + " ", + " ", "ORDER BY d.create_time DESC", + " ", + "", "" }) List select(Detail detail); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index ab9060c..a140eb8 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -4,6 +4,7 @@ import com.example.demo.domain.entity.Audit; import com.example.demo.domain.entity.Detail; import com.example.demo.domain.entity.Recharge; import com.example.demo.domain.entity.User; +import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.RechargeVo; import com.example.demo.domain.vo.Result; import com.example.demo.mapper.AuditMapper; @@ -25,8 +26,10 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDate; import java.time.Month; +import java.util.Arrays; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; @Transactional @Service @@ -200,5 +203,15 @@ public class RechargeServiceImpl implements RechargeService { return Result.error("批量添加失败: " + e.getMessage()); } } + + @Override + public List getRechargeA(String flags) { + List flagList = Arrays.stream(flags.split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + return rechargeMapper.getRechargeA(flagList); } + +} + diff --git a/src/main/java/com/example/demo/sevice/RechargeService.java b/src/main/java/com/example/demo/sevice/RechargeService.java index 53fdbe2..8cb81f0 100644 --- a/src/main/java/com/example/demo/sevice/RechargeService.java +++ b/src/main/java/com/example/demo/sevice/RechargeService.java @@ -2,6 +2,7 @@ package com.example.demo.sevice; import com.example.demo.domain.entity.Recharge; +import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.RechargeVo; import com.example.demo.domain.vo.Result; import com.github.pagehelper.PageInfo; @@ -26,4 +27,6 @@ public interface RechargeService { * @return 处理结果 */ Result addRecharges(List recharges); + + List getRechargeA(String flags); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8a546a6..6a97cd7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,6 +52,7 @@ spring: mybatis: + mapper-locations: classpath*:mapper/*.xml configuration: map-underscore-to-camel-case: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml new file mode 100644 index 0000000..b6648f9 --- /dev/null +++ b/src/main/resources/mapper/AuditMapper.xml @@ -0,0 +1,5 @@ + + + diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml new file mode 100644 index 0000000..db7db2a --- /dev/null +++ b/src/main/resources/mapper/DetailYMapper.xml @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml new file mode 100644 index 0000000..d3092dc --- /dev/null +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file