调整

shop/src/main/java/com/zskk/shop/controller/h5/MyController.java

@@ -0,0 +1,43 @@
+/**
+* @版权信息 (@copyright Copyright 2017-XXXX JDJR.COM All Right Reserved);
+* @see
+* @author 于海涛 京东金融【技术研发部-证券及营销平台研发部-营销平台研发部】
+* @version 1.0
+* @date 2018年7月4日
+*/
+
+package com.zskk.shop.controller.h5;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.zskk.shop.controller.AbstractController;
+import com.zskk.shop.controller.bean.UserInfoBean;
+import com.zskk.shop.service.BuyOrderService;
+import com.zskk.shop.service.FamilyPeopleService;
+
+@Controller
+@RequestMapping("/h5/my")
+public class MyController extends AbstractController {
+	
+	@Autowired
+	private BuyOrderService buyOrderService;
+	
+	@Autowired
+	private FamilyPeopleService familyPeopleService;
+
+	@RequestMapping("/index")
+	public String index(Model model){
+		UserInfoBean user = this.getH5User();
+		String uid = user.getAccount().getUserid();
+		model.addAttribute("noPayOrderCount", buyOrderService.queryMyNoPayOrderCount(uid));
+		model.addAttribute("appointmentCount", familyPeopleService.queryAppointmentedCount(uid));
+		model.addAttribute("queryExportCount", familyPeopleService.queryExportCount(uid));
+		model.addAttribute("user", user);
+		return "/h5/my";
+	}
+	
+	
+}

shop/src/main/java/com/zskk/shop/dao/BuyOrderMapper.java

