调整

shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
 import com.zskk.shop.controller.AbstractController;
 import com.zskk.shop.controller.bean.AccountBean;
 import com.zskk.shop.controller.bean.BuyOrderBean;
@@ -30,6 +31,7 @@ import com.zskk.shop.controller.bean.UserBean;
 import com.zskk.shop.controller.bean.UserInfoBean;
 import com.zskk.shop.dao.entry.BuyOrder;
 import com.zskk.shop.dao.entry.BuyOrderItem;
+import com.zskk.shop.dao.entry.FamilyPeople;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodPrice;
 import com.zskk.shop.exception.ErrorConstant;
@@ -37,7 +39,9 @@ import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.BuyOrderService;
 import com.zskk.shop.service.FamilyPeopleService;
 import com.zskk.shop.service.GoodService;
+import com.zskk.shop.service.TJCenterService;
 import com.zskk.shop.service.UserCenterService;
+import com.zskk.shop.service.beans.TjOrder;
 
 @Controller
 public class BuyOrderController extends AbstractController {
@@ -54,6 +58,9 @@ public class BuyOrderController extends AbstractController {
 	@Autowired
 	private FamilyPeopleService familyPeopleService;
 	
+	@Autowired
+	private TJCenterService tjCenterService;
+	
 	@RequestMapping("/mypayedorders")
 	public String myorders(Model model){
 		UserBean userBean			= this.getUser();
@@ -69,6 +76,25 @@ public class BuyOrderController extends AbstractController {
 		return "/mypayedorders";
 	}
 	
+	@RequestMapping("/tjorders")
+	@ResponseBody
+	public String tjorders(Model model){
+		UserBean userBean 			= this.getUser();
+		List<TjOrder> orders		= null;
+		List<FamilyPeople> peoples 	= familyPeopleService.queryMyPeoples(userBean.getUserid());
+		if (peoples.isEmpty()){
+			orders = new ArrayList<>(0);
+		}else{
+			List<String> phones 	    = new ArrayList<>(peoples.size());
+			for (FamilyPeople p:peoples){
+				phones.add(p.getPhone());
+			}
+			orders = tjCenterService.getTJOrders(userBean.getUserid(), phones);
+		}
+		model.addAttribute("orders", orders);
+		return JSON.toJSONString(orders);
+	}
+	
 	@RequestMapping("/completedorders")
 	public String completedorders(Model model){
 		UserBean userBean 		= this.getUser();

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

@@ -30,6 +30,7 @@ import com.zskk.shop.dao.entry.FamilyPeople;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.exception.ErrorConstant;
 import com.zskk.shop.exception.ZSKKException;
+import com.zskk.shop.service.beans.TjOrder;
 import com.zskk.shop.utils.HttpClient;
 import com.zskk.shop.utils.LogUtil;
 import com.zskk.shop.utils.SecretUtil;
@@ -45,6 +46,21 @@ public class TJCenterService {
 	
 	@Value("${zskk.myhost}")
 	private String myhost;
+	
+	public List<TjOrder> getTJOrders(String uid, List<String> phones){
+		Map<String, Object> data = new HashMap<>();
+		data.put("outer_key", uid);
+		data.put("phones", phones);
+		
+		String url = tjcenter + "public/api.php/shop/getOrderListByPhones";
+		String content = this.doPost(url, data);
+		JSONObject obj = JSON.parseObject(content);
+		if (obj.containsKey("code") && obj.getInteger("code").equals(1)) {
+			return obj.getJSONObject("data").getJSONArray("orders").toJavaList(TjOrder.class);
+		} else {
+			throw new ZSKKException(ErrorConstant.SERVER_ERROR);
+		}
+	}
 
 	/**
 	 * 获取详细
@@ -79,7 +95,7 @@ public class TJCenterService {
 	 */
 	public String appointment(FamilyPeople people, BuyOrder order, GoodBase good, String atime, String extend) {
 		// 调用体检系统 预约
-		Map<String, String> data = new HashMap<>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("outer_key", people.getId().toString());
 		data.put("role_name", people.getName());
 		data.put("cardtype", "身份证");
@@ -111,7 +127,7 @@ public class TJCenterService {
 	 * @param appointment
 	 */
 	public void cancelAppointment(FamilyPeople people, Appointment appointment){
-		Map<String, String> data = new HashMap<>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("id", appointment.getTjaid());
 		data.put("outer_key", people.getId().toString());
 		
@@ -142,7 +158,7 @@ public class TJCenterService {
 		}
 	}
 	
-	private String doPost(String url, Map<String, String> data){
+	private String doPost(String url, Map<String, Object> data){
 		String main 		= JSON.toJSONString(data);
 		String nonce		= UUID.randomUUID().toString().replaceAll("-", "");
 		String timestamp 	= ToolUtils.getNow().toString();

shop/src/main/java/com/zskk/shop/service/beans/TjOrder.java

@@ -0,0 +1,53 @@
+package com.zskk.shop.service.beans;
+
+public class TjOrder {
+	private Integer id;
+	private String phone;
+	private String package_name;
+	private String maketime;
+	private String signtime;
+	private String ole_name;
+	private Integer status;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+	public String getPackage_name() {
+		return package_name;
+	}
+	public void setPackage_name(String package_name) {
+		this.package_name = package_name;
+	}
+	public String getMaketime() {
+		return maketime;
+	}
+	public void setMaketime(String maketime) {
+		this.maketime = maketime;
+	}
+	public String getSigntime() {
+		return signtime;
+	}
+	public void setSigntime(String signtime) {
+		this.signtime = signtime;
+	}
+	public String getOle_name() {
+		return ole_name;
+	}
+	public void setOle_name(String ole_name) {
+		this.ole_name = ole_name;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+}