调整

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

@@ -22,8 +22,11 @@ import com.zskk.shop.controller.bean.BuyOrderBean;
 import com.zskk.shop.controller.bean.ControllerResult;
 import com.zskk.shop.controller.bean.UserBean;
 import com.zskk.shop.dao.entry.BuyOrder;
+import com.zskk.shop.dao.entry.BuyOrderItem;
 import com.zskk.shop.dao.entry.GoodBase;
 import com.zskk.shop.dao.entry.GoodPrice;
+import com.zskk.shop.exception.ErrorConstant;
+import com.zskk.shop.exception.ZSKKException;
 import com.zskk.shop.service.BuyOrderService;
 import com.zskk.shop.service.FamilyPeopleService;
 import com.zskk.shop.service.GoodService;
@@ -77,6 +80,29 @@ public class H5BuyOrderController extends AbstractController{
 		}
 	}
 	
+	@RequestMapping("/gopay/{bid}")
+	public String buy(Model model, @PathVariable("bid") Long bid){
+		BuyOrder buyOrder = buyOrderService.queryBuyOrder(bid);
+		if (buyOrder == null){
+			throw new ZSKKException(ErrorConstant.PARAM_ERROR);
+		}
+		List<BuyOrderItem> list = buyOrderService.queryBuyOrderItems(bid);
+		if (list.isEmpty()){
+			throw new ZSKKException(ErrorConstant.SERVER_ERROR);
+		}
+		Integer gid = list.get(0).getGid();
+		GoodBase goodBase = goodService.queryOneGoodBase(gid);
+		GoodPrice goodPrice = goodService.queryGoodPrice(gid);
+		
+		// 用户中心下H5 支付单
+		ControllerResult ucResult = userCenterService.createH5Pay(buyOrder, goodBase, goodPrice);
+		if (ucResult.getCode() == 0) {
+			return "redirect:" + ucResult.getObj().toString();
+		} else {
+			return "/h5/error";
+		}
+	}
+	
 	@RequestMapping("/paySuccess")
 	public String paySuccess(Model model){
 		return "/h5/";
@@ -114,4 +140,17 @@ public class H5BuyOrderController extends AbstractController{
 		model.addAttribute("orders", beans);
 		return "/h5/mypayedorders";
 	}
+	
+	@RequestMapping("nopayorders")
+	public String nopayorders(Model model){
+		UserBean userBean 			= this.getH5User().getUser();
+		List<BuyOrder> orders 		= buyOrderService.queryMyNoPayOrders(userBean.getUserid());
+		List<BuyOrderBean> beans 	= new ArrayList<>(orders.size());
+		for (BuyOrder order: orders){
+			BuyOrderBean bean = buyOrderService.toBuyOrderBean(order);
+			beans.add(bean);
+		}
+		model.addAttribute("orders", beans);
+		return "/h5/mypayedorders";
+	}
 }

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

@@ -122,7 +122,7 @@ public class UserCenterService {
 		params.put("apporderid", order.getOrderid());
 		params.put("name", goods.getName());
 		params.put("describe", goods.getDescribe());
-		params.put("money", price.getDiscountPrice().toString());
+		params.put("money", order.getTotalPrice().toString());
 		params.put("callback", myhost + "payed");
 		params.put("redirect", myhost + "h5/paySuccess");
 		params.put("extend", "");

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

@@ -25,7 +25,7 @@
             <li class="bgcx"><a href="/h5/buy/completedorders">报告查询</a></li>
         </ul>
         <ul>
-        	<li class="scdd"><a href="####">商城订单</a></li>
+        	<li class="scdd"><a href="/h5/buy/nopayorders">商城订单</a></li>
         </ul>
         <ul>
         	<li class="cjwt"><a href="####">常见问题</a></li>

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

@@ -24,7 +24,7 @@
 						<span></span>
 					</div>
 				</a>
-				<p>
+				<p th:if="${order.payStatus} eq 1">
 					<a th:if="${item.fa == null}" th:attr="href='/h5/appointment/goappointment/'+${item.bid}+'/'+${item.id}" class="btnBlue" >预约体检</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq -3}" href="#" class="btnBlue" >已退款</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btnBlue" >已取消</a>
@@ -33,6 +33,10 @@
                     <a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btnBlue" >体检结束(报告生成中)</a>
                     <a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btnBlue" target="_blank" >查看报告</a>
 				</p>
+				<p th:if="${order.payStatus} eq 0">
+					<a class="cancel">取消订单</a>
+					<a class="btnRed" th:attr="href='/h5/buy/gopay/' + ${order.id}">立即支付</a>
+				</p>
 			</div>
 		</div>
 	</div>