update bugs

xiaowei · xiaowei · commit 479bc9f159ae · 2015-09-11T17:39:53.000+08:00
diff --git a/src/main/java/com/changyu/foryou/controller/FoodController.java b/src/main/java/com/changyu/foryou/controller/FoodController.java
@@ -1386,4 +1386,28 @@ public Map<String, Object> addFoodCount(@RequestParam Integer campusId, @Request
 		}
 		return responseMap;
 	}
+	
+	@RequestMapping("/getDetailImg")
+	@ResponseBody
+	public Map<String,Object> getDetailImg(@RequestParam Integer campusId,@RequestParam Long foodId){
+		Map<String,Object> resultMap=new HashMap<String,Object>();
+		  
+		try {
+			Map<String,Object> paramMap=new HashMap<String,Object>();
+			paramMap.put("campusId",campusId);
+			paramMap.put("foodId",foodId);
+			
+			String imgs=foodService.getDetailImg(paramMap);
+			String[] detailImgs=imgs.split(",");
+			resultMap.put("imgs",detailImgs);
+			resultMap.put(Constants.STATUS,Constants.SUCCESS);
+			resultMap.put(Constants.MESSAGE, "获取成功");
+		} catch (Exception e) {
+			e.getStackTrace();
+			resultMap.put(Constants.STATUS, Constants.FAILURE);
+			resultMap.put(Constants.MESSAGE, "获取失败");
+		}
+		
+		return resultMap;
+	}
 }
diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java
@@ -1390,7 +1390,7 @@ public String getIpAddr(HttpServletRequest request){
 	 * @return
 	 */
 	@RequestMapping("/getRefundOrder")
-	public @ResponseBody List<SuperAdminOrder> getRefundOrder(Integer campusId,Integer type){
+	public @ResponseBody JSONArray getRefundOrder(Integer campusId,Integer type){
 		Map<String,Object> paramMap=new HashMap<String,Object>();
 				
 		if(type==1){
@@ -1402,7 +1402,7 @@ public String getIpAddr(HttpServletRequest request){
 		
 	    List<SuperAdminOrder> refundOrders=orderService.getPCOrders(paramMap);
 		System.out.println(refundOrders);
-	    return refundOrders;
+	    return JSONArray.parseArray(JSON.toJSONStringWithDateFormat(refundOrders, "yyyy-MM-dd"));
 	}
 	
 	/**
diff --git a/src/main/java/com/changyu/foryou/mapper/FoodMapper.java b/src/main/java/com/changyu/foryou/mapper/FoodMapper.java
@@ -54,4 +54,6 @@ public interface FoodMapper {
 	Integer addFoodCount(Map<String, Object> paramMap);
 
 	String getFoodHomeImage(Map<String, Object> paramMap);
+
+	String getDetailImg(Map<String, Object> paramMap);   //获取食品详情图片
 }
diff --git a/src/main/java/com/changyu/foryou/mapping/FoodMapper.xml b/src/main/java/com/changyu/foryou/mapping/FoodMapper.xml
@@ -547,5 +547,14 @@
 	    campus_id=#{campusId,jdbcType=INTEGER} and food_id=#{foodId,jdbcType=BIGINT}	
 	  limit 1
 	</select>
+	
+	<select id="getDetailImg" resultType="String">
+	  select
+	     info
+	  from food
+	  where
+	    campus_id=#{campusId,jdbcType=INTEGER} and food_id=#{foodId,jdbcType=BIGINT}	
+	  limit 1
+	</select>
 </mapper>
 
diff --git a/src/main/java/com/changyu/foryou/service/FoodService.java b/src/main/java/com/changyu/foryou/service/FoodService.java
@@ -112,4 +112,6 @@ public interface FoodService {
 	Integer addFoodCount(Map<String, Object> paramMap);//添加库存
 
 	String getFoodHomeImage(Map<String, Object> paramMap);  //获取原来的首页图片
+
+	String getDetailImg(Map<String, Object> paramMap);   //获取详情图片
 }
diff --git a/src/main/java/com/changyu/foryou/serviceImpl/FoodServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/FoodServiceImpl.java
@@ -288,6 +288,11 @@ public Integer addFoodCount(Map<String, Object> paramMap) {
 	public String getFoodHomeImage(Map<String, Object> paramMap) {
 		return foodMapper.getFoodHomeImage(paramMap);
 	}
+
+	@Override
+	public String getDetailImg(Map<String, Object> paramMap) {
+		return foodMapper.getDetailImg(paramMap);
+	}
 	
 }
 
diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html
@@ -2,7 +2,7 @@
 <html lang='en'>
 <meta charset='utf-8'>
 <head>
-	<title>foryou后台管理</title>
+	<title>For优后台管理</title>
 	<link rel='stylesheet' type='text/css' href='css/bootstrap.min.css'>
 	<link rel="shortcut icon" href="img/icon.png">
 	<script type='text/javascript' src="js/jquery-1.7.2.min.js"></script>
@@ -125,7 +125,7 @@
 
 				<div class="modal show" id="loginModal" aria-hidden="true">
 					<div class="modal-header">
-						<h2>foryou管理系统</h2>
+						<h2>For优管理平台</h2>
 					</div>
 					<div class="modal-body">
 						<form class="form-horizontal" >
@@ -165,7 +165,7 @@ <h2>foryou管理系统</h2>
 					<div class="modal-footer">
 						<div id="message" class="pull-left message"></div>
 						<button type="button" class="btn btn-primary" onclick="toLogin();">&nbsp;登录&nbsp;</button>
-						<a href="../foryou/user/forgetPassword.do" target="_blank"class="inline">Forget password?</a>
+						<!-- <a href="../foryou/user/forgetPassword.do" target="_blank"class="inline">Forget password?</a> -->
 					</div>
 				</div>
 			</div>
diff --git a/src/main/webapp/pages/food.html b/src/main/webapp/pages/food.html
@@ -194,13 +194,6 @@ <h3 class="modal-title" id="myModalLabel">添加商品</h3>
 									placeholder="foodCount">
 							</div>
 						</div>	
-						<!-- <div class="form-group">
-							<label class="control-label col-md-4" for="imgUrl3">商品详情图片</label>
-							<div class="col-md-8">
-								<input type="file" id="imgUrl3" name="myfile"
-									placeholder="Choose Picture">
-							</div>
-						</div> -->
 
 						<div class="form-group">
 							<label class="control-label col-md-4" for="status">商品状态</label>
@@ -234,26 +227,6 @@ <h3 class="modal-title" id="myModalLabel">添加商品</h3>
 								</label>
 							</div>
 						</div>
-						<!-- <div class="control-group" id="is_default">
-							<label class="control-label" for="default_special">是否使用默认口味</label>
-							<div class="controls" id="default_special">
-								<label class="radio inline"> <input type="radio"
-									id="default_special1" name="default_special" value="1" checked>
-									是
-								</label> <label class="radio inline"> <input type="radio"
-									id="default_special2" name="default_special" value="0">
-									否
-								</label>
-							</div>
-						</div>
-						<div class="control-group" id="foodCounts">
-							<label class="control-label" for="foodCount">默认口味数量</label>
-							<div class="controls">
-								<input type="text" id="foodCount" name="foodCount"
-									placeholder="Food Count">
-							</div>
-						</div>
-						 -->
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -336,21 +309,30 @@ <h4 class="modal-title" id="manageDetailImageModalLabel">
 			action="../service/uploadDetailImage.do">
 				<div class="modal-body">
 					<div class="editImage">
-						<img alt="正在加载中" width="100" height="50">
+						<img alt="正在加载中" id="showImg1" width="100" height="50">
 						<input type="file" id="detailImg1" name="detailImageFiles"
 									placeholder="Choose Picture">
 					</div>
+					<div class="form-group">
+					   <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
+					   <div class="col-sm-10">
+					     <input type="email" class="form-control" id="inputEmail3" placeholder="Email">
+					   </div>
+					 </div>
 					<br/>
 					<div class="editImage">
-						<img alt="正在加载中"  width="100" height="50">
+						<img alt="正在加载中" id="showImg2" width="100" height="50">
 						<input type="file" id="detailImg2" name="detailImageFiles"
 									placeholder="Choose Picture">
 					</div>
 					<br/>
 					<div class="editImage">
-						<img alt="正在加载中"  width="100" height="50">
+						<img alt="正在加载中" id="showImg3" width="100" height="50">
 						<input type="file" id="detailImg3" name="detailImageFiles"
 									placeholder="Choose Picture">
+						
+						<input type="checkbox" id="is_delete1" class="inline"  name="is_delete1"/> 删除
+						
 					</div>
 					</div>
 					<div class="modal-footer">
@@ -381,12 +363,6 @@ <h4 class="modal-title" id="addFoodCountModalLabel">添加库存</h4>
 								<input type="text" class="form-control" id="campus_id_add_count" name="campusId" readonly>
 							</div>
 						</div>
-						<!-- <div class="form-group">
-							<label for="food_id_add_count" class="control-label col-md-4">商品ID</label>
-							<div class="col-md-8">
-								<input type="text" class="form-control" id="food_id_add_count" name="foodId" readonly>
-							</div>
-						</div>-->
 						<div class="form-group">
 							<label for="count_add_count" class="control-label col-md-2">商品库存</label>
 							<div class="col-md-10">
@@ -957,7 +933,7 @@ <h3 class="modal-title" id="myModalLabel">编辑口味</h3>&nbsp;&nbsp;
 function detailImageManageFormatter(value, row, index){
 	if(adminType==0){
 		return [
-				'<a class="edit" href="javascript:void(0)" data-target="#manageDetailImageModal" data-toggle="modal" title="edit">',
+				'<a class="edit" href="javascript:void(0)" title="edit">',
 				'管理',
 				'</a>'
 			].join('');
@@ -968,9 +944,22 @@ <h3 class="modal-title" id="myModalLabel">编辑口味</h3>&nbsp;&nbsp;
 
 window.detailImageOperateEvents={
 	'click .edit' : function(e, value, row, index){
-		$("detailImg1").val("");
-		$("detailImg2").val("");
-		$("detailImg3").val("");
+		$("#detailImg1").val("");
+		$("#detailImg2").val("");
+		$("#detailImg3").val("");
+		$("#manageDetailImageModal").modal("show");
+
+		$.post(
+			'../service/getDetailImg.do',
+			{foodId:row.foodId,campusId:getCookie("campusId")},
+			function(data){
+			   var json=data.imgs;
+			   console.log(json.length);
+			  for (var i = json.length - 1; i >= 0; i--) {
+			  	 $("#showImg"+(i+1)).attr("src",json[i]);
+			  };
+			},"json"
+		);
 	}	
 };
 
diff --git a/src/main/webapp/pages/order_refund.html b/src/main/webapp/pages/order_refund.html
@@ -23,7 +23,7 @@
 <script src="../js/util.js"></script>
 <style type="text/css">
 	 .ml10 {
-        margin-top:10px;
+        margin-left:10px;
     }
 </style>
 </head>
diff --git a/src/main/webapp/pages/user.html b/src/main/webapp/pages/user.html
@@ -54,7 +54,7 @@ <h1>用户管理&nbsp;&nbsp;</h1>
 				data-side-pagination="server" data-pagination="true">
 				<thead>
 					<tr>
-						<th data-field="state" data-checkbox="true"></th>
+						<!-- <th data-field="state" data-checkbox="true"></th> -->
 						<th data-field="phone">手机号</th>
 						<th data-field="nickname">昵称</th>
 						<th data-field="type">权限</th>
@@ -93,10 +93,10 @@ <h1>用户管理&nbsp;&nbsp;</h1>
 			var type = "未定义";
 			switch (value) {
 			case 0:
-				type = "超级管理员";
+				type = "分派员";
 				break;
 			case 1:
-				type = "管理员";
+				type = "配送员";
 				break;
 			case 2:
 				type = "普通用户";
@@ -108,13 +108,13 @@ <h1>用户管理&nbsp;&nbsp;</h1>
 			if (adminType == 0) {
 				//当前角色是校区管理员
 				return [
-						'<a class="admin ml8" href="javascript:void(0)" title="设为管理员">',
+						'<a class="admin ml8" href="javascript:void(0)" title="设为配送员">',
 						'&nbsp;<i class="glyphicon glyphicon-heart-empty"></i>&nbsp;',
 						'</a>',
-						'<a class="common ml8" href="javascript:void(0)" title="取消管理员">',
+						'<a class="common ml8" href="javascript:void(0)" title="设为普通用户">',
 						'&nbsp;<i class="glyphicon glyphicon-user"></i>&nbsp;',
 						'</a>',
-						'<a class="superAdmin ml8" href="javascript:void(0)" title="设置超级管理员">',
+						'<a class="superAdmin ml8" href="javascript:void(0)" title="设置分派员">',
 						'&nbsp;<i class="glyphicon glyphicon-heart"></i>&nbsp;',
 						'</a>' ].join('');
 			} else if (adminType == 1) {

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,6 @@ public interface FoodMapper {`
`54`	`54`	`Integer addFoodCount(Map<String, Object> paramMap);`
`55`	`55`
`56`	`56`	`String getFoodHomeImage(Map<String, Object> paramMap);`
	`57`	`+`
	`58`	`+ String getDetailImg(Map<String, Object> paramMap); //获取食品详情图片`
`57`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,6 @@ public interface FoodService {`
`112`	`112`	`Integer addFoodCount(Map<String, Object> paramMap);//添加库存`
`113`	`113`
`114`	`114`	`String getFoodHomeImage(Map<String, Object> paramMap); //获取原来的首页图片`
	`115`	`+`
	`116`	`+ String getDetailImg(Map<String, Object> paramMap); //获取详情图片`
`115`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,11 @@ public Integer addFoodCount(Map<String, Object> paramMap) {`
`288`	`288`	`public String getFoodHomeImage(Map<String, Object> paramMap) {`
`289`	`289`	`return foodMapper.getFoodHomeImage(paramMap);`
`290`	`290`	`}`
	`291`	`+`
	`292`	`+ @Override`
	`293`	`+ public String getDetailImg(Map<String, Object> paramMap) {`
	`294`	`+ return foodMapper.getDetailImg(paramMap);`
	`295`	`+ }`
`291`	`296`
`292`	`297`	`}`
`293`	`298`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`<script src="../js/util.js"></script>`
`24`	`24`	`<style type="text/css">`
`25`	`25`	`.ml10 {`
`26`		`- margin-top:10px;`
	`26`	`+ margin-left:10px;`
`27`	`27`	`}`
`28`	`28`	`</style>`
`29`	`29`	`</head>`