联合丽格 1.0.1

src/main/java/com/caimei/modules/weisha/dao/CmMallOrganizeDao.java

@@ -50,6 +50,13 @@ public interface CmMallOrganizeDao extends CrudDao<CmMallOrganize> {
      */
     void setStatus(@Param("status") String status, @Param("serviceProviderId") String serviceProviderId);
 
+    /**
+     * 用户采购员上下线状态
+     * @param status
+     * @param serviceProviderId
+     */
+    void setUserServiceStatus(@Param("status") Integer status, @Param("serviceProviderId") Integer serviceProviderId, @Param("userId") Integer userId, @Param("validFlag") Integer validFlag, @Param("userPermission") Integer userPermission);
+
     /**
      * 采购人员下属机构
      * @param spIds
@@ -67,7 +74,7 @@ public interface CmMallOrganizeDao extends CrudDao<CmMallOrganize> {
      * 删除采购人员
      * @param serviceProviderId
      */
-    void delService(@Param("serviceProviderId") Integer serviceProviderId);
+    void updateService(@Param("serviceProviderId") Integer serviceProviderId);
 
     /**
      * 修改机构采购员信息

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

@@ -23,6 +23,10 @@ public class CmOrganizeOperate extends DataEntity<CmOrganizeOperate> {
      * 姓名
      */
     private String name;
+    /**
+     * 联系人
+     */
+    private String linkName;
     /**
      * 手机号
      */
@@ -72,6 +76,14 @@ public class CmOrganizeOperate extends DataEntity<CmOrganizeOperate> {
         this.name = name;
     }
 
+    public String getLinkName() {
+        return linkName;
+    }
+
+    public void setLinkName(String linkName) {
+        this.linkName = linkName;
+    }
+
     public String getMobile() {
         return mobile;
     }

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

@@ -52,6 +52,10 @@ public class CmOrganizeProcure extends DataEntity<CmOrganizeProcure> {
      * 添加事件
      */
     private Date addTime;
+    /**
+     * openId
+     */
+    private String openid;
     /**
      * 绑定时间
      */
@@ -149,6 +153,14 @@ public class CmOrganizeProcure extends DataEntity<CmOrganizeProcure> {
         this.addTime = addTime;
     }
 
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
     public Date getBindTime() {
         return bindTime;
     }

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

@@ -78,8 +78,15 @@ public class CmMallOrganizeService extends CrudService<CmMallOrganizeDao, CmMall
     }
 
     @Transactional(readOnly = false)
-    public void setStatus(String status, String id) {
+    public void setStatus(String status, String id, Integer userId) {
+        // 协销上下线状态
         organizeDao.setStatus(status, id);
+        // 用户协销状态
+        if ("90".equals(status)) {
+            organizeDao.setUserServiceStatus(Integer.parseInt(status), Integer.parseInt(id), userId, 1, 4);
+        } else {
+            organizeDao.setUserServiceStatus(Integer.parseInt(status), Integer.parseInt(id), userId, 0, 1);
+        }
     }
 
     @Transactional(readOnly = false)
@@ -90,20 +97,20 @@ public class CmMallOrganizeService extends CrudService<CmMallOrganizeDao, CmMall
         }
         if (null != operaId) {
             // 删除采购员
-            organizeDao.delService(operaId);
-            List<Integer> collect = new ArrayList<>();
+            organizeDao.updateService(operaId);
+            /*List<Integer> collect = new ArrayList<>();
             collect.add(operaId);
             List<NewCmClub> clubList = organizeDao.getClubNameList(collect);
             // 更改采购员名下机构 用户采购员信息
             clubList.forEach(c -> {
                 organizeDao.updateClub(1342, c.getClubID());
                 organizeDao.updateUser(1342, c.getUserID());
-            });
+            });*/
         }
-        if (null != userId) {
+        /*if (null != userId) {
             // 删除用户
             organizeDao.delUser(userId);
-        }
+        }*/
     }
 
 }

src/main/java/com/caimei/modules/weisha/web/CmMallOrganizeController.java

