联合丽格 1.0.1

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -161,6 +161,7 @@ public class CmDiscernReceiptController extends BaseController {
         model.addAttribute("voucherVo", voucherVo.size()==0?null:voucherVo);
         model.addAttribute("organizeID", cmDiscernReceipt.getOrganizeID());
         model.addAttribute("vo", vo);
+        model.addAttribute("cmDiscernReceipt", cmDiscernReceipt);
 //        model.addAttribute("op", op);
         model.addAttribute("checkMan", cmDiscernReceipt.getCheckMan());
 

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

@@ -27,7 +27,7 @@ public class CmOrganizeStore extends DataEntity<CmOrganizeStore> {
 	private Integer status;		// 门店状态：1已上线，2已下线
 	private Date addTime;		// 添加时间
 	private Integer isWx; 		// 是否绑定微信
-	private String shopName;	// 采购员姓名
+	private String serviceName;	// 采购员姓名
 
 	private String startTime;	// 查询条件，开始时间
 	private String endTime;	// 查询条件，结束时间
@@ -157,12 +157,12 @@ public class CmOrganizeStore extends DataEntity<CmOrganizeStore> {
 		this.isWx = isWx;
 	}
 
-	public String getShopName() {
-		return shopName;
+	public String getServiceName() {
+		return serviceName;
 	}
 
-	public void setShopName(String shopName) {
-		this.shopName = shopName;
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
 	}
 
 	public String getStartTime() {

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

@@ -13,6 +13,7 @@ import com.caimei.modules.weisha.entity.CmOrganizeStore;
 import com.caimei.modules.weisha.dao.CmOrganizeStoreDao;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 采美组织门店Service

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

@@ -9,6 +9,7 @@ import com.caimei.modules.common.entity.City;
 import com.caimei.modules.common.entity.Province;
 import com.caimei.modules.common.entity.Town;
 import com.caimei.modules.weisha.dao.CmOrganizeStoreDao;
+import com.caimei.modules.weisha.entity.CmOrganizeOperate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -142,22 +143,36 @@ public class CmOrganizeStoreController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/weisha/cmOrganizeStore/?repage";
     }
 
-	/**
-	 * 解除绑定微信
-	 * @param id
-	 * @param organizeId
-	 * @param clubId
-	 * @param redirectAttributes
-	 * @return
-	 */
-	@RequestMapping("/outWx")
-	public String outWx(Integer id, Integer organizeId, Integer clubId, RedirectAttributes redirectAttributes) {
-		if(null == id) {
-			addMessage(redirectAttributes, "id为空，微信绑定解除失败");
-			return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeStore/getOperate?organizeId="+organizeId+"&clubId="+clubId;
-		}
-		cmOrganizeStoreService.outWx(id);
-		addMessage(redirectAttributes, "微信绑定解除成功");
-		return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeStore/getOperate?organizeId="+organizeId+"&clubId="+clubId;
-	}
+    /**
+     * 查看运营人员
+     * @return
+     */
+    @RequestMapping("/getOperate")
+    public String getOperate(CmOrganizeOperate cmOrganizeOperate, Model model, HttpServletRequest request, HttpServletResponse response) {
+        Page<CmOrganizeOperate> operatePage = cmOrganizeStoreService.findOperatePage(new Page<CmOrganizeOperate>(request, response), cmOrganizeOperate);
+        String clubName = cmOrganizeStoreDao.getClubName(cmOrganizeOperate.getClubId());
+        model.addAttribute("cmOrganizeOperate", cmOrganizeOperate);
+        model.addAttribute("page", operatePage);
+        model.addAttribute("clubName", clubName);
+        return "modules/weisha/cmOrganizeOperate";
+    }
+
+    /**
+     * 解除绑定微信
+     * @param id
+     * @param organizeId
+     * @param clubId
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping("/outWx")
+    public String outWx(Integer id, Integer organizeId, Integer clubId, RedirectAttributes redirectAttributes) {
+        if(null == id) {
+            addMessage(redirectAttributes, "id为空，微信绑定解除失败");
+            return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeStore/getOperate?organizeId="+organizeId+"&clubId="+clubId;
+        }
+        cmOrganizeStoreService.outWx(id);
+        addMessage(redirectAttributes, "微信绑定解除成功");
+        return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeStore/getOperate?organizeId="+organizeId+"&clubId="+clubId;
+    }
 }

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

@@ -167,6 +167,9 @@
 			<if test="mobile != null and mobile != ''">
 				and a.contractMobile like concat('%',#{mobile},'%')
 			</if>
+			<if test="status != null">
+                and a.status = #{status}
+            </if>
 			<if test="startTime != null and startTime != ''">
 				and a.addTime <![CDATA[ > ]]> #{startTime}
 			</if>

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

@@ -29,9 +29,11 @@
     <select id="findList" resultType="CmOrganizeStore">
         SELECT
         <include refid="cmOrganizeUserinfo"/>,
-        <include refid="addressName"/>
+        <include refid="addressName"/>,
+        ser.linkMan as serviceName
         FROM USER u
         LEFT JOIN club c ON c.userId = u.userId
+        LEFT JOIN serviceprovider ser on ser.serviceProviderID = c.spId
         <include refid="cmOrganizeStoreJoins"/>
         <where>
             <if test="name != null and name != ''">
@@ -127,5 +129,32 @@
         from cm_mall_organize
         where id = #{organizeId}
     </select>
-
+    <select id="getOperate" resultType="com.caimei.modules.weisha.entity.CmOrganizeOperate">
+        SELECT
+        cmou.id,
+        cmou.userOrganizeID as organizeId,
+        cmou.clubId,
+        u.userName AS name,
+        u.bindMobile AS mobile,
+        cmou.status,
+        cmou.bindTime,
+        cmou.addTime
+        FROM cm_mall_operation_user cmou
+        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>
+            <if test="mobile != null and mobile != ''">
+                and u.bindMobile like concat('%',#{mobile},'%')
+            </if>
+        </where>
+    </select>
+    <select id="getClubName" resultType="java.lang.String">
+        select name from club where clubId = #{clubId}
+    </select>
+    <delete id="outWx">
+        delete from cm_mall_operation_user where id = #{id}
+    </delete>
 </mapper>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -144,7 +144,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/order/cmDiscernReceipt/">收款列表</a></li>
-    <li class="active"><a href="${ctx}/order/cmDiscernReceipt/detail?id=${cmDiscernReceipt.id}">收款详情</a></li>
+    <li class="active"><a href="${ctx}/order/cmDiscernReceipt/detail?checkMan=${cmDiscernReceipt.checkMan}&orderID=${cmDiscernReceipt.orderID}&shopName=${cmDiscernReceipt.shopName}&id=${cmDiscernReceipt.id}&organizeID=${cmDiscernReceipt.organizeID}&shopOrderId=${cmDiscernReceipt.shopOrderId}">收款详情</a></li>
 </ul>
 <br/>
 <div class="receipt-order-details">

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -248,24 +248,19 @@
             <li style="position: relative">${order.orderNo}
             </li>
             <li>
-                <c:if test="${order.organizeID != 4}">
-                    <c:if test="${order.orderType == 1}">
-                        自主订单
-                    </c:if>
-                    <c:if test="${order.orderType == 0}">
-                        协销订单
-                        <c:if test="${not empty order.spName}">
-                            <br>${fns:appendLast1('(',order.spName,')')}
-                        </c:if>
-                    </c:if>
-                    <c:if test="${order.orderType > 1}">
-                        ---
+                <c:if test="${order.orderType == 1}">
+                    自主订单
+                </c:if>
+                <c:if test="${order.orderType == 0}">
+                    协销订单
+                    <c:if test="${not empty order.spName}">
+                        <br>${fns:appendLast1('(',order.spName,')')}
                     </c:if>
                 </c:if>
-
-                <c:if test="${order.organizeID == 4}">
+                <c:if test="${order.orderType > 1}">
                     ---
                 </c:if>
+
             </li>
             <li>
                 <c:if test="${order.rebateOrder == '0'}">

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

@@ -119,7 +119,6 @@
 <%--						<a href="${ctx}/weisha/cmOrganizeBuyer?organizeId=${cmUserOrganize.id}">采购员</a>--%>
 						<a href="${ctx}/weisha/cmOrganizeStore/list?organizeId=${cmUserOrganize.id}">机构列表</a>
 <%--						<a href="${ctx}/weisha/cmOrganizeProduct/list?organizeId=${cmUserOrganize.id}">商品列表</a>--%>
-						<a href="${ctx}/weisha/cmOrganizeProduct/list?organizeId=${cmUserOrganize.id}">商品列表</a>
 						<a href="${ctx}/weisha/cmMallOrganize/procure?organizeId=${cmUserOrganize.id}">采购员列表</a>
 						<a href="${ctx}/weisha/cmMallUser/getMallUser?organizeId=${cmUserOrganize.id}">后台用户</a>
 <%--						<a href="${ctx}/weisha/cmOrganizePromotions/list?organizeId=${cmUserOrganize.id}&type=1">促销活动</a>--%>

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

@@ -42,7 +42,7 @@
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/weisha/cmMallOrganize">组织列表</a></li>
 	<li><a href="${ctx}/weisha/cmOrganizeStore/list?organizeId=${cmOrganizeStore.organizeId}">机构列表</a></li>
-	<li class="active"><a href="${ctx}/weisha/cmOrganizeStore/form?organizeId=${cmOrganizeStore.organizeId}&id=${cmOrganizeStore.id}">${not empty cmOrganizeStore.id?'编辑':'上线'}门店</a></li>
+	<li class="active"><a href="${ctx}/weisha/cmOrganizeStore/formGet?clubId=${cmOrganizeStore.clubId}">查看资料</a></li>
 </ul><br/>
 <form:form id="inputForm" modelAttribute="cmOrganizeStore" action="${ctx}/weisha/cmOrganizeStore/save" method="post" class="form-horizontal">
 	<form:hidden path="id"/>
@@ -209,4 +209,4 @@
 
 </script>
 </body>
-</html>
+</html>

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

@@ -27,7 +27,7 @@
 			 <label>手机号：</label>
 				<form:input path="mobile" htmlEscape="false" maxlength="11" class="input-medium"/>
 			<label>采购员：</label>
-				<form:input path="shopName" htmlEscape="false" maxlength="30" class="input-medium"/>
+				<form:input path="serviceName" htmlEscape="false" maxlength="30" class="input-medium"/>
 			 <label>上线状态：</label>
 			<form:select path="status" class="input-mini">
 				<form:option value="" label="请选择"/>
@@ -96,11 +96,11 @@
 					</c:if>
 				</td>
 				<td>
-					<c:if test="${empty cmOrganizeStore.shopName}">
+					<c:if test="${empty cmOrganizeStore.serviceName}">
 						---
 					</c:if>
-					<c:if test="${!empty cmOrganizeStore.shopName}">
-						${cmOrganizeStore.shopName}
+					<c:if test="${!empty cmOrganizeStore.serviceName}">
+						${cmOrganizeStore.serviceName}
 					</c:if>
 				</td>
 				<td>