虽然不知道哪来的后端分支，但还是提交一下

# Conflicts:
#	src/main/java/com/example/demo/controller/ConsumeController.java
#	src/main/java/com/example/demo/controller/RechargeController.java
#	src/main/resources/application.yml

pom.xml

@@ -16,7 +16,7 @@
 	<description>demo</description>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>21</java.version>
 	</properties>
 	<dependencies>
 		<!-- Maven -->
@@ -126,9 +126,9 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.46</version>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>

src/main/java/com/example/demo/controller/ActivityController.java

@@ -55,6 +55,7 @@ public class ActivityController {
          Integer pageSize=page.getPageSize();
          Activity activity= page.getActivity();
         if (ObjectUtils.isEmpty(pageNum)){
+
             return  Result.success(activityService.search(activity));
         }
         return Result.success(activityService.searchForPage(pageNum,pageSize,activity));

src/main/java/com/example/demo/controller/AdminController.java

@@ -58,13 +58,9 @@ public class AdminController {
     @PostMapping("/login")
     public Result login(@RequestBody Admin admin){
 
-
             try {
-
                 admin = adminService.login(admin);
-
                 String token = JWTUtil.createJWT(admin);
-
                 admin.setPassword(null);
                 return Result.success(token,admin);
             } catch (Exception e) {

src/main/java/com/example/demo/controller/DouController.java

@@ -114,4 +114,9 @@ public class DouController {
     public Result getTotal(@RequestBody Total total){
         return Result.success(douService.getTotal(total));
     }
+    // 获取充值类型填充下拉框（现在还没有下拉框好有下拉框了但是它好长）
+    @RequestMapping("/getType")
+    public Result getType(){
+        return Result.success(douService.getType());
+    }
 }

src/main/java/com/example/demo/controller/ProductController.java

@@ -20,6 +20,11 @@ public class ProductController {
     public Result Product(@RequestBody Product product){
        return Result.success(productService.findAll(product));
     }
+    // 所有消费明细---获取商品名
+    @PostMapping("/findProductName")
+    public Result getProductName(){
+        return Result.success(productService.findAllProductName());
+    }
     @PostMapping("/add")
     public Result add(@RequestBody Product product){
         return Result.success(productService.add(product));

src/main/java/com/example/demo/domain/dou/Total.java

@@ -17,6 +17,7 @@ public class Total {
     private String orderNo;
     private String type;
     private String ipAddress;
+    private String deptName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;

src/main/java/com/example/demo/domain/vo/RechargeVo.java

@@ -24,6 +24,7 @@ public class RechargeVo implements Serializable {  // 实现 Serializable 接口
     private BigDecimal rechargeGold;
     private String payWay;
     private String rechargeWay;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date rechargeTime;
     private String rechargeVoucher;
     private Integer adminId;

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

@@ -49,7 +49,7 @@ public interface ActivityMapper {
     //模糊查询--根据活动id查询活动信息
     @Select({
             "<script>",
-            "SELECT activity.*, admin.name FROM activity",
+            "SELECT  activity.*, admin.name FROM activity",
             "INNER JOIN admin ON activity.admin_id = admin.admin_id",
             "<where>",
             "activity.activity_flag = 1",

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
+import static net.sf.jsqlparser.parser.feature.Feature.select;
+
 @Mapper
 public interface AdminMapper {
     @Insert({
@@ -87,4 +89,6 @@ public interface AdminMapper {
     })
     Admin selectByJwcode(String jwcode);
 
+    @Select({"select jwcode from admin where jwcode=#{jwcode}"})
+    String checkJwcode(String jwcode);
 }

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -35,7 +35,7 @@ public interface ConsumeMapper {
             "(jwcode,order_code,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods," +
                     "contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,refund_flag,create_time,first_recharge,`name`,username,area,product_name)",
             "values ",
-            "(#{jwcode},#{orderCode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType}" +
+            "(#{jwcode},#{orderCode},#{activityId},#{rechargeWay},#{productId},'4','购买商品',#{refundType}" +
                     ",#{refundGoods},#{contactId},#{remark},#{rechargeCoin}" +
                     ",#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,1,now(),#{firstRecharge},#{name},#{username},#{area},#{productName})"
     })

src/main/java/com/example/demo/mapper/ProductMapper.java

@@ -19,4 +19,7 @@ public interface ProductMapper {
             "select * from product"
     })
     public List<Product> findAll(Product product);
+
+    // 查询消费表的所有商品名称
+    List<String> findAllProductName();
 }

src/main/java/com/example/demo/mapperLink/DouMapper.java

@@ -20,4 +20,5 @@ public interface DouMapper {
     List<String> getPayIp();
     Total getTotal(Total total);
 
+    List<String> getType();
 }

src/main/java/com/example/demo/mapperPay/PayMapper.java

@@ -13,4 +13,5 @@ public interface PayMapper {
     List<String> getStyle();
     RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal);
 
+
 }

src/main/java/com/example/demo/security/SecurityConfig.java

@@ -60,13 +60,16 @@ public class SecurityConfig {
                         request
                                 .requestMatchers( HttpMethod.POST,
                                         // 用户不登录就可以访问的路径
-                                        "/admin/login","/upload/**","/detailY/ERP").permitAll()
+                                        "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**").permitAll()
                                 .requestMatchers(
-                                        "/error","alipay/**","/upload/**"
+                                        "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**"
                                 ).permitAll()
                                 .anyRequest().authenticated()   // 其它路径，必须要登录后才能访问
                 );
 
+
+
+
         http.addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class); // 然后是TokenFilter
 
         return http.build();
@@ -89,6 +92,9 @@ public class SecurityConfig {
      * @return
      */
     @Bean
+
+
+
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }

src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageInfo;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +34,9 @@ public class ActivityServiceImpl implements ActivityService {
     public int add(Activity activity) {
         return activityMapper.add(activity);
     }
-    @CacheEvict(value = "activity",allEntries = true)
+
     @Override
+    @CacheEvict(value = {"activity"}, allEntries = true)
     public int edit(Activity activity) {
         activity.setActivityFlag(0);
         return activityMapper.edit(activity);
@@ -46,8 +48,9 @@ public class ActivityServiceImpl implements ActivityService {
 
         return activityMapper.select(activity);
     }
-    @CacheEvict(value = {"activity"}, allEntries = true)
+
     @Override
+    @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #activity.hashCode() ")
     public PageInfo<Activity> searchForPage(Integer pageNum, Integer pageSize, Activity activity) {
 //        PageHelper.startPage(pageNum, pageSize);
 //        List<Activity> list = activityMapper.select(activity);
@@ -62,9 +65,9 @@ public class ActivityServiceImpl implements ActivityService {
             Date endTime = activity1.getEndTime();
 
             // 使用 Date 类的 before 和 after 方法进行比较
-            if (nowDate.before(startTime)) {
+            if (startTime != null &&nowDate.before(startTime)) {
                 activity1.setStatus(0); // 设置状态为 0
-            } else if (nowDate.after(endTime)) {
+            } else if (endTime != null &&nowDate.after(endTime)) {
                 activity1.setStatus(2); // 设置状态为 2
             } else {
                 activity1.setStatus(1); // 设置状态为 1

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -3,14 +3,13 @@ package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.mapper.AdminMapper;
+import com.example.demo.mapper.UserMapper;
 import com.example.demo.security.SecurityConfig;
 import com.example.demo.sevice.AdminService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -23,8 +22,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-
 import java.util.List;
+
 @Transactional
 @Service
 @RequiredArgsConstructor
@@ -37,6 +36,8 @@ public class AdminServiceImpl implements AdminService {
     private AuthenticationManager authenticationManager;
     @Autowired
     private PasswordEncoder passwordEncoder;
+    @Autowired
+    private UserMapper userMapper;
 
     @Override
     public int add(Admin admin) {
@@ -81,32 +82,40 @@ public class AdminServiceImpl implements AdminService {
         return new PageInfo<>(list);
 
     }
+    // 修改登录方法
     @Override
     public Admin login(Admin admin) throws Exception {
+try {
+    Admin admin1 = adminMapper.selectByJwcode(admin.getJwcode());
+    String[] machineIds = admin1.getMachineId().split(",");
+
+    boolean flag = false;
+    for (String machineId : machineIds) {
+        if (admin.getMachineId() != null && admin.getMachineId().equals(machineId))
+            flag = true;
+    }
+    if (!flag) {
+        throw new RuntimeException("你没有使用该机器的权限！");
+    }
+    System.out.println(admin.getJwcode());
+    System.out.println(admin.getPassword());
+    UsernamePasswordAuthenticationToken token =
+            new UsernamePasswordAuthenticationToken(admin.getJwcode(),admin.getPassword());
+
+        Authentication authentication = authenticationManager.authenticate(token);
+        Admin loginAdmin = (Admin) authentication.getPrincipal();
+
+        return loginAdmin;
+
+    }catch (NullPointerException e){
+        throw new RuntimeException("无此精网号");
+    }catch(BadCredentialsException exception){
+        throw new BadCredentialsException("密码错误");
+    }catch (Exception e){
+        throw new RuntimeException("你没有使用该机器的权限！");
+    }
 
-        Admin admin1=adminMapper.selectByJwcode(admin.getJwcode());
-        String[] machineIds = admin1.getMachineId().split(",");
-        boolean flag = false;
-        for(String machineId:machineIds) {
-            if (admin.getMachineId() != null && admin.getMachineId().equals(machineId))
-                flag = true;
-        }
-        if (!flag) {
-            throw new RuntimeException("你没有使用该机器的权限！");
-        }
-        System.out.println(admin.getJwcode());
-        System.out.println(admin.getPassword());
-        UsernamePasswordAuthenticationToken token =
-                new UsernamePasswordAuthenticationToken(admin.getJwcode(),admin.getPassword());
-        try {
-            Authentication authentication = authenticationManager.authenticate(token);
-            Admin loginAdmin = (Admin) authentication.getPrincipal();
-
-            return loginAdmin;
-        }catch (BadCredentialsException exception){
-            throw new BadCredentialsException("用户或密码错误");
 
-        }
     }
 
     @Override

src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java

@@ -29,9 +29,9 @@ public class DetailYServiceImpl implements DetailYService {
     public int add(DetailY detailY) {
         return detailYMapper.add(detailY);
     }
-    @Cacheable(key = "#root.method.name + ':' + #detailY.hashCode()")
     @Override
     public DetailY getCount(DetailY detailY) {
+
         return detailYMapper.getCount(detailY);
     }
 

src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java

@@ -190,4 +190,9 @@ public class DouServiceImpl implements DouService {
     public Total getTotal(Total total) {
         return douMapper.getTotal(total);
     }
+
+    @Override
+    public List<String> getType() {
+        return douMapper.getType();
+    }
 }

src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java

@@ -98,9 +98,9 @@ public class OtherServiceImpl implements OtherService {
         typesToUpdateOne.add("43");
         typesToUpdateOne.add("50");
         typesToUpdateOne.add("51");
-        typesToUpdateOne.add("52");
         typesToUpdateOne.add("62");
 
+        typesToUpdateTwo.add("52");
         typesToUpdateTwo.add("55");
         typesToUpdateTwo.add("56");
         typesToUpdateTwo.add("57");

src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java

@@ -32,4 +32,9 @@ public class ProductServiceImpl implements ProductService {
     public List<Index> findIndex(Index index) {
         return productMapper.findIndex(index);
     }
+
+    @Override
+    public List<String> findAllProductName() {
+        return productMapper.findAllProductName();
+    }
 }

src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -58,6 +59,8 @@ public class UserServiceImpl implements UserSevice {
         if (!ObjectUtils.isEmpty(sUser)){
             throw new Exception("已存在此用户");
         }
+        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+        user.setPassword(passwordEncoder.encode("123"));
         return userMapper.add(user);
     }
 

src/main/java/com/example/demo/sevice/DouService.java

@@ -30,4 +30,5 @@ public interface DouService {
     Total getTotal(Total total);
 
 
+    public List<String> getType();
 }

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

@@ -10,4 +10,7 @@ public interface ProductService {
     int add(Product product);
     List<Product> findAll(Product product);
     List<Index> findIndex(Index index);
+
+        //查询 消费表的商品名
+    List<String> findAllProductName();
 }

src/main/resources/application.yml

@@ -79,6 +79,9 @@ mybatis:
 upload:
   path: /home/java/haiwaiyanfa/gold1
 
+
+
+
 server:
   port: 8080
 

src/main/resources/mapper/ConsumeMapper.xml

@@ -10,11 +10,10 @@
         sum(recharge_coin) as SumRcion,
         sum(recharge_coin+free_coin+task_coin) as Sumcion
         from detail_y
-        left join product on detail_y.product_id= product.product_id
         <where>
         update_type = '1'
             <if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode =#{jwcode}</if>
-            <if test='productName!=null and productName.length>0'>and product.name = #{productName}</if>
+            <if test='productName!=null and productName.length>0'>and detail_y.product_name = #{productName}</if>
             <if test='consumePlatform!=null and consumePlatform.length>0'>and detail_y.consume_platform=#{consumePlatform}</if>
             <if test='consumeType!=null and consumeType.length>0'>and detail_y.consume_type= #{consumeType}</if>
             <if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>
@@ -30,19 +29,19 @@
     <select id="select" resultType="com.example.demo.domain.vo.ConsumeDetail">
         SELECT
         detail_y.*,
-        admin.name AS adminName,
-        product.name AS productName
+        admin.name AS adminName
+
         FROM detail_y
         LEFT JOIN `admin` ON detail_y.admin_id = admin.admin_id
         LEFT JOIN `user` ON detail_y.jwcode = user.jwcode
-        LEFT JOIN product ON detail_y.product_id = product.product_id
+
         <where>
             update_type = 1
             <if test='jwcode != null'>
                 AND detail_y.jwcode = #{jwcode}
             </if>
             <if test='productName != null and productName.length > 0'>
-                AND product.name = #{productName}
+                AND detail_y.product_name = #{productName}
             </if>
             <if test='consumePlatform != null and consumePlatform.length > 0'>
                 AND detail_y.consume_platform = #{consumePlatform}

src/main/resources/mapper/DetailYMapper.xml

@@ -179,7 +179,7 @@
         types;
     </select>
     <select id="getarea" resultType="java.lang.String">
-        SELECT DISTINCT area FROM detail_y
+        SELECT DISTINCT area FROM detail_y WHERE area IS NOT NULL
     </select>
     <select id="selectgold" resultType="com.example.demo.domain.vo.DetailYgold">
         SELECT

src/main/resources/mapper/OneMapper.xml

@@ -87,79 +87,30 @@
     <!-- 第二个查询：getTwo -->
     <select id="getTwo" resultType="com.example.demo.domain.work.Two">
         SELECT
-            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
-                      FROM detail_y
-                      WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS totalgold,
-
-            COALESCE((SELECT SUM(recharge_coin)
-                      FROM detail_y
-                      WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS totalcoin,
-
-            COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin)
-                      FROM detail_y
-                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                         AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS yesterdaytotal,
-
-            COALESCE((SELECT SUM(recharge_coin)
-                      FROM detail_y
-                      WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
-                         AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS yesterdayrecharge,
-            COALESCE((SELECT SUM(recharge_coin)
-                      FROM detail_y
-                      WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS rechargegold,
-            COALESCE((SELECT SUM(free_coin)
-                      FROM detail_y
-                      WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0
-        <if test="areas != null">
-            AND area IN
-            <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
-            </foreach>
-        </if>), 0) AS freegold,
-            COALESCE((SELECT SUM(task_coin)
-                      FROM detail_y
-                      WHERE YEAR(create_time) = YEAR(CURDATE())
-                        AND update_type = 0
+        COALESCE(SUM(CASE WHEN year_flag = 1 THEN total_coin ELSE 0 END), 0) AS totalgold,
+        COALESCE(SUM(CASE WHEN year_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS totalcoin,
+        COALESCE(SUM(CASE WHEN yesterday_flag = 1 THEN total_coin ELSE 0 END), 0) AS yesterdaytotal,
+        COALESCE(SUM(CASE WHEN yesterday_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS yesterdayrecharge,
+        COALESCE(SUM(CASE WHEN year_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS rechargegold,
+        COALESCE(SUM(CASE WHEN year_flag = 1 THEN free_coin ELSE 0 END), 0) AS freegold,
+        COALESCE(SUM(CASE WHEN year_flag = 1 THEN task_coin ELSE 0 END), 0) AS taskgold
+        FROM (
+        SELECT
+        recharge_coin,
+        free_coin,
+        task_coin,
+        recharge_coin + free_coin + task_coin AS total_coin,
+        YEAR(create_time) = YEAR(CURDATE()) AS year_flag,
+        DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS yesterday_flag
+        FROM detail_y
+        WHERE update_type = 0
         <if test="areas != null">
             AND area IN
             <foreach collection="areas" item="areas" open="(" separator="," close=")">
-                #{areas}
+                #{area}
             </foreach>
-        </if>), 0) AS taskgold
+        </if>
+        ) AS subquery
     </select>
 
     <!-- 第三个查询：getThree -->

src/main/resources/mapper/ProductMapper.xml

@@ -10,4 +10,9 @@
     <select id="findIndex" resultType="com.example.demo.domain.entity.Index">
         SELECT * FROM `index` WHERE type = #{type}
     </select>
+
+    <!--查询消费表的商品名-->
+    <select id="findAllProductName" resultType="java.lang.String">
+        select DISTINCT product_name from detail_y where product_name is not null and update_type = 1
+    </select>
 </mapper>

src/main/resources/mapper/StatisticsMapper.xml

@@ -114,7 +114,7 @@
         SUM(free_coin) / 100 AS freeSumCoin,
         SUM(task_coin) / 100 AS taskSumCoin
         FROM detail_y
-        WHERE  AND create_time BETWEEN #{searchStartTime} AND #{searchEndTime}
+        WHERE  create_time BETWEEN #{searchStartTime} AND #{searchEndTime}
         AND update_type = 1
         <if test="areas != null and areas.size > 0">
             AND area IN
@@ -124,4 +124,18 @@
         </if>
         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
+    <select id="getMediuPayCoinday" resultType="com.example.demo.domain.vo.SumCoin">
+        SELECT
+            DATE_FORMAT(create_time, '%Y-%m-%d') AS day,
+        IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,
+        IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,
+        IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin
+        FROM
+            detail_y
+        WHERE
+            DATE(create_time) = #{searchEndTime}
+          AND update_type = #{updateType}
+        GROUP BY
+            DATE_FORMAT(create_time, '%Y-%m-%d')
+    </select>
 </mapper>

src/main/resources/mapperLink/DouMapper.xml

@@ -124,6 +124,9 @@
             <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
+            <otherwise>
+                ORDER BY createTime DESC
+            </otherwise>
         </choose>
     </select>
     <select id="getSpendTotal" resultType="java.lang.Integer">
@@ -187,6 +190,9 @@
             <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
+            <otherwise>
+                ORDER BY fy.`time` DESC
+            </otherwise>
         </choose>
     </select>
     <select id="getPayIp" resultType="java.lang.String">
@@ -207,15 +213,18 @@
                 and fy.order_no = #{orderNo}
             </if>
             <if test="type != null and type.length > 0">
-                and type LIKE CONCAT('%', #{type}, '%')
+                and `content` LIKE CONCAT('%', #{type}, '%')
             </if>
-            <if test="ipAddress != null and ipAddress.length > 0">
-                and  fm.ip_address = #{ipAddress}
+            <if test="deptName != null and deptName.length > 0">
+                and  fm.ip_address = #{deptName}
             </if>
             <if test="startTime != null and endTime != null">
                 and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime}
             </if>
         </where>
     </select>
+    <select id="getType" resultType="java.lang.String">
+        SELECT DISTINCT  content FROM fx_yaoqing_records
+    </select>
 
 </mapper>

src/main/resources/mapperPay/PayMapper.xml

@@ -4,7 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapperPay.PayMapper">
     <select id="getPay" resultType="com.example.demo.domain.dou.Pay">
-        SELECT gps.`name` as payStyle,go.jwcode,mi.name,mi.deptName,mi.shopName,go.type,go.order_no,go.price,go.count,gps.`name`,go.success_time from g_order as go
+        SELECT gps.`name` as payStyle,go.jwcode,mi.name,mi.deptName,mi.shopName,
+               go.type,go.order_no,go.price,go.count,gps.`name`,go.success_time
+        from g_order as go
 LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
             LEFT JOIN g_pay_style gps on go.pay_style=gps.id
         <where>
@@ -31,6 +33,9 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
             <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
+            <otherwise>
+                ORDER BY go.success_time DESC
+            </otherwise>
         </choose>
     </select>
     <select id="getPayIp" resultType="java.lang.String">

src/test/java/test.java

@@ -0,0 +1,3 @@
+public class test {
+
+}