@@ -137,12 +137,12 @@ public class CmMallOrganizeController extends BaseController {
      * @return
      */
     @RequestMapping("/setStatus")
-    public String setStatus(String status, String id, Integer organizeId, RedirectAttributes redirectAttributes) {
+    public String setStatus(String status, String id, Integer organizeId, Integer userId, RedirectAttributes redirectAttributes) {
         if(StringUtils.isEmpty(id) || StringUtils.isBlank(id)) {
             addMessage(redirectAttributes, "id为空，状态修改失败");
             return "redirect:"+Global.getAdminPath()+"/weisha/cmMallOrganize/procure?organizeId="+organizeId;
         }
-        cmMallOrganizeService.setStatus(status,id);
+        cmMallOrganizeService.setStatus(status,id, userId);
         addMessage(redirectAttributes, "状态修改成功");
         return "redirect:"+Global.getAdminPath()+"/weisha/cmMallOrganize/procure?organizeId="+organizeId;
     }

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

@@ -290,6 +290,7 @@
                 </if>
             </if>
             <if test="serviceProviderId != null and serviceProviderId != 0">
+                and co.orderType = 0
                 and (co.spID = #{serviceProviderId}
                 or sp.serviceProviderID = #{serviceProviderId})
             </if>
@@ -1446,7 +1447,7 @@
         --         SELECT * from cm_order_payment_voucher v
         SELECT v.*, i.*
         from cm_order_payment_voucher v
-                 LEFT JOIN cm_voucher_image i on i.voucherId = v.id
+                 LEFT JOIN cm_voucher_image i on i.voucherId = v.idfi
         where shopOrderId = #{shopOrderId}
     </select>
     <select id="findCmVoucherImageoOrderID" resultType="com.caimei.modules.order.entity.CmVoucherImage">

src/main/resources/mappings/modules/user/CmSpMapper.xml

@@ -36,6 +36,7 @@
 		LEFT JOIN c_usertype c ON a.userID = u.userID and u.registerUserTypeID = c.c_userTypeID
 		LEFT JOIN c_serviceproviderstatus cs ON a.`status` = cs.c_serviceProviderStatusID
 		<where>
+			organizeID = 0
 			<if test="serviceProviderID != null and serviceProviderID != ''">
 				AND a.serviceProviderID = #{serviceProviderID}
 			</if>
@@ -164,6 +165,7 @@
 		LEFT JOIN c_usertype c ON a.userID = u.userID and u.registerUserTypeID = c.c_userTypeID
 		LEFT JOIN c_serviceproviderstatus cs ON a.`status` = cs.c_serviceProviderStatusID
 		<where>
+		    a.organizeId = 0
 			<if test="status != null and status != ''">
 				AND a.status = #{status}
 			</if>

src/main/resources/mappings/modules/user/CustomerMapper.xml

@@ -119,7 +119,7 @@
 				2 AS "mode"
 				FROM USER a
 				LEFT JOIN serviceprovider s ON a.serviceProviderID = s.serviceProviderID
-				WHERE userIdentity = '1' AND s.openid IS NOT NULL AND s.openid != ''
+				WHERE userIdentity = '1' AND s.openid IS NOT NULL AND s.openid != '' and organizeID = 0
 				<if test="linkName != null and linkName != ''">
 					AND a.userName LIKE concat('%',#{linkName},'%')
 				</if>

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

@@ -152,10 +152,10 @@
 		a.organizeID as organizeId,
 		a.name AS "name",
 		a.linkMan AS "linkMan",
+		a.openid as "openid",
 		a.contractMobile AS "mobile",
 		a.status AS "status",
 		cmou.id AS "operaId",
-		cmou.bindTime AS "bindTime",
 		a.addTime AS "addTime"
 		FROM serviceprovider a
 		LEFT JOIN cm_mall_operation_user cmou ON a.userId = cmou.userId
@@ -195,11 +195,21 @@
 		set status = #{status}
 		where serviceProviderID = #{serviceProviderId}
 	</update>
+    <select id="setUserServiceStatus">
+        update user
+        set serviceProviderStatus = #{status},
+            userPermission = #{userPermission},
+            validFlag = #{validFlag}
+        where userId = #{userId}
+    </select>
 	<delete id="delUser">
 		delete from user where userID = #{userId}
 	</delete>
-	<delete id="delService">
-		delete from serviceprovider where serviceProviderID = #{serviceProviderId}
+	<delete id="updateService">
+		update serviceprovider
+		set openid = NULL,
+		    unionId = NULL
+		where serviceProviderID = #{serviceProviderId}
 	</delete>
 	<update id="updateClub">
 		update club

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

@@ -26,6 +26,10 @@
 		LEFT JOIN town t ON c.townId = t.townID
     </sql>
 
+    <select id="get" resultType="CmOrganizeStore">
+        select * from cm_mall_operation_user where id = #{id}
+    </select>
+
     <select id="findList" resultType="CmOrganizeStore">
         SELECT
         <include refid="cmOrganizeUserinfo"/>,
@@ -54,6 +58,9 @@
                 <if test="dbName == 'mssql'">'%'+#{mobile}+'%'</if>
                 <if test="dbName == 'mysql'">concat('%',#{mobile},'%')</if>
             </if>
+            <if test="serviceName != null and serviceName != ''">
+                AND ser.linkMan like concat('%',#{serviceName},'%')
+            </if>
             <if test="status != null and status != ''">
                 AND c.status = #{status}
             </if>
@@ -134,6 +141,7 @@
         cmou.id,
         cmou.userOrganizeID as organizeId,
         cmou.clubId,
+        cmou.linkName,
         u.userName AS name,
         u.bindMobile AS mobile,
         cmou.status,
@@ -143,13 +151,14 @@
         LEFT JOIN USER u ON cmou.userId = u.userId
         <where>
             cmou.delFlag = 0 AND cmou.userOrganizeID = #{organizeId} AND cmou.clubId = #{clubId}
-            <if test="name != null and name != ''">
-                and u.userName like concat('%',#{name},'%')
+            <if test="linkName != null and linkName != ''">
+                and cmou.linkName like concat('%',#{linkName},'%')
             </if>
             <if test="mobile != null and mobile != ''">
                 and u.bindMobile like concat('%',#{mobile},'%')
             </if>
         </where>
+        ORDER BY cmou.addTime DESC
     </select>
     <select id="getClubName" resultType="java.lang.String">
         select name from club where clubId = #{clubId}

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

@@ -22,7 +22,7 @@
     <form:hidden path="organizeId"/>
     <div class="ul-form">
         <label>姓名：</label>
-            <form:input path="name" htmlEscape="false" maxlength="30" class="input-medium"/>
+            <form:input path="linkName" htmlEscape="false" maxlength="30" class="input-medium"/>
         <label>手机号：</label>
             <form:input path="mobile" htmlEscape="false" maxlength="11" class="input-medium"/>
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="搜索"/>
@@ -45,13 +45,18 @@
     <c:forEach items="${page.list}" var="operatePage">
         <tr>
             <td>
-                    ${operatePage.name}
+                    ${operatePage.linkName}
             </td>
             <td>
                     ${operatePage.mobile}
             </td>
             <td>
-                <fmt:formatDate value="${operatePage.bindTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                <c:if test="${!empty operatePage.bindTime}">
+                    <fmt:formatDate value="${operatePage.bindTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </c:if>
+                <c:if test="${empty operatePage.bindTime}">
+                    暂未绑定
+                </c:if>
             </td>
             <td>
                 <fmt:formatDate value="${operatePage.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>

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

@@ -53,7 +53,6 @@
         <th>关联机构</th>
         <th>状态</th>
         <th>添加时间</th>
-        <th>绑定时间</th>
         <th>操作</th>
     </tr>
     </thead>
@@ -75,25 +74,23 @@
             <td>
                 <c:if test="${procure.status eq 90}">
                     <font color="green">已上线</font>
-                    <a href="${ctx}/weisha/cmMallOrganize/setStatus?status=91&id=${procure.serviceProviderId}&organizeId=${procure.organizeId}" onclick="return confirmx('确定下线该机构吗？下线后机构将不能登录小程序。', this.href)">下线</a>
+                    <a href="${ctx}/weisha/cmMallOrganize/setStatus?status=91&id=${procure.serviceProviderId}&organizeId=${procure.organizeId}&userId=${procure.userID}" onclick="return confirmx('确定下线该机构吗？下线后机构将不能登录小程序。', this.href)">下线</a>
                 </c:if>
                 <c:if test="${procure.status eq 91}">
                     <font color="red">已下线</font>
-                    <a href="${ctx}/weisha/cmMallOrganize/setStatus?status=90&id=${procure.serviceProviderId}&organizeId=${procure.organizeId}" onclick="return confirmx('确定上线该机构吗？', this.href)" >上线</a>
+                    <a href="${ctx}/weisha/cmMallOrganize/setStatus?status=90&id=${procure.serviceProviderId}&organizeId=${procure.organizeId}&userId=${procure.userID}" onclick="return confirmx('确定上线该机构吗？', this.href)" >上线</a>
                 </c:if>
             </td>
-            <td>
-                <fmt:formatDate value="${procure.bindTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
-            </td>
             <td>
                 <fmt:formatDate value="${procure.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>
             <td>
-                <c:if test="${procure.status eq 90}">
+                <c:if test="${procure.status eq 90 && !empty procure.openid}">
                     <a href="${ctx}/weisha/cmMallOrganize/cleanWX?id=${procure.operaId}&operaId=${procure.serviceProviderId}&organizeId=${procure.organizeId}&userId=${procure.userID}"
                        onclick="return confirmx('确定解绑该机构微信吗？解绑后需要重新添加。', this.href)">解绑微信</a>
                 </c:if>
-                <c:if test="${procure.status ne 90}"> --- </c:if>
+                <c:if test="${empty procure.openid}"><font color="red">已解绑微信</font></c:if>
+                <c:if test="${procure.status ne 90 && !empty procure.openid}"> --- </c:if>
             </td>
         </tr>
     </c:forEach>