Merge remote-tracking branch 'origin/developer' into developerMysql

src/main/java/com/caimei/modules/weisha/entity/CmMallUser.java

@@ -40,6 +40,10 @@ public class CmMallUser extends DataEntity<CmMallUser> {
      * 是否上线 1 已上线 2 已下线
      */
     private Integer status;
+    /**
+     * 人员类型：1 管理员 2普通人员
+     */
+    private Integer personnelType;
     /**
      * 添加时间
      */
@@ -127,6 +131,14 @@ public class CmMallUser extends DataEntity<CmMallUser> {
         this.status = status;
     }
 
+    public Integer getPersonnelType() {
+        return personnelType;
+    }
+
+    public void setPersonnelType(Integer personnelType) {
+        this.personnelType = personnelType;
+    }
+
     public Date getAddTime() {
         return addTime;
     }

src/main/java/com/caimei/modules/weisha/service/CmMallUserService.java

@@ -79,6 +79,7 @@ public class CmMallUserService {
         String s = MD5Util.MD5(newPassword);
         cmMallUser.setPassword(s);
         cmMallUser.setSalt(split[0]);
+        cmMallUser.setPersonnelType(1);
         cmMallUser.setUpdateTime(new Date());
         if (null == cmMallUser.getId()||"" == cmMallUser.getId()) {
             // 添加组织后台用户信息

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -67,7 +67,6 @@
 		a.affirmPaymentFlag AS affirmPaymentFlag,
 		a.rebateFlag AS rebateFlag,
 		a.zeroCostFlag AS zeroCostFlag,
-		a.organizeStoreId as organizeStoreId,
 		a.couponAmount as couponAmount,
         a.svipFullReduction as svipFullReduction,
         (a.discountFee + a.promotionFullReduction + a.couponAmount) as discountAmount,

src/main/resources/mappings/modules/weisha/CmMallUserMapper.xml

@@ -12,6 +12,7 @@
         status,
         account,
         accountName,
+        personnelType,
         addTime,
         updateTime
         FROM cm_mall_admin_user
@@ -26,6 +27,9 @@
             <if test="status != null and status != ''">
                 and status = #{status}
             </if>
+            <if test="personnelType != null and personnelType != ''">
+                and personnelType = #{personnelType}
+            </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 and addTime <![CDATA[ >= ]]> #{startTime} and addTime <![CDATA[ <= ]]> #{endTime}
             </if>
@@ -57,8 +61,8 @@
                                                 limit 1
     </select>
     <insert id="insertMallUser">
-        INSERT INTO cm_mall_admin_user(account, accountName, PASSWORD, salt, organizeID, status, ADDTIME, updateTime, delFlag)
-        VALUES(#{account}, #{accountName}, #{password}, #{salt}, #{organizeId}, #{status}, #{addTime}, #{updateTime}, #{delFlag})
+        INSERT INTO cm_mall_admin_user(account, accountName, PASSWORD, salt, organizeID, status, personnelType, ADDTIME, updateTime, delFlag)
+        VALUES(#{account}, #{accountName}, #{password}, #{salt}, #{organizeId}, #{status}, #{personnelType}, #{addTime}, #{updateTime}, #{delFlag})
     </insert>
     <update id="updateMallUser">
         update cm_mall_admin_user
@@ -75,7 +79,13 @@
             <if test="organizeId != null and organizeId != ''">
                 organizeID = #{organizeId},
             </if>
-            <if test="updateTime != null and updateTime != ''">
+            <if test="status != null and status != ''">
+                status = #{status},
+            </if>
+            <if test="personnelType != null and personnelType != ''">
+                personnelType = #{personnelType},
+            </if>
+            <if test="updateTime != null">
                 updateTime = #{updateTime},
             </if>
             <if test="salt != null and salt != ''">

src/main/webapp/WEB-INF/views/modules/weisha/CmMallUserList.jsp

@@ -25,6 +25,12 @@
             <form:option value="1" label="已上线"/>
             <form:option value="2" label="已下线"/>
         </form:select>
+        <label>用户类型：</label>
+        <form:select path="personnelType" class="input-medium">
+            <form:option value="" label="请选择"/>
+            <form:option value="1" label="管理员"/>
+            <form:option value="2" label="普通用户"/>
+        </form:select>
         <label>添加时间：</label>
         <input name="startTime" type="text" maxlength="20" class="input-mini Wdate"
                value="<fmt:formatDate value="${cmOrganizeBuyer.startTime}" pattern="yyyy-MM-dd"/>"
@@ -34,7 +40,7 @@
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-<%--        &nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/weisha/cmMallUser/mallUserForm?organizeId=${cmMallOrganize.id}'" value="添加"/>--%>
+        &nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/weisha/cmMallUser/mallUserForm?organizeId=${cmMallOrganize.id}'" value="添加"/>
         <div class="clearfix"></div>
     </div>
 </form:form>
@@ -46,6 +52,7 @@
         <th>姓名</th>
         <th>手机号（登录账号）</th>
         <th>状态</th>
+        <th>用户类型</th>
         <th>添加时间</th>
         <th>操作</th>
     </tr>
@@ -65,6 +72,14 @@
                     <a href="${ctx}/weisha/cmMallUser/updateValidFlag?status=1&id=${page.id}&organizeId=${cmMallOrganize.id}" onclick="return confirmx('确定上线该用户吗？',this.href)">上线</a>
                 </c:if>
             </td>
+            <td>
+                <c:if test="${page.personnelType eq 1}">
+                    系统管理员
+                </c:if>
+                <c:if test="${page.personnelType eq 2}">
+                    普通用户
+                </c:if>
+            </td>
             <td><fmt:formatDate value="${page.addTime}" pattern="yyyy-MM-dd HH:dd:ss"></fmt:formatDate></td>
             <td>
                 <a href="${ctx}/weisha/cmMallUser/mallUserForm?id=${page.id}&organizeId=${cmMallOrganize.id}">编辑</a>