积分管理功能

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

@@ -21,7 +21,7 @@ public class StayIntegral implements Serializable{
     private Date stayCreateTime;        //创建时间
     private Date stayUpdateTime;        //更新时间
 
-    private String integralRemark;//待入积分备注
+    private String integralRemarks;//待入积分备注
     private Integer changeIntegralMax;//最大变动积分（查询用）
     private Integer changeIntegralMin;//最小变动积分（查询用）
     private String userName;//会员姓名
@@ -158,12 +158,12 @@ public class StayIntegral implements Serializable{
         this.userNickName = userNickName;
     }
 
-    public String getIntegralRemark() {
-        return integralRemark;
+    public String getIntegralRemarks() {
+        return integralRemarks;
     }
 
-    public void setIntegralRemark(String integralRemark) {
-        this.integralRemark = integralRemark;
+    public void setIntegralRemarks(String integralRemarks) {
+        this.integralRemarks = integralRemarks;
     }
 
     public Integer getChangeIntegralMax() {

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

@@ -21,7 +21,7 @@ public class UseIntegral implements Serializable {
     private Integer configId;            //积分来源类型
     private Integer integralBeforeNumber;//变动前可用积分总额
     private Integer integralEndNumber;//变动后可用积分总额
-    private String integralRemark;      //备注
+    private String integralRemarks;      //备注
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date integralCreateTime;     //创建时间
@@ -100,12 +100,12 @@ public class UseIntegral implements Serializable {
         this.integralEndNumber = integralEndNumber;
     }
 
-    public String getIntegralRemark() {
-        return integralRemark;
+    public String getIntegralRemarks() {
+        return integralRemarks;
     }
 
-    public void setIntegralRemark(String integralRemark) {
-        this.integralRemark = integralRemark;
+    public void setIntegralRemarks(String integralRemarks) {
+        this.integralRemarks = integralRemarks;
     }
 
     public Date getIntegralCreateTime() {

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -184,7 +184,7 @@ public class ApparatusServiceImpl implements ApparatusService {
                 useIntegral.setIntegralNumber(stayNumber);
                 useIntegral.setIntegralBeforeNumber(memberInfo.getUserSurplusIntegral());
                 useIntegral.setIntegralEndNumber(memberInfo.getUserSurplusIntegral());
-                useIntegral.setIntegralRemark(integralConfig.getIntegralConfigName());
+                useIntegral.setIntegralRemarks(integralConfig.getIntegralConfigName());
                 //添加积分获取日志信息
                 if(useIntegralMapper.addUseIntegral(useIntegral) < 1){
                     return false;

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

@@ -156,7 +156,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
             useIntegral.setIntegralEndNumber(mem.getUserSurplusIntegral()); //变动后
             useIntegral.setIntegralType(1); //入账
             useIntegral.setConfigId(si.getConfigId());
-            useIntegral.setIntegralRemark("由待入账变更为已入账");
+            useIntegral.setIntegralRemarks("由待入账变更为已入账");
             flag = useIntegralMapper.addUseIntegral(useIntegral);
             if (flag < 1) {
                 throw new RuntimeException("添加入账日志失败");

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

@@ -93,7 +93,7 @@
         VALUES
         (
           #{userOpenId},#{integralType},#{stayId},#{configId},#{integralNumber},
-          #{integralBeforeNumber},#{integralEndNumber},#{integralRemark},NOW()
+          #{integralBeforeNumber},#{integralEndNumber},#{integralRemarks},NOW()
         )
     </insert>
 
@@ -207,7 +207,8 @@
     <!-- 积分日志记录列表查询 -->
     <select id="listUseIntegral" parameterType="UseIntegral" resultType="UseIntegral">
         SELECT
-        i.*, u.user_nickname,
+        i.*,
+        u.user_nickname,
         u.user_name
         FROM
         tb_iamberry_use_integral i
@@ -242,8 +243,8 @@
         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 test="integralRemarks != null and integralRemarks != ''">
+                ui.integral_remarks = #{integralRemarks}
             </if>
             <if test="userName!=null and userName != ''">
                 AND  u.user_name like CONCAT('%',#{userName},'%')

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

@@ -55,7 +55,6 @@ public class AdminIntegrlhHandler {
         if (totalNum != 0) {
             result.setTotal(totalNum);
         }
-        StitchAttrUtil.addNoPro("page");//过滤page不封装
         StitchAttrUtil.setModelAndView(useIntegral, mv, "/admin/userIntegral/listIntegral", result);
         return mv;
     }

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

@@ -68,7 +68,7 @@
                 <td>${infolist.integralType==1?'+':''}${infolist.integralType==2?'-':''}${infolist.integralNumber}</td>
                 <td>${infolist.userName }</td>
                 <td>${infolist.userNickName }</td>
-                <td>${infolist.integralRemark }</td>
+                <td>${infolist.integralRemarks }</td>
                 <td>${infolist.integralBeforeNumber}</td>
                 <td>${infolist.integralEndNumber}</td>
                 <td><fmt:formatDate value="${infolist.integralCreateTime}" pattern="yyyy-MM-dd"/></td>

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

@@ -39,11 +39,11 @@
 
         <div class="formControls col-2">
 			 <span class="select-box">
-				<select id="integralRemark" name="integralRemark" class="select">
+				<select id="integralRemarks" name="integralRemarks" class="select">
 					<option value="" >待入积分类型</option>
-					<option value="首次注册会员赠送" ${integralRemark=='首次注册会员赠送'?'selected':''}>首次注册会员赠送</option>
-					<option value="微信商城下单赠送" ${integralRemark=='微信商城下单赠送'?'selected':''}>微信商城下单赠送</option>
-					<option value="扫描产品唯一码赠送" ${integralRemark=='扫描产品唯一码赠送'?'selected':''}>扫描产品唯一码赠送</option>
+					<option value="首次注册会员赠送" ${integralRemarks=='首次注册会员赠送'?'selected':''}>首次注册会员赠送</option>
+					<option value="微信商城下单赠送" ${integralRemarks=='微信商城下单赠送'?'selected':''}>微信商城下单赠送</option>
+					<option value="扫描产品唯一码赠送" ${integralRemarks=='扫描产品唯一码赠送'?'selected':''}>扫描产品唯一码赠送</option>
 				</select>
 			</span>
         </div>
@@ -87,7 +87,7 @@
                 <td>+${infolist.stayNumber}</td>
                 <td>${infolist.userName }</td>
                 <td>${infolist.userNickName }</td>
-                <td>${infolist.integralRemark }</td>
+                <td>${infolist.integralRemarks }</td>
                 <td><fmt:formatDate value="${infolist.stayRecordedTime }" pattern="yyyy-MM-dd"/></td>
                 <td>
                     <c:choose>
@@ -112,6 +112,7 @@
                 <td>${infolist.userStayIntegral}</td>
                 <td>${infolist.userSurplusIntegral}</td>
                 <td><fmt:formatDate value="${infolist.stayCreateTime }" pattern="yyyy-MM-dd"/></td>
+                <td></td>
                 </c:forEach>
                 </c:if>
             </tbody>