Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
5d1a8aa43a

+ 7 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -278,7 +278,13 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/admin/servicesManage/copyright");
 		return modelview;
 	}
-
+	
+	@RequestMapping(value = "/admin/servicesManage/projectOrder", method = RequestMethod.GET)
+	public ModelAndView adminServiceManageProjectOrder(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/admin/servicesManage/projectOrder");
+		return modelview;
+	}
+	
 	@RequestMapping(value = "/admin/index", method = RequestMethod.GET)
 	public ModelAndView adminHome(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/admin/index");

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderMapper.java

@@ -89,5 +89,5 @@ public interface TOrderMapper {
 	 * @param orderId
 	 * @return
 	 */
-	List<TOrderDetail> selectOrderCommodity(@Param("orderId")String orderId);
+	List<TOrderDetail> selectOrderCommodity(@Param("orderNo")String orderNo);
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -686,7 +686,7 @@
   <select id="selectOrderCommodity" parameterType="java.lang.String" resultType="com.goafanti.common.model.TOrderDetail">
 		select
 			id,
-			order_id as orderId,
+			order_no as orderNo,
 			commodity_id as commodityId,
 			commodity_name as commodityName,
 			commodity_quantity as commodityQuantity,
@@ -697,6 +697,6 @@
 		from
 			t_order_detail
 		where
-			order_id = #{orderId,jdbcType=VARCHAR}
+			order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 </mapper>

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -128,6 +128,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();
+		tOrderDetail.setId(UUID.randomUUID().toString());
 		tOrderDetail.setOrderNo(orderNo);
 		tOrderDetail.setCommodityId(commodityId);
 		tOrderDetail.setCommodityName(bo.getCommodityName());
@@ -542,11 +543,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		List<TOrder> list = (List<TOrder>)data.getList();
 		C2BOrderDetailBo bo = null;
 		List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>(); 
-		List<CommodityDetailBo> commoditys = new ArrayList<CommodityDetailBo>();
+		List<CommodityDetailBo> commoditys = null;
 		CommodityDetailBo cdb = null;
 		if(list.size()>0){
 			for(TOrder t:list){
 				bo = new C2BOrderDetailBo();
+				commoditys = new ArrayList<CommodityDetailBo>();
 				bo.setOrderNo(String.valueOf(t.getOrderNo()));
 				bo.setOrderRemarks(t.getOrderRemarks());
 				bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/servicesManage/projectOrder.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>项目单管理</title>
+	<link th:href="${staticHost+'/admin/servicesManage/projectOrder.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/servicesManage/projectOrder.js'}"></script>
+	</div>
+</body>
+</html>