diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java
index ae31530..a342a4a 100644
--- a/src/main/java/com/example/demo/controller/DouController.java
+++ b/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());
+    }
 }
diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java
index 61b5c18..e1f8e7d 100644
--- a/src/main/java/com/example/demo/mapperLink/DouMapper.java
+++ b/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();
 }
diff --git a/src/main/java/com/example/demo/mapperPay/PayMapper.java b/src/main/java/com/example/demo/mapperPay/PayMapper.java
index 325c1e7..ac10df4 100644
--- a/src/main/java/com/example/demo/mapperPay/PayMapper.java
+++ b/src/main/java/com/example/demo/mapperPay/PayMapper.java
@@ -13,4 +13,5 @@ public interface PayMapper {
     List<String> getStyle();
     RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal);
 
+
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
index 82a0494..449aabb 100644
--- a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java
index 364d552..3366f90 100644
--- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java
+++ b/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();
+    }
 }
diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java
index 8577d1a..6b42f68 100644
--- a/src/main/java/com/example/demo/sevice/DouService.java
+++ b/src/main/java/com/example/demo/sevice/DouService.java
@@ -30,4 +30,5 @@ public interface DouService {
     Total getTotal(Total total);
 
 
+    public List<String> getType();
 }
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 17f614e..5a2d20f 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/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,7 +213,7 @@
                 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="deptName != null and deptName.length > 0">
                 and  fm.ip_address = #{deptName}
@@ -217,5 +223,8 @@
             </if>
         </where>
     </select>
+    <select id="getType" resultType="java.lang.String">
+        SELECT DISTINCT  content FROM fx_yaoqing_records
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapperPay/PayMapper.xml b/src/main/resources/mapperPay/PayMapper.xml
index 8b3036b..ec7ecd5 100644
--- a/src/main/resources/mapperPay/PayMapper.xml
+++ b/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">