diff --git a/src/main/java/com/example/demo/controller/OneController.java b/src/main/java/com/example/demo/controller/OneController.java new file mode 100644 index 0000000..7f6a5ac --- /dev/null +++ b/src/main/java/com/example/demo/controller/OneController.java @@ -0,0 +1,34 @@ +package com.example.demo.controller; + + +import com.example.demo.domain.work.One; +import com.example.demo.domain.work.Three; +import com.example.demo.domain.work.Two; +import com.example.demo.sevice.OneService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/One") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class OneController { + private final OneService oneService; + @PostMapping("/getOne") + public One getOne() throws Exception { + return oneService.getOne(); + } + @PostMapping("/getTwo") + public Two getTwo() throws Exception { + return oneService.getTwo(); + } + @PostMapping("/getThree") + public Three getThree() throws Exception { + return oneService.getThree(); + } +} diff --git a/src/main/java/com/example/demo/domain/work/One.java b/src/main/java/com/example/demo/domain/work/One.java new file mode 100644 index 0000000..28a5ea4 --- /dev/null +++ b/src/main/java/com/example/demo/domain/work/One.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.work; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class One { + private String token ; + private BigDecimal sumgold ; + private BigDecimal differr ; + private BigDecimal rechargegold ; + private BigDecimal freegold ; + private BigDecimal taskgold ; + private BigDecimal sfreegold; + private BigDecimal dfreegold; + +} diff --git a/src/main/java/com/example/demo/domain/work/Three.java b/src/main/java/com/example/demo/domain/work/Three.java new file mode 100644 index 0000000..af3a095 --- /dev/null +++ b/src/main/java/com/example/demo/domain/work/Three.java @@ -0,0 +1,19 @@ +package com.example.demo.domain.work; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Three { + private BigDecimal consumeCoin; + private BigDecimal consumeGold; + private BigDecimal refundCoin; + private BigDecimal yestdayCoin; + private BigDecimal yestdayGold; + private BigDecimal yestdayrefund; +} diff --git a/src/main/java/com/example/demo/domain/work/Two.java b/src/main/java/com/example/demo/domain/work/Two.java new file mode 100644 index 0000000..0d40c7d --- /dev/null +++ b/src/main/java/com/example/demo/domain/work/Two.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.work; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Two { + private BigDecimal totalgold; + private BigDecimal totalcoin; + private BigDecimal yesterdaytotal; + private BigDecimal yesterdayrecharge; +} diff --git a/src/main/java/com/example/demo/mapper/OneMapper.java b/src/main/java/com/example/demo/mapper/OneMapper.java new file mode 100644 index 0000000..2dcb207 --- /dev/null +++ b/src/main/java/com/example/demo/mapper/OneMapper.java @@ -0,0 +1,14 @@ +package com.example.demo.mapper; + + +import com.example.demo.domain.work.One; +import com.example.demo.domain.work.Three; +import com.example.demo.domain.work.Two; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OneMapper { + One getOne() throws Exception; + Two getTwo() throws Exception; + Three getThree() throws Exception; +} diff --git a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java new file mode 100644 index 0000000..6c17d3e --- /dev/null +++ b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java @@ -0,0 +1,29 @@ +package com.example.demo.serviceImpl; + +import com.example.demo.domain.work.One; +import com.example.demo.domain.work.Three; +import com.example.demo.domain.work.Two; +import com.example.demo.mapper.OneMapper; +import com.example.demo.sevice.OneService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class OneServiceImpl implements OneService { + @Autowired + private OneMapper oneMapper; + @Override + public One getOne() throws Exception { + return oneMapper.getOne(); + } + + @Override + public Two getTwo() throws Exception { + return oneMapper.getTwo(); + } + + @Override + public Three getThree() throws Exception { + return oneMapper.getThree(); + } +} diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 8b84836..c0dbb92 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -6,6 +6,7 @@ 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.RefundA; import com.example.demo.domain.vo.Result; import com.example.demo.mapper.AuditMapper; import com.example.demo.mapper.DetailMapper; @@ -178,7 +179,26 @@ public class RechargeServiceImpl implements RechargeService { @Override public List getRechargeA(RechargeA rechargeA) { - return rechargeMapper.getRechargeA(rechargeA); + List result = rechargeMapper.getRechargeA(rechargeA); + + // 定义完整的分类列表 + List fullStatuses = Arrays.asList("待审核", "已通过", "已驳回"); + + // 遍历分类列表,检查哪些分类在查询结果中缺失,并为其补充默认值 + for (String flag : fullStatuses) { + boolean categoryExists = result.stream() + .anyMatch(recharge -> flag.equals(recharge.getFlag())); + + if (!categoryExists) { + // 如果分类缺失,补充默认值 + RechargeA defaultRecharge = new RechargeA(); + defaultRecharge.setFlag(flag); +// defaultRecharge.setAmount(BigDecimal.ZERO); // 默认值为 0 + result.add(defaultRecharge); + } + } + + return result; } diff --git a/src/main/java/com/example/demo/sevice/OneService.java b/src/main/java/com/example/demo/sevice/OneService.java new file mode 100644 index 0000000..152a803 --- /dev/null +++ b/src/main/java/com/example/demo/sevice/OneService.java @@ -0,0 +1,11 @@ +package com.example.demo.sevice; + +import com.example.demo.domain.work.One; +import com.example.demo.domain.work.Three; +import com.example.demo.domain.work.Two; + +public interface OneService { + One getOne() throws Exception; + Two getTwo() throws Exception; + Three getThree() throws Exception; +} diff --git a/src/main/resources/mapper/OneMapper.xml b/src/main/resources/mapper/OneMapper.xml new file mode 100644 index 0000000..cd23ba1 --- /dev/null +++ b/src/main/resources/mapper/OneMapper.xml @@ -0,0 +1,63 @@ + + + + + + + \ No newline at end of file