浏览代码

积分管理功能

liujiankang 7 年之前
父节点
当前提交
6d34ae3bee

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

@@ -158,13 +158,6 @@ public class StayIntegral implements Serializable{
         this.userNickName = userNickName;
     }
 
-    public String getIntegralRemarks() {
-        return integralRemarks;
-    }
-
-    public void setIntegralRemarks(String integralRemarks) {
-        this.integralRemarks = integralRemarks;
-    }
 
     public Integer getChangeIntegralMax() {
         return changeIntegralMax;
@@ -181,4 +174,12 @@ public class StayIntegral implements Serializable{
     public void setChangeIntegralMin(Integer changeIntegralMin) {
         this.changeIntegralMin = changeIntegralMin;
     }
+
+    public String getIntegralRemarks() {
+        return integralRemarks;
+    }
+
+    public void setIntegralRemarks(String integralRemarks) {
+        this.integralRemarks = integralRemarks;
+    }
 }

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

@@ -84,6 +84,9 @@ public class AdminIntegrlhHandler {
         return mv;
     }
 
+    /**
+     *取消待入账积分
+     */
     @ResponseBody
     @RequestMapping("/updatestayIntegralStatus")
     public ResultMsg updatestayIntegralStatus(HttpServletRequest request){

+ 2 - 2
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listIntegral.jsp

@@ -39,8 +39,8 @@
 
         <input name="userName" id="userName" value="${userName }" placeholder="会员姓名搜索" style="width: 150px" class="input-text" type="text">
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
-        <input name="integralNumberMin" id="integralNumberMin" value="${integralNumberMin }" placeholder="积分数量搜索" style="width: 150px" class="input-text" type="text">-
-        <input name="integralNumberMax" id="integralNumberMax" value="${integralNumberMax }" placeholder="积分数量搜索" style="width: 150px" class="input-text" type="text">
+        <input name="integralNumberMin" id="integralNumberMin" value="${integralNumberMin }" placeholder="积分数量搜索" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">-
+        <input name="integralNumberMax" id="integralNumberMax" value="${integralNumberMax }" placeholder="积分数量搜索" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">
         <button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-success" type="submit">
             <i class="Hui-iconfont"></i> 搜索
         </button>

+ 30 - 3
tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listStayIntegral.jsp

@@ -53,8 +53,8 @@
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
 
         <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly>
-        <input name="changeIntegralMin" id="changeIntegralMin" value="${changeIntegralMin }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text">-
-        <input name="changeIntegralMax" id="changeIntegralMax" value="${changeIntegralMax }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text">
+        <input name="changeIntegralMin" id="changeIntegralMin" value="${changeIntegralMin }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">-
+        <input name="changeIntegralMax" id="changeIntegralMax" value="${changeIntegralMax }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">
 
         <button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-success" type="submit">
             <i class="Hui-iconfont"></i> 搜索
@@ -112,7 +112,11 @@
                 <td>${infolist.userStayIntegral}</td>
                 <td>${infolist.userSurplusIntegral}</td>
                 <td><fmt:formatDate value="${infolist.stayCreateTime }" pattern="yyyy-MM-dd"/></td>
-                <td></td>
+                <td>
+                    <c:if test="${infolist.stayStatus == 1 }">
+                        <a id="updateId${infolist.stayId}" onclick="updateStatus(${infolist.stayId},4);">取消入账</a>
+                    </c:if>
+                </td>
                 </c:forEach>
                 </c:if>
             </tbody>
@@ -150,6 +154,29 @@
         }
 
     }
+    function updateStatus(id,status){
+        layer.confirm('确认要修改状态吗?',function(index){
+            $.ajax({
+                url: '${pageContext.request.contextPath }/admin/userIntegral/updatestayIntegralStatus',
+                type: "POST",
+                dataType: "json",
+                data: {stayId : id,stayStatus : status},
+                error:function(){
+                    layer.msg(data.status,{icon: 5,time:2000});
+                },
+                success:  function(data){
+                    if(data.status){
+                        layer.msg("取消成功",{icon: 1,time:2000});
+                        $("#updateId"+id).hide();
+
+
+                    }else{
+                        layer.msg("取消失败",{icon: 2,time:2000});
+                    }
+                }
+            });
+        })
+    }
 </script>
 </body>
 </html>