微信

src/main/resources/mappings/modules/wexintheorder/TheLeadershipDao.xml

@@ -54,29 +54,31 @@
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
-		a.del_flag AS "delFlag",
-		a.user_id AS "userId",
-		a.leadership AS "leadership"
+		a.team AS "team",
+		a.department AS "department",
+		a.specific AS "specific",
+		a.correlationId AS "correlationId"
 	</sql>
 
 	<select id="findListUserId" resultType="com.jeeplus.modules.wexintheorder.entity.TheLeadership">
 		select
 		<include refid="leaderShipColumns"/>
-		from work_leadership
-		WHERE a.user_id = #{userId}
+		from the_order_information a
+		WHERE a.correlationId = #{correlationId}
 	</select>
 
 	<insert id="insertLeaderShip">
-		INSERT INTO work_leadership(
+		INSERT INTO the_order_information(
 			id,
 			create_by,
 			create_date,
 			update_by,
 			update_date,
 			remarks,
-			del_flag,
-			user_id,
-			leadership
+			team,
+			department,
+			`specific`,
+			correlationId
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -84,12 +86,18 @@
 			#{updateBy.id},
 			#{updateDate},
 			#{remarks},
-			#{delFlag},
-			#{userId},
-			#{leadership}
+			#{team},
+			#{department},
+			#{specific},
+			#{correlationId}
 		)
 	</insert>
 
+	<update id="updateLeaderShip">
+		UPDATE the_order_information SET
+			leadership = #{leadership}
+		WHERE user_id = #{userId}
+	</update>
 
 
 
@@ -104,4 +112,8 @@
 		LEFT JOIN sys_office bo ON bo.id = o.branch_office
 		WHERE a.we_chat_id = #{wechatId}
 	</select>
+
+	<select id="findOffice" resultType="java.lang.String">
+		select o.name from sys_office o where id = #{id}
+	</select>
 </mapper>

src/main/resources/mappings/modules/wexintheorder/TheOrderDao.xml

@@ -10,9 +10,9 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.name AS "name",
+		a.team AS "team",
 		a.department AS "department",
-		a.leadership AS "leadership",
-		a.confirmOrder AS "confirmOrder",
+		a.specific AS "specific",
 		a.scheduled AS "scheduled",
 		a.correlationId AS "correlationId"
 	</sql>
@@ -23,8 +23,11 @@
 		FROM the_order a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-			<if test="scheduled != null and scheduled != '' ">
-				AND a.scheduled = #{scheduled}
+			<if test="dateStart != null and dateStart != '' ">
+				AND a.scheduled LIKE CONCAT(CONCAT(#{dateStart},'%'))
+			</if>
+			<if test="correlationId != null and correlationId != '' ">
+				AND a.correlationId = correlationId
 			</if>
 		</where>
 		<choose>
@@ -48,8 +51,8 @@
 			del_flag,
 			name,
 			department,
-			leadership,
-			confirmOrder,
+			team,
+			`specific`,
 			scheduled,
 			correlationId
 		) VALUES (
@@ -62,16 +65,10 @@
 			#{delFlag},
 			#{name},
 			#{department},
-			#{leadership},
-			#{confirmOrder},
+			#{team},
+			#{specific},
 			#{scheduled},
 			#{correlationId}
 		)
 	</insert>
-
-	<update id="updateOrder">
-
-	</update>
-
-
 </mapper>

src/main/resources/spring-context-shiro.xml

@@ -17,7 +17,9 @@
                 /static/** = anon
                 /userfiles/** = anon
                 ${adminPath}/weChatCallBack/** = anon
-                ${adminPath}//weXin/theOrder/** = anon
+                ${adminPath}/weXin/theOrder/** = anon
+                ${adminPath}/webpage/weixin/orderMeal.jsp = anon
+                ${adminPath}/webpage/weixin/error.jsp = anon
                 ${adminPath}/sys/user/infoCareStatus = anon
                 ${adminPath}/sys/user/validateLoginName = anon
                 ${adminPath}/sys/user/validateMobile = anon