删除订单

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

@@ -153,4 +153,11 @@ public class H5BuyOrderController extends AbstractController{
 		model.addAttribute("orders", beans);
 		return "/h5/mypayedorders";
 	}
+	
+	@RequestMapping("/delorder/{id}")
+	public String delOrder(Model model, @PathVariable("id") Long id){
+		buyOrderService.delOrder(this.getH5User().getUser(), id);
+		return this.nopayorders(model);
+	}
+	
 }

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

@@ -54,4 +54,6 @@ public interface BuyOrderMapper {
 	
 	List<BuyOrderItem> queryRefundItems(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("start") Integer start, @Param("pageSize") Integer pageSize, @Param("search") String search);
 	Integer queryRefundItemCount(@Param("stime") Integer stime, @Param("etime") Integer etime, @Param("search") String search);
+
+	public int delBuyOrder(@Param("id") Long id);
 }

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

@@ -27,6 +27,7 @@ import com.zskk.shop.controller.bean.BuyUserBean;
 import com.zskk.shop.controller.bean.ControllerResult;
 import com.zskk.shop.controller.bean.FamilyPeopleBean;
 import com.zskk.shop.controller.bean.IncomeBean;
+import com.zskk.shop.controller.bean.UserBean;
 import com.zskk.shop.dao.BuyOrderMapper;
 import com.zskk.shop.dao.entry.BuyOrder;
 import com.zskk.shop.dao.entry.BuyOrderItem;
@@ -396,6 +397,15 @@ public class BuyOrderService {
 		return buyOrderMapper.queryRefundItemCount(stime, etime, search);
 	}
 	
+	public Integer delOrder(UserBean user, Long id){
+		BuyOrder order = this.queryBuyOrder(id);
+		if (order != null && order.getUid().equals(user.getUserid())){
+			return buyOrderMapper.delBuyOrder(id);
+		}else{
+			return 0;
+		}
+	}
+	
 	public List<IncomeBean> toIncomeBeans(List<BuyOrderItem> items, SimpleDateFormat format){
 		List<IncomeBean> beans = new ArrayList<>(items.size());
 		for (BuyOrderItem item: items){

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

@@ -20,13 +20,13 @@
 	<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
+		where uid=#{uid} and pay_status=0 and is_del=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
+		where uid=#{uid} and pay_status=0 and is_del=0
 		order by id desc
 	</select>
 	
@@ -171,4 +171,8 @@
 			)
 		</if>
 	</select>
+	
+	<update id="delBuyOrder" >
+		update buy_order set is_del=1 where id=#{id}
+	</update>
 </mapper>

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

@@ -34,7 +34,7 @@
                     <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="cancel" th:attr="href='javascript:delOrder(' + ${order.id} + ')'" >取消订单</a>
 					<a class="btnRed" th:attr="href='/h5/buy/gopay/' + ${order.id}">立即支付</a>
 				</p>
 			</div>
@@ -45,6 +45,14 @@
 	<div class="shopOrder_none" th:if="${orders.size() eq 0}">
 	    	<p>暂无有效订单</p>
 	        <p>如已购买请稍后刷新重试</p>
-	    </div>
+	 </div>
+	 
+	 <script>
+	 	function delOrder(id){
+	 		if (confirm("是否要删除订单吗?")){
+	 			window.location='/h5/buy/delorder/' + id;
+	 		}
+	 	}
+	 </script>
 </body>
 </html>