@@ -20,6 +20,18 @@ public interface BuyOrderMapper {
 	List<BuyOrder> queryMyPayedOrders(String uid);
 	List<BuyOrder> queryBuyOrderByIds(@Param("ids") List<Long> ids);
 	
+	/**
+	 * 未支付订单
+	 * @param uid
+	 * @return
+	 */
+	List<BuyOrder> queryMyNoPayOrders(String uid);
+	
+	/**
+	 * 未支付订单数量
+	 */
+	Integer queryMyNoPayOrderCount(String uid);
+	
 	BuyOrder queryBuyOrder(Long id);
 	
 	void addBuyOrder(BuyOrder buyOrder);

shop/src/main/java/com/zskk/shop/dao/FamilyPeopleMapper.java

@@ -37,4 +37,6 @@ public interface FamilyPeopleMapper {
 	int updateAppointmentStatus(@Param("tjaid") String tjaid, @Param("tjstatus") Integer tjstatus, @Param("reportUrl") String reportUrl);
 	List<Long> queryCompletedBids(String uid);
 	public int setAppointmentStatus(Appointment appointment);
+	
+	public Integer queryAppointmentCountByStatus(@Param("uid") String uid, @Param("statusList") List<Integer> statusList);
 }

shop/src/main/java/com/zskk/shop/service/BuyOrderService.java

@@ -462,6 +462,24 @@ public class BuyOrderService {
 		return bean;
 	}
 	
+	/**
+	 * 未支付订单列表
+	 * @param uid
+	 * @return
+	 */
+	public List<BuyOrder> queryMyNoPayOrders(String uid){
+		return buyOrderMapper.queryMyNoPayOrders(uid);
+	}
+	
+	/**
+	 * 未支付订单数量
+	 * @param uid
+	 * @return
+	 */
+	public Integer queryMyNoPayOrderCount(String uid){
+		return buyOrderMapper.queryMyNoPayOrderCount(uid);
+	}
+	
 	private String getDate(Integer time, SimpleDateFormat format){
 		return format.format(new Date(time * 1000L));
 	}

shop/src/main/java/com/zskk/shop/service/FamilyPeopleService.java

@@ -9,6 +9,7 @@
 package com.zskk.shop.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +33,31 @@ import com.zskk.shop.utils.ToolsUtil;
 
 @Service
 public class FamilyPeopleService {
+	/**
+	 * 已退款
+	 */
+	public static final Integer APPOINTMENT_STATUS_REFUND = -3;
+	/**
+	 * 取消预约状态
+	 */
+	public static final Integer APPOINTMENT_STATUS_CANCEL = -2;
+	/**
+	 * 预约
+	 */
+	public static final Integer APPOINTMENT_STATUS_ED = -1;
+	/**
+	 * 已登记
+	 */
+	public static final Integer APPOINTMENT_STATUS_REGISTER = 0;
+	/**
+	 * 体检完成
+	 */
+	public static final Integer APPOINTMENT_STATUS_COMPLETED = 1;
+	/**
+	 * 总检报告已出
+	 */
+	public static final Integer APPOINTMENT_STATUS_EXPORT=2;
+	
 	
 	@Autowired
 	private FamilyPeopleMapper familyPeopleMapper;
@@ -267,5 +293,21 @@ public class FamilyPeopleService {
 		return beans;
 	}
 	
+	/**
+	 * 获取已预约的数量
+	 * @param uid
+	 * @return
+	 */
+	public Integer queryAppointmentedCount(String uid){
+		return familyPeopleMapper.queryAppointmentCountByStatus(uid, Arrays.asList(APPOINTMENT_STATUS_ED));
+	}
 	
+	/**
+	 * 获取已出报告数量
+	 * @param uid
+	 * @return
+	 */
+	public Integer queryExportCount(String uid){
+		return familyPeopleMapper.queryAppointmentCountByStatus(uid, Arrays.asList(APPOINTMENT_STATUS_EXPORT));
+	}
 }

shop/src/main/resource/mapper/BuyOrderMapper.xml

@@ -17,6 +17,19 @@
 		where uid=#{uid} and pay_status=1
 		order by id desc
 	</select>
+	<select id="queryMyNoPayOrders" resultType="com.zskk.shop.dao.entry.BuyOrder">
+		select <include refid="selectBuyOrder"></include>	
+		from buy_order
+		where uid=#{uid} and pay_status=0
+		order by id desc
+	</select>
+	<select id="queryMyNoPayOrderCount" resultType="java.lang.Integer">
+		select count(id) as totalCount	
+		from buy_order
+		where uid=#{uid} and pay_status=0
+		order by id desc
+	</select>
+	
 	<select id="queryBuyOrder" resultType="com.zskk.shop.dao.entry.BuyOrder">
 		select <include refid="selectBuyOrder"></include>	
 		from buy_order

shop/src/main/resource/mapper/FamilyPeopleMapper.xml

@@ -63,4 +63,13 @@
 	<update id="setAppointmentStatus" parameterType="com.zskk.shop.dao.entry.Appointment">
 		update appointment set tjstatus=#{tjstatus} where id=#{id}
 	</update>
+	
+	<select id="queryAppointmentCountByStatus" resultType="java.lang.Integer">
+		select count(id) as totalCount
+		from appointment
+		where uid=#{uid} and tjstatus in 
+		<foreach collection="statusList" open="(" close=")" separator="," item="status">
+			#{status}
+		</foreach>
+	</select>
 </mapper>

shop/src/main/resource/templates/h5/indexv2.html

@@ -118,7 +118,7 @@
     	<tr>
         	<td><a href="/h5/index" class="n-1-c">首页</a></td>
             <td><a href="/h5/buy/completedorders" class="n-2">报告</a></td>
-            <td><a href="#" class="n-3">我的</a></td>
+            <td><a href="/h5/my/index" class="n-3">我的</a></td>
         </tr>
     </table>
 </body>

shop/src/main/resource/templates/h5/my.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>我的</title>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+<link href="/h5/style/style.css" rel="stylesheet" />
+<script src="/h5/js/jquery-2.1.1.min.js"></script>
+<script src="/h5/js/nav.js"></script>
+</head>
+
+<body style="background-color:#EEE; ">
+	<div class="mine">
+    	<div class="mineH">
+        	<h1>晚上好！</h1>
+            <span th:text="${user.user.phone}"></span>
+        </div>
+        <div class="mineNav">
+        	<div class="mineNavL"><em>商城订单</em><span th:text="${noPayOrderCount}"></span></div>
+            <div class="mineNavC"><em>体检预约</em><span th:text="${appointmentCount}"></span></div>
+            <div class="mineNavR"><em>我的报告</em><span th:text="${queryExportCount}"></span></div>
+        </div>
+        <ul>
+        	<li class="yytj"><a href="/h5/buy/mypayedorders">预约体检</a></li>
+            <li class="bgcx"><a href="/h5/buy/completedorders">报告查询</a></li>
+        </ul>
+        <ul>
+        	<li class="scdd"><a href="####">商城订单</a></li>
+        </ul>
+        <ul>
+        	<li class="cjwt"><a href="####">常见问题</a></li>
+            <li class="xgmm"><a href="####">修改密码</a></li>
+        </ul>
+        <a href="####" class="tcdl">退出登录</a>
+    </div>
+</body>
+</html>