接口测试修改

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

@@ -1,5 +1,7 @@
 package com.iamberry.wechat.core.entity.integral;
 
+import com.iamberry.wechat.core.entity.PageBean;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -17,6 +19,16 @@ public class StayIntegral implements Serializable{
     private Date stayCreateTime;        //创建时间
     private Date stayUpdateTime;        //更新时间
 
+    private String integralRemark;//待入积分备注
+    private Integer changeIntegralMax;//最大变动积分（查询用）
+    private Integer changeIntegralMin;//最小变动积分（查询用）
+    private String userName;//会员姓名
+    private String userNickname;//会员昵称
+    private Integer userIntegral; //用户总积分
+    private Integer userSurplusIntegral; //用户剩余积分
+    private Integer userUseIntegral; //用户已用积分
+    private Integer userStayIntegral; //用户待入积分
+    private PageBean page=new PageBean();   //分页
     public Integer getStayId() {
         return stayId;
     }
@@ -96,4 +108,84 @@ public class StayIntegral implements Serializable{
     public void setStayUpdateTime(Date stayUpdateTime) {
         this.stayUpdateTime = stayUpdateTime;
     }
+
+    public Integer getUserIntegral() {
+        return userIntegral;
+    }
+
+    public void setUserIntegral(Integer userIntegral) {
+        this.userIntegral = userIntegral;
+    }
+
+    public Integer getUserSurplusIntegral() {
+        return userSurplusIntegral;
+    }
+
+    public void setUserSurplusIntegral(Integer userSurplusIntegral) {
+        this.userSurplusIntegral = userSurplusIntegral;
+    }
+
+    public Integer getUserUseIntegral() {
+        return userUseIntegral;
+    }
+
+    public void setUserUseIntegral(Integer userUseIntegral) {
+        this.userUseIntegral = userUseIntegral;
+    }
+
+    public Integer getUserStayIntegral() {
+        return userStayIntegral;
+    }
+
+    public void setUserStayIntegral(Integer userStayIntegral) {
+        this.userStayIntegral = userStayIntegral;
+    }
+
+    public PageBean getPage() {
+        return page;
+    }
+
+    public void setPage(PageBean page) {
+        this.page = page;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserNickname() {
+        return userNickname;
+    }
+
+    public void setUserNickname(String userNickname) {
+        this.userNickname = userNickname;
+    }
+
+    public String getIntegralRemark() {
+        return integralRemark;
+    }
+
+    public void setIntegralRemark(String integralRemark) {
+        this.integralRemark = integralRemark;
+    }
+
+    public Integer getChangeIntegralMax() {
+        return changeIntegralMax;
+    }
+
+    public void setChangeIntegralMax(Integer changeIntegralMax) {
+        this.changeIntegralMax = changeIntegralMax;
+    }
+
+    public Integer getChangeIntegralMin() {
+        return changeIntegralMin;
+    }
+
+    public void setChangeIntegralMin(Integer changeIntegralMin) {
+        this.changeIntegralMin = changeIntegralMin;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -34,6 +34,8 @@ public class UseIntegral implements Serializable {
 
     private String userName;//会员姓名
     private String userNickname;//会员昵称
+    private String integralNumberMin;//最小积分数量
+    private String integralNumberMax;//最大积分数量
     public Date getStayRecordedTime() {
         return stayRecordedTime;
     }
@@ -137,4 +139,36 @@ public class UseIntegral implements Serializable {
     public void setStayId(Integer stayId) {
         this.stayId = stayId;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserNickname() {
+        return userNickname;
+    }
+
+    public void setUserNickname(String userNickname) {
+        this.userNickname = userNickname;
+    }
+
+    public String getIntegralNumberMin() {
+        return integralNumberMin;
+    }
+
+    public void setIntegralNumberMin(String integralNumberMin) {
+        this.integralNumberMin = integralNumberMin;
+    }
+
+    public String getIntegralNumberMax() {
+        return integralNumberMax;
+    }
+
+    public void setIntegralNumberMax(String integralNumberMax) {
+        this.integralNumberMax = integralNumberMax;
+    }
 }

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -74,4 +74,27 @@ public interface UseIntegralService {
      * @return
      */
     List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
+
+    /**
+     *  查询所有收入支出积分记录总条数
+     * @return
+     */
+    Integer listUseIntegralCount(UseIntegral useIntegral);
+    /**
+     *  查询所有待入账积分记录
+     * @return
+     */
+    List<StayIntegral> listAdminStayIntegral(StayIntegral stayIntegral);
+    /**
+     *  查询所有待入账积分记录总数
+     * @return
+     */
+    Integer listAdminStayIntegralCount(StayIntegral stayIntegral);
+
+    /**
+     * 修改待入账积分记录
+     * @param stayIntegral
+     * @return
+     */
+    Integer updatestayIntegralStatus(StayIntegral stayIntegral);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -93,7 +93,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      */
     @Override
     public List<StayIntegral>  listStayIntegral(StayIntegral stayIntegral){
-            return useIntegralMapper.listStayIntegral(stayIntegral);
+        return useIntegralMapper.listStayIntegral(stayIntegral);
     }
 
     @Override
@@ -102,6 +102,26 @@ public class UseIntegralServiceImpl implements UseIntegralService {
     }
 
     @Override
+    public Integer listUseIntegralCount(UseIntegral useIntegral) {
+        return useIntegralMapper.listUseIntegralCount(useIntegral);
+    }
+
+    @Override
+    public List<StayIntegral> listAdminStayIntegral(StayIntegral stayIntegral) {
+        return useIntegralMapper.listAdminStayIntegral(stayIntegral);
+    }
+
+    @Override
+    public Integer listAdminStayIntegralCount(StayIntegral stayIntegral) {
+        return useIntegralMapper.listAdminStayIntegralCount(stayIntegral);
+    }
+
+    @Override
+    public Integer updatestayIntegralStatus(StayIntegral stayIntegral) {
+        return useIntegralMapper.updatestayIntegralStatus(stayIntegral);
+    }
+
+    @Override
     @Transient
     public boolean updateIntegralStayToAlready() {
         StayIntegral stayIntegral = new StayIntegral();
@@ -109,7 +129,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
         stayIntegral.setStayRecordedTime(new Date());
         /*获取所有的待入账积分*/
         List<StayIntegral>  stayIntegralList = useIntegralMapper.listStayIntegral(stayIntegral);
-		for(StayIntegral si : stayIntegralList ){
+        for(StayIntegral si : stayIntegralList ){
 		    /*增加入账积分，累计积分，减去待入账积分*/
             Member member = memberMapper.getMemberByUserOpenId(si.getUserOpenId());
             Member mem = new Member();

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/UseIntegralMapper.java

@@ -101,5 +101,27 @@ public interface UseIntegralMapper {
      * @return
      */
     List<UseIntegral> listUseIntegral(UseIntegral useIntegral);
+    /**
+     *  查询所有收入支出积分记录总条数
+     * @return
+     */
+    Integer listUseIntegralCount(UseIntegral useIntegral);
 
+    /**
+     *  查询所有待入账积分记录
+     * @return
+     */
+    List<StayIntegral> listAdminStayIntegral(StayIntegral stayIntegral);
+    /**
+     *  查询所有待入账积分记录总数
+     * @return
+     */
+    Integer listAdminStayIntegralCount(StayIntegral stayIntegral);
+
+    /**
+     * 修改待入账积分记录
+     * @param stayIntegral
+     * @return
+     */
+    Integer updatestayIntegralStatus(StayIntegral stayIntegral);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -16,22 +16,22 @@
     <!--全部积分记录-->
     <select id="listIntegralInfo" resultType="UseIntegral" parameterType="UseIntegral">
         SELECT
-          i.integral_type integralType,
-          i.integral_number integralNumber,
-          i.integral_remarks integralRemarks,
-          i.integral_create_time integralCreateTime,
-          i.integral_before_number integralBeforeNumber,
-          i.integral_end_number integralEndNumber,
-          c.integral_config_name integralConfigName,
-          s.stay_recorded_time stayRecordedTime
+        i.integral_type integralType,
+        i.integral_number integralNumber,
+        i.integral_remarks integralRemarks,
+        i.integral_create_time integralCreateTime,
+        i.integral_before_number integralBeforeNumber,
+        i.integral_end_number integralEndNumber,
+        c.integral_config_name integralConfigName,
+        s.stay_recorded_time stayRecordedTime
         FROM
-          tb_iamberry_use_integral i
+        tb_iamberry_use_integral i
         LEFT JOIN tb_iamberry_integral_config c ON i.config_id = c.integral_config_id
         LEFT JOIN tb_iamberry_stay_integral s ON i.stay_id=s.stay_id
         WHERE i.user_openid=#{userOpenId}
-            <if test="integralType != null and integralType != ''">
-               AND i.integral_type = #{integralType}
-            </if>
+        <if test="integralType != null and integralType != ''">
+            AND i.integral_type = #{integralType}
+        </if>
         ORDER BY i.integral_id DESC
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
             limit ${page.recordBegin},${page.pageSize}
@@ -66,13 +66,13 @@
     <!-- 查询积分来源信息 -->
     <select id="listIntegralConfig" parameterType="IntegralConfig" resultType="IntegralConfig">
         SELECT
-          *
+        *
         FROM
-          tb_iamberry_integral_config
+        tb_iamberry_integral_config
         <where>
-          <if test="integralConfigId != null and integralConfigId != ''">
-              integral_config_id = #{integralConfigId}
-          </if>
+            <if test="integralConfigId != null and integralConfigId != ''">
+                integral_config_id = #{integralConfigId}
+            </if>
         </where>
     </select>
 
@@ -125,18 +125,18 @@
     <!-- 查询所有待入账积分 -->
     <select id="listStayIntegral" parameterType="StayIntegral" resultType="StayIntegral">
         SELECT
-            t.stay_id AS  stayId,
-            t.user_openid AS  userOpenId,
-            t.config_id AS  configId,
-            t.sales_orderid AS  orderId,
-            t.stay_number AS  stayNumber,
-            t.stay_recorded_time AS stayRecordedTime,
-            t.stay_status AS  stayStatus,
-            t.stay_remark AS stayRemark,
-            t.stay_create_time AS stayCreateTime,
-            t.stay_update_time AS stayUpdateTime
+        t.stay_id AS  stayId,
+        t.user_openid AS  userOpenId,
+        t.config_id AS  configId,
+        t.sales_orderid AS  orderId,
+        t.stay_number AS  stayNumber,
+        t.stay_recorded_time AS stayRecordedTime,
+        t.stay_status AS  stayStatus,
+        t.stay_remark AS stayRemark,
+        t.stay_create_time AS stayCreateTime,
+        t.stay_update_time AS stayUpdateTime
         FROM
-            tb_iamberry_stay_integral t
+        tb_iamberry_stay_integral t
         <where>
             <if test="stayId != null">
                 AND stay_id = #{stayId}
@@ -190,7 +190,7 @@
     <!-- 根据banner图片ID，删除图片 -->
     <delete id="delUseIntegral" parameterType="UseIntegral">
         DELETE FROM
-          tb_iamberry_use_integral
+        tb_iamberry_use_integral
         <where>
             <if test="integralType != null">
                 AND integral_type = #{integralType}
@@ -204,6 +204,7 @@
         </where>
     </delete>
 
+    <!-- 积分日志记录列表查询 -->
     <select id="listUseIntegral" parameterType="UseIntegral" resultType="UseIntegral">
         SELECT
         i.*, u.user_nickname,
@@ -213,6 +214,18 @@
         LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
         WHERE
         i.integral_type IN (1, 2)
+        <if test="integralNumberMax!=null and integralNumberMax>0">
+            AND  integral_number &lt;= #{integralNumberMax}
+        </if>
+        <if test="integralNumberMin!=null and integralNumberMin>0">
+            AND  integral_number &gt;= #{integralNumberMin}
+        </if>
+        <if test="userName!=null and userName != ''">
+            AND  u.user_name like CONCAT('%',#{userName},'%')
+        </if>
+        <if test="userNikeName!=null and userNikeName != ''">
+            AND  u.user_nickname like CONCAT('%',#{userNikeName},'%')
+        </if>
         <if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
             limit ${page.recordBegin},${page.pageSize}
         </if>
@@ -221,4 +234,99 @@
         </if>
     </select>
 
+    <select id="listUseIntegralCount" parameterType="UseIntegral" resultType="Integer">
+        SELECT
+        count(1)
+        FROM
+        tb_iamberry_use_integral i
+        LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
+        WHERE
+        i.integral_type IN (1, 2)
+        <if test="integralNumberMax!=null and integralNumberMax>0">
+            AND  integral_number &lt;= #{integralNumberMax}
+        </if>
+        <if test="integralNumberMin!=null and integralNumberMin>0">
+            AND  integral_number &gt;= #{integralNumberMin}
+        </if>
+        <if test="userName!=null and userName != ''">
+            AND  u.user_name like CONCAT('%',#{userName},'%')
+        </if>
+        <if test="userNikeName!=null and userNikeName != ''">
+            AND  u.user_nickname like CONCAT('%',#{userNikeName},'%')
+        </if>
+    </select>
+    <!--待入账积分列表查询-->
+    <select id="listAdminStayIntegral" parameterType="StayIntegral" resultType="StayIntegral">
+        SELECT
+        i.*, u.user_nickname,
+        u.user_name,
+        u.user_integral,
+        u.user_surplus_integral,
+        u.user_use_integral,
+        u.user_stay_integral,
+        ui.integral_remarks
+        FROM
+        tb_iamberry_stay_integral i
+        LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
+        LEFT JOIN tb_iamberry_use_integral ui on i.stay_id = ui.stay_id
+        <where>
+            <if test="integralRemark != null and integralRemark != ''">
+                ui.integral_remarks = #{integralRemark}
+            </if>
+            <if test="productType != null and productType.typeId !=null and productType.typeId !=''">
+                and PRODUCT_TYPE=#{productType.typeId}
+            </if>
+            <if test="userName!=null and userName != ''">
+                AND  u.user_name like CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userNikeName!=null and userNikeName != ''">
+                AND  u.user_nickname like CONCAT('%',#{userNikeName},'%')
+            </if>
+            <if test="stayRecordedTime != null and stayRecordedTime != ''">
+                <![CDATA[AND DATE_FORMAT(stay_recorded_time, '%Y-%m-%d') = DATE_FORMAT(#{stayRecordedTime},'%Y-%m-%d')]]>
+            </if>
+            <if test="changeIntegralMax!=null and changeIntegralMax>0">
+                AND  i.stay_number &lt;= #{changeIntegralMax}
+            </if>
+            <if test="changeIntegralMin!=null and changeIntegralMin>0">
+                AND  i.stay_number &gt;= #{changeIntegralMin}
+            </if>
+        </where>
+    </select>
+    <select id="listAdminStayIntegralCount" parameterType="StayIntegral" resultType="StayIntegral">
+        SELECT
+        count(1)
+        FROM
+        tb_iamberry_stay_integral i
+        LEFT JOIN tb_iamberry_user_userinfo u ON i.user_openid = u.user_openid
+        LEFT JOIN tb_iamberry_use_integral ui on i.stay_id = ui.stay_id
+        <where>
+            <if test="integralRemark != null and integralRemark != ''">
+                ui.integral_remarks = #{integralRemark}
+            </if>
+            <if test="productType != null and productType.typeId !=null and productType.typeId !=''">
+                and PRODUCT_TYPE=#{productType.typeId}
+            </if>
+            <if test="userName!=null and userName != ''">
+                AND  u.user_name like CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userNikeName!=null and userNikeName != ''">
+                AND  u.user_nickname like CONCAT('%',#{userNikeName},'%')
+            </if>
+            <if test="stayRecordedTime != null and stayRecordedTime != ''">
+                <![CDATA[AND DATE_FORMAT(stay_recorded_time, '%Y-%m-%d') = DATE_FORMAT(#{stayRecordedTime},'%Y-%m-%d')]]>
+            </if>
+            <if test="changeIntegralMax!=null and changeIntegralMax>0">
+                AND  i.stay_number &lt;= #{changeIntegralMax}
+            </if>
+            <if test="changeIntegralMin!=null and changeIntegralMin>0">
+                AND  i.stay_number &gt;= #{changeIntegralMin}
+            </if>
+        </where>
+    </select>
+
+    <!--修改待入账积分状态-->
+    <update id="updatestayIntegralStatus" parameterType="StayIntegral" >
+        UPDATE tb_iamberry_stay_integral SET stay_status = #{stayStatus} WHERE stay_id = #{stayId}
+    </update>
 </mapper>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/AdminIntegrlhHandler.java

@@ -2,8 +2,10 @@ package com.iamberry.wechat.handles.integral;
 
 import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.integral.StayIntegral;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.product.Product;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
@@ -12,8 +14,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,32 +32,157 @@ public class AdminIntegrlhHandler {
     @Autowired
     private UseIntegralService useIntegralService;
     /**
-     * 待入账记录 use_type=3
-     * @param req
-     * @param pageSize
-     * @param pageNO
+     * 查询积分记录 并分页 (支持查询条件模糊搜索)
+     * 2018年2月24日
+     * @author mzx
+     * @param pageNO	分页信息
      * @return
      */
-    @RequestMapping("/listStayIntegral")
-    @ResponseBody
-    public ResultMsg listStayIntegral(HttpServletRequest req,
-                                      @RequestParam(value="useType",defaultValue= "3", required=false)Integer useType,
-                                      @RequestParam(value= "pageSize",defaultValue= "6" ,required=false)Integer pageSize,
-                                      @RequestParam(value = "pageNO", defaultValue = "1",required=false)Integer pageNO){
-        ResultMsg rm=new ResultMsg();
+    @RequestMapping("/listIntegral")
+    public ModelAndView listIntegral(@RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                     HttpServletRequest request) throws Exception {
+        StringBuffer url = new StringBuffer("/admin/product/list?pageSize=" + pageSize);
+        ModelAndView mv = new ModelAndView("admin/product/productList");
+        String userName = request.getParameter("userName");
+        String userNikeName = request.getParameter("userNikeName");
+        String integralNumberMax = request.getParameter("integralNumberMax");
+        String integralNumberMin = request.getParameter("integralNumberMin");
         UseIntegral useIntegral=new UseIntegral();
         useIntegral.getPage().setPageSize(pageSize);
         useIntegral.getPage().setPageNumber(pageNO);
-        useIntegral.getPage().initRecordBegin();
-        List<UseIntegral> listStayIntegral=useIntegralService.listIntegralInfo(useIntegral);
 
-        Map<String,Object> map=new HashMap<String, Object>();
-        map.put("listStayIntegralInfo",listStayIntegral);
+        if (null != userName && !"".equals(userName)) {
+            useIntegral.setUserName(userName);
+            url.append("&userName=" + userName);
+        }
+        if (null != userNikeName && !"".equals(userNikeName)) {
+            url.append("&userNikeName=" + userNikeName);
+            useIntegral.setUserNickname(userNikeName);
+        }
+        if (null != integralNumberMax && !"".equals(integralNumberMax)) {
+            url.append("&integralNumberMax=" + integralNumberMax);
+            useIntegral.setIntegralNumberMax(integralNumberMax);
+        }
+        if (null != integralNumberMin && !"".equals(integralNumberMin)) {
+            url.append("&integralNumberMin=" + integralNumberMin);
+            useIntegral.setIntegralNumberMin(integralNumberMin);
+        }
+
+        List<UseIntegral> list = useIntegralService.listUseIntegral(useIntegral);
+        mv.addObject("list", list);
+
+        url.append("&pageNO=");
+        int count = useIntegralService.listUseIntegralCount(useIntegral);
+        int pageCount =  count % useIntegral.getPage().getPageSize() == 0? count/useIntegral.getPage().getPageSize():(count/useIntegral.getPage().getPageSize())+1;
+        //分页用
+        mv.addObject("pageNO", pageNO);
+        mv.addObject("url", url);
+        mv.addObject("userName", userName);
+        mv.addObject("userNikeName", userNikeName);
+        mv.addObject("integralNumberMax", integralNumberMax);
+        mv.addObject("integralNumberMin", integralNumberMin);
+        mv.addObject("pageSize", pageCount);
+        return mv;
+    }
+
+    /**
+     * 查询待入账积分记录 并分页 (支持查询条件模糊搜索)
+     * 2018年2月24日
+     * @author mzx
+     * @param pageNO	分页信息
+     * @return
+     */
+    @RequestMapping("/listStayIntegral")
+    public ModelAndView listStayIntegral(@RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                         @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                         HttpServletRequest request) throws Exception {
+        StringBuffer url = new StringBuffer("/admin/product/list?pageSize=" + pageSize);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        ModelAndView mv = new ModelAndView("admin/product/productList");
+        String integralRemark = request.getParameter("integralRemark");
+        String userName = request.getParameter("userName");
+        String userNikeName = request.getParameter("userNikeName");
+        String stayRecordedTime = request.getParameter("stayRecordedTime");
+        String changeIntegralMax = request.getParameter("changeIntegralMax");
+        String changeIntegralMin = request.getParameter("changeIntegralMin");
+        StayIntegral stayIntegral=new StayIntegral();
+        stayIntegral.getPage().setPageSize(pageSize);
+        stayIntegral.getPage().setPageNumber(pageNO);
+
+
+        if (null != integralRemark && !"".equals(integralRemark)) {
+            stayIntegral.setIntegralRemark(integralRemark);
+            url.append("&integralRemark=" + integralRemark);
+        }
+        if (null != userName && !"".equals(userName)) {
+            stayIntegral.setUserName(userName);
+            url.append("&userName=" + userName);
+        }
+        if (null != userNikeName && !"".equals(userNikeName)) {
+            url.append("&userNikeName=" + userNikeName);
+            stayIntegral.setUserNickname(userNikeName);
+        }
+        if (null != stayRecordedTime && !"".equals(stayRecordedTime)) {
+            url.append("&stayRecordedTime=" + stayRecordedTime);
+            stayIntegral.setStayRecordedTime(format.parse(stayRecordedTime));
+        }
+        if (null != changeIntegralMax && !"".equals(changeIntegralMax)) {
+            url.append("&changeIntegralMax=" + changeIntegralMax);
+            stayIntegral.setChangeIntegralMax(Integer.valueOf(changeIntegralMax));
+        }
+        if (null != changeIntegralMin && !"".equals(changeIntegralMin)) {
+            url.append("&changeIntegralMin=" + changeIntegralMin);
+            stayIntegral.setChangeIntegralMin(Integer.valueOf(changeIntegralMin));
+        }
 
-        rm.setStatus(true);
-        rm.setResultCode(ResultInfo.SUCCESSCODE);
-        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
-        rm.setData(map);
-        return rm;
+        List<StayIntegral> list = useIntegralService.listAdminStayIntegral(stayIntegral);
+        mv.addObject("list", list);
+
+        url.append("&pageNO=");
+        int count = useIntegralService.listAdminStayIntegralCount(stayIntegral);
+        int pageCount =  count % stayIntegral.getPage().getPageSize() == 0? count/stayIntegral.getPage().getPageSize():(count/stayIntegral.getPage().getPageSize())+1;
+        //分页用
+        mv.addObject("pageNO", pageNO);
+        mv.addObject("url", url);
+        mv.addObject("integralRemark", integralRemark);
+        mv.addObject("userName", userName);
+        mv.addObject("userNikeName", userNikeName);
+        mv.addObject("stayRecordedTime", stayRecordedTime);
+        mv.addObject("changeIntegralMax", changeIntegralMax);
+        mv.addObject("changeIntegralMin", changeIntegralMin);
+        mv.addObject("pageSize", pageCount);
+        return mv;
+    }
+
+    @ResponseBody
+    @RequestMapping("/updatestayIntegralStatus")
+    public ResultMsg updatestayIntegralStatus(HttpServletRequest request){
+        ResultMsg resultMsg = new ResultMsg();
+        String stayId = request.getParameter("stayId");
+        String stayStatus = request.getParameter("stayStatus");
+        if (null == stayId || "".equals(stayId)) {
+            resultMsg.setStatus(false);
+            resultMsg.setResultCode("200");
+            return resultMsg;
+        }
+        if (null == stayStatus || "".equals(stayStatus)) {
+            resultMsg.setStatus(false);
+            resultMsg.setResultCode("200");
+            return resultMsg;
+        }
+        StayIntegral stayIntegral = new StayIntegral();
+        stayIntegral.setStayId(Integer.valueOf(stayId));
+        stayIntegral.setStayStatus(Integer.valueOf(stayStatus));
+        Integer msg = useIntegralService.updatestayIntegralStatus(stayIntegral);
+        if(msg < 1){
+            resultMsg.setStatus(false);
+            resultMsg.setResultCode("200");
+            return resultMsg;
+        }else{
+            resultMsg.setStatus(true);
+            resultMsg.setResultCode("200");
+            return resultMsg;
+        }
     }
 }