后端框架第二版接口

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",
             "<where>",
+
             "<if test='activityId!=null'>and activity_id=#{activityId}</if>",
             "<if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>",
-            "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>",
+            "<if test='startDate != null and endDate != null'>AND detail.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "<if test='refundGoods!=null and refundGoods.length>0 '>and refund_goods like concat('%',#{refundGoods},'%')</if>",
+            "<if test='refundType!=null and refundType.length>0 '>and refund_type like concat('%',#{refundType},'%')</if>",
             "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
             "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",

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;
 }

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;
+}

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;

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;
 
 }

demo/commons/src/main/java/com/example/commons/sevice/ProductService.java

@@ -0,0 +1,5 @@
+package com.example.commons.sevice;
+
+public interface ProductService {
+
+}

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<User> search(User user) ;
+    List<User> search(User user) throws Exception;
     PageInfo<User> searchForPage(Integer pageNum, Integer pageSize, User User);
 
 }

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));
     }

demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java

@@ -53,7 +53,7 @@ public interface ActivityMapper {
             "<where>",
             "`activity_flag`=1",
             "<if test='startDate != null and endDate != null'>AND activity.create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='activityName!=null'>and activity_name like concat('%',#{activityName},'%')</if>",
+            "<if test='activityName!=null and activityName.length>0'>and activity_name like concat('%',#{activityName},'%')</if>",
             "</where>",
             "</script>"
 

demo/recharge/src/main/java/com/example/recharge/mapper/RateMapper.java

@@ -33,8 +33,7 @@ public interface RateMapper {
             "<if test='endTime!=null'>end_time=#{endTime},</if>",
             "<if test='currency!=null and currency.length>0'>currency=#{currency},</if>",
             "<if test='exchangeRate!=null'>exchange_rate=#{exchangeRate},</if>",
-            "<if test='updateTime!=null'>update_time=#{updateTime},</if>",
-            "<if test='adminId!=null and admin_id.length>0'>admin_id=#{adminId},</if>",
+            "<if test='adminId!=null'>admin_id=#{adminId},</if>",
             "</set>",
             "where rate_id = #{rateId}",
             "</script>"

demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java

@@ -41,7 +41,7 @@ public interface RechargeMapper {
             "<if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>",
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>",
-            "<if test='area!=null and area.length>0'>and recharge.area like concat('%',#{area},'%')</if>",
+            "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
             "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",
             "</script>"

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",
             "<where>",
-            "<if test='jwcode!=null'>and detail.jwcode=#{jwcode}</if>",
+            "<if test='jwcode!=null'>and jwcode like concat('%',#{jwcode},'%')</if>",
             "<if test='updateType!=null and updateType>0'>and update_type=#{updateType}</if>",
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "</where>",

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) {

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());
+        }
     }
 }

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<User> select(User user);
+    User select(String user);
+
+    @Select({
+            "<script>",
+            "select * from user",
+            "<where>",
+            "<if test='jwcode!=null and jwcode.length>0'>and jwcode=#{jwcode}</if>",
+            "</where>",
+            "</script>"
+    })
+    List<User> selectAll(User user);
+
 }

demo/user/src/main/java/com/example/user/service/ProductServiceImpl.java

@@ -0,0 +1,5 @@
+package com.example.user.service;
+
+public class ProductServiceImpl {
+
+}

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<User> search(User user) {
-        return userMapper.select(user);
+    public List<User> 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<User> searchForPage(Integer pageNum, Integer pageSize, User user) {
         PageHelper.startPage(pageNum,pageSize);
-        List<User> list= userMapper.select(user);
+        List<User> list= userMapper.selectAll(user);
         return new PageInfo<>(list);
     }
 }