diff --git a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java index cce9b94..fb6e75b 100644 --- a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java +++ b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java @@ -52,10 +52,12 @@ public interface AuditMapper { "inner join `admin` on detail.admin_id = `admin`.admin_id", "inner join `user` on detail.jwcode = user.jwcode", "", + "and activity_id=#{activityId}", "and recharge.admin_id=#{adminId}", - "AND recharge.create_time BETWEEN #{startDate} AND #{endDate}", - "and recharge_way like concat('%',#{rechargeWay},'%')", + "AND detail.create_time BETWEEN #{startDate} AND #{endDate}", + "and refund_goods like concat('%',#{refundGoods},'%')", + "and refund_type like concat('%',#{refundType},'%')", "and area like concat('%',#{area},'%')", "and audit.status=#{status}", "", diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java index c3aa633..91703a9 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Detail.java @@ -35,4 +35,6 @@ public class Detail { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + private Date endDate; + private Date startDate; } diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Product.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Product.java new file mode 100644 index 0000000..b19888e --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Product.java @@ -0,0 +1,22 @@ +package com.example.commons.domain.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@NoArgsConstructor +public class Product { + private int productId; + private BigDecimal price; + private String name; + private Date listed_time; + private Date down_time; + private String remark; + private String subjects; + private String type; + private String productFlag; + private String createTime; +} diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java index 32b5fe4..4cb4e40 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Rate.java @@ -1,7 +1,9 @@ package com.example.commons.domain.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +15,8 @@ public class Rate { private Date endTime; private String currency; private String exchangeRate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; private Date updateTime; private Integer adminId; diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java index 3e79300..30e4298 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java +++ b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java @@ -9,6 +9,8 @@ import java.util.Date; @Data @NoArgsConstructor public class ConsumeDetail { + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Integer detailId; private String name; private String jwcode; @@ -29,11 +31,11 @@ public class ConsumeDetail { private Integer status; private String updateType; private Integer detailFlag; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; private Integer adminId; private String reson; private String user; + private Date startDate; + private Date endDate; } diff --git a/demo/commons/src/main/java/com/example/commons/sevice/ProductService.java b/demo/commons/src/main/java/com/example/commons/sevice/ProductService.java new file mode 100644 index 0000000..b6b9c16 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/sevice/ProductService.java @@ -0,0 +1,5 @@ +package com.example.commons.sevice; + +public interface ProductService { + +} diff --git a/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java b/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java index c0a7999..93e467c 100644 --- a/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java +++ b/demo/commons/src/main/java/com/example/commons/sevice/UserSevice.java @@ -7,7 +7,7 @@ import com.github.pagehelper.PageInfo; import java.util.List; public interface UserSevice { - List search(User user) ; + List search(User user) throws Exception; PageInfo searchForPage(Integer pageNum, Integer pageSize, User User); } diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java b/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java index 0da448d..011284b 100644 --- a/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java +++ b/demo/recharge/src/main/java/com/example/recharge/controller/ActivityController.java @@ -60,7 +60,7 @@ public class ActivityController { Integer pageSize=page.getPageSize(); Activity activity= page.getActivity(); if (ObjectUtils.isEmpty(pageNum)){ - return Result.success(activityService.search(page.getActivity())); + return Result.success(activityService.search(activity)); } return Result.success(activityService.searchForPage(pageNum,pageSize,activity)); } diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java index 0afeaf2..bbc2502 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java @@ -53,7 +53,7 @@ public interface ActivityMapper { "", "`activity_flag`=1", "AND activity.create_time BETWEEN #{startDate} AND #{endDate}", - "and activity_name like concat('%',#{activityName},'%')", + "and activity_name like concat('%',#{activityName},'%')", "", "" diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java index a35b2e2..30feabd 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java @@ -33,8 +33,7 @@ public interface RateMapper { "end_time=#{endTime},", "currency=#{currency},", "exchange_rate=#{exchangeRate},", - "update_time=#{updateTime},", - "admin_id=#{adminId},", + "admin_id=#{adminId},", "", "where rate_id = #{rateId}", "" diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java index 7615d93..a97e6e2 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java @@ -41,7 +41,7 @@ public interface RechargeMapper { "and recharge.admin_id=#{adminId}", "AND recharge.create_time BETWEEN #{startDate} AND #{endDate}", "and pay_way like concat('%',#{payWay},'%')", - "and recharge.area like concat('%',#{area},'%')", + "and area like concat('%',#{area},'%')", "and audit.status=#{status}", "", "" diff --git a/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java b/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java index cf0195b..6f82886 100644 --- a/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java +++ b/demo/statistics/src/main/java/com/example/statistics/mapper/DetailMapper.java @@ -30,7 +30,7 @@ public interface DetailMapper { "inner join `admin` on detail.admin_id = `admin`.admin_id", "inner join `user` on detail.jwcode = `user`.jwcode", "", - "and detail.jwcode=#{jwcode}", + "and jwcode like concat('%',#{jwcode},'%')", "and update_type=#{updateType}", "AND recharge.create_time BETWEEN #{startDate} AND #{endDate}", "", diff --git a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java index 8803eeb..d7e104e 100644 --- a/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java +++ b/demo/statistics/src/main/java/com/example/statistics/service/DetailServiceImpl.java @@ -18,6 +18,7 @@ import java.util.List; @RequiredArgsConstructor public class DetailServiceImpl implements DetailService { @Autowired + private DetailMapper detailMapper; @Override public int add(Detail detail) { diff --git a/demo/user/src/main/java/com/example/user/controller/UserController.java b/demo/user/src/main/java/com/example/user/controller/UserController.java index 5683e13..0ebd835 100644 --- a/demo/user/src/main/java/com/example/user/controller/UserController.java +++ b/demo/user/src/main/java/com/example/user/controller/UserController.java @@ -7,6 +7,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; + @RestController @RequestMapping("/recharge/user") @RequiredArgsConstructor @@ -15,7 +17,13 @@ import org.springframework.web.bind.annotation.*; public class UserController { private final UserSevice userSevice; @PostMapping - public Result User(@RequestBody User user) { - return Result.success(userSevice.search(user)); + public Result User(@RequestBody User user) throws Exception { + try { + userSevice.search(user); + return Result.success(userSevice.search(user)); + }catch (Exception e) { + log.error(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } } } diff --git a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java index e4d4585..e1b1f2f 100644 --- a/demo/user/src/main/java/com/example/user/mapper/UserMapper.java +++ b/demo/user/src/main/java/com/example/user/mapper/UserMapper.java @@ -1,6 +1,5 @@ package com.example.user.mapper; -import com.example.commons.domain.entity.Audit; import com.example.commons.domain.entity.User; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -12,5 +11,16 @@ public interface UserMapper { @Select({ "select * from user where jwcode=#{jwcode}" }) - List select(User user); + User select(String user); + + @Select({ + "" + }) + List selectAll(User user); + } diff --git a/demo/user/src/main/java/com/example/user/service/ProductServiceImpl.java b/demo/user/src/main/java/com/example/user/service/ProductServiceImpl.java new file mode 100644 index 0000000..fbdb468 --- /dev/null +++ b/demo/user/src/main/java/com/example/user/service/ProductServiceImpl.java @@ -0,0 +1,5 @@ +package com.example.user.service; + +public class ProductServiceImpl { + +} diff --git a/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java b/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java index e278e3d..fb712ae 100644 --- a/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java +++ b/demo/user/src/main/java/com/example/user/service/UserServiceImpl.java @@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -20,14 +21,18 @@ public class UserServiceImpl implements UserSevice { private final UserMapper userMapper; @Override - public List search(User user) { - return userMapper.select(user); + public List search(User user) throws Exception{ + User sUser = userMapper.select(user.getJwcode()); + if(ObjectUtils.isEmpty(sUser)){ + throw new Exception("无此精网号"); + } + return userMapper.selectAll(user); } @Override public PageInfo searchForPage(Integer pageNum, Integer pageSize, User user) { PageHelper.startPage(pageNum,pageSize); - List list= userMapper.select(user); + List list= userMapper.selectAll(user); return new PageInfo<>(list); } }