MyHtml.html

	食品一级分类Id	食品分类Id	分类名称
所属分类	推到首页	推到首页操作	首页食品	详情管理

-
- 校区ID -
- -
-

校区名称
- +
+ +
+ +
+

@@ -121,21 +123,21 @@
删除校区管理员

- + 校区ID
- +

校区名称
- +

校区管理员名称
- +

@@ -162,16 +164,24 @@
修改校区管理员

- 校区名称 -

- +
+ 校区名称 +
+
+ +
+ +
+

-

- 校区管理员 -

- +
+ 校区管理员 +
+

@@ -189,12 +199,10 @@
修改校区管理员
@@ -255,6 +260,18 @@
修改校区管理员
$(function() { $plusButton.click(function(){ + //初始化校区列表 + //清空校区列表 + $("#plus_campus_name").next().empty(); + $.getJSON("../campus/getAllCampus.do",function(data){ + for(var i=0; i'+data[i].campusName+''); + } + //为校区下拉列表项设置单击事件监听 + $("#plus_campus_name").next().children().click(function(){ + $("#span_plus_campus_name").text($(this).text()); + }); + }); $("#plusModal").modal('show'); }); @@ -266,10 +283,22 @@
修改校区管理员
} else if (array.length == 0) { alert("请先选中某条记录！"); } else { - $("#myModalLabel").text("编辑校区管理员"); + $("#span_edit_campus_name").text(array[0].campusName); + //初始化校区列表 + //首先清空上一次的请求生成的列表 + $("#edit_campus_name").next().empty(); + $.getJSON("../campus/getAllCampus.do",function(data){ + for(var i=0; i'+data[i].campusName+''); + } + //为校区下拉列表项设置单击事件监听 + $("#edit_campus_name").next().children().click(function(){ + $("#span_edit_campus_name").text($(this).text()); + }); + }); + + $("#edit_campus_admin").val(array[0].campusAdmin); $("#editModal").modal('show'); - $("#campus-id").val(array[0].campusId); - $("#campus-admin").val(array[0].campusAdmin); } }); @@ -281,10 +310,11 @@
修改校区管理员
} else if (array.length == 0) { alert("请先选中某条记录！"); } else { - $("#deleteModal").modal('show'); $("#delete_campus_id").val(array[0].campusId); $("#delete_campus_name").val(array[0].campusName); $("#delete_campus_admin").val(array[0].campusAdmin); + + $("#deleteModal").modal('show'); } }); }); diff --git a/src/main/webapp/pages/preferential.html b/src/main/webapp/pages/preferential.html new file mode 100644 index 0000000..47e6be2 --- /dev/null +++ b/src/main/webapp/pages/preferential.html @@ -0,0 +1,47 @@ + + + + +满减优惠管理 + + + + + +
+ + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 93dcedb0169ee9e4d9a5313810fce6fce365fa49 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Mon, 24 Aug 2015 18:43:13 +0800 Subject: [PATCH 091/132] add webhooks --- .../foryou/controller/OrderController.java | 27 +--- .../foryou/controller/PayController.java | 142 ++++++++++++++---- .../changyu/foryou/mapper/OrderMapper.java | 3 +- .../changyu/foryou/mapping/OrderMapper.xml | 18 +++ .../changyu/foryou/service/OrderService.java | 4 + .../foryou/serviceImpl/OrderServiceImpl.java | 14 +- src/test/java/com/changyu/test/event.json | 45 ++++++ src/test/java/com/changyu/test/orderTest.java | 75 +++++++++ 8 files changed, 267 insertions(+), 61 deletions(-) create mode 100644 src/test/java/com/changyu/test/event.json diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index 273da08..c09150c 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -518,7 +518,6 @@ public void setOrderService(OrderService orderService) { paramMap.put("orderId",orderString[0]); paramMap.put("phoneId",phoneId); Campus campus=campusService.getCampus(paramMap); //根据订单获取该校区的详细情况 - final Integer campusIdForPush=campus.getCampusId(); //判断该校区是否正在营业 if(campus.getStatus()==0){ map.put(Constants.STATUS, Constants.FAILURE); @@ -543,7 +542,7 @@ public void setOrderService(OrderService orderService) { ||(calendar.get(Calendar.HOUR_OF_DAY)==openHour&&calendar.get(Calendar.MINUTE) paramterMap=new HashMap(); - paramterMap.put("campusId",campusIdForPush); - List superPhones=userService.getAllSuperAdminPhone(paramterMap); - for(String phone:superPhones){ - - //推送 - pushService.sendPush(phone,"一笔新的订单已经到达，请前往选单中查看，并尽早分派配送员进行配送。for优。", 1); - } - } - }).start(); - - } else { map.put(Constants.STATUS, Constants.FAILURE); map.put(Constants.MESSAGE, "下单失败，请重新开始下单"); diff --git a/src/main/java/com/changyu/foryou/controller/PayController.java b/src/main/java/com/changyu/foryou/controller/PayController.java index 01758ae..4b96f05 100644 --- a/src/main/java/com/changyu/foryou/controller/PayController.java +++ b/src/main/java/com/changyu/foryou/controller/PayController.java @@ -3,6 +3,9 @@ import java.io.BufferedReader; import java.io.IOException; import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -13,62 +16,139 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.alibaba.fastjson.JSON; +import com.changyu.foryou.service.OrderService; import com.changyu.foryou.service.PayService; +import com.changyu.foryou.service.PushService; +import com.changyu.foryou.service.UserService; +import com.pingplusplus.exception.APIConnectionException; +import com.pingplusplus.exception.APIException; +import com.pingplusplus.exception.AuthenticationException; +import com.pingplusplus.exception.ChannelException; +import com.pingplusplus.exception.InvalidRequestException; +import com.pingplusplus.model.Charge; import com.pingplusplus.model.Event; import com.pingplusplus.model.Webhooks; @Controller @RequestMapping("/pay") public class PayController { - private PayService payService; + private PayService payService; + private OrderService orderService; + private UserService userService; + private PushService pushService; + + public PushService getPushService() { + return pushService; + } + + public void setPushService(PushService pushService) { + this.pushService = pushService; + } - private static final Logger LOGGER = Logger + private static final Logger LOGGER = Logger .getLogger(PayController.class); public PayService getPayService() { return payService; } + public OrderService getOrderService() { + return orderService; + } + + public UserService getUserService() { + return userService; + } + + @Autowired + public void setUserService(UserService userService) { + this.userService = userService; + } + + @Autowired + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + @Autowired public void setPayService(PayService payService) { this.payService = payService; } - - /*@RequestMapping("/paytest") + + /*@RequestMapping("/paytest") public @ResponseBody Map payTest(String togetherId,Integer amount){ Map resultMap=new HashMap(); Charge charge=ChargeInterface.charge(togetherId, amount); resultMap.put("charge", charge); return resultMap; }*/ - + @RequestMapping("/payWebHooksForSuccess") - public void webHooksForPaySuccess(HttpServletRequest request, HttpServletResponse response) throws IOException{ + public void webHooksForPaySuccess(HttpServletRequest request, HttpServletResponse response) throws IOException, AuthenticationException, InvalidRequestException, APIConnectionException, APIException, ChannelException{ request.setCharacterEncoding("UTF8"); - + //获取头部所有信息 - Enumeration headerNames = request.getHeaderNames(); - while (headerNames.hasMoreElements()) { - String key = (String) headerNames.nextElement(); - String value = request.getHeader(key); - System.out.println(key+" "+value); - } - // 获得 http body 内容 - BufferedReader reader = request.getReader(); - StringBuffer buffer = new StringBuffer(); - String string; - while ((string = reader.readLine()) != null) { - buffer.append(string); - } - reader.close(); - // 解析异步通知数据 - Event event = Webhooks.eventParse(buffer.toString()); - if ("charge.succeeded".equals(event.getType())) { - LOGGER.info(JSON.toJSONString(event)); //打印返回的数据 - response.setStatus(200); - } else if ("refund.succeeded".equals(event.getType())) { - response.setStatus(200); - } else { - response.setStatus(500); - } + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String key = (String) headerNames.nextElement(); + String value = request.getHeader(key); + System.out.println(key+" "+value); + } + // 获得 http body 内容 + BufferedReader reader = request.getReader(); + StringBuffer buffer = new StringBuffer(); + String string; + while ((string = reader.readLine()) != null) { + buffer.append(string); + } + reader.close(); + // 解析异步通知数据 + Event event = Webhooks.eventParse(buffer.toString()); + if ("charge.succeeded".equals(event.getType())) { //支付的回调 + + doPaySuccess(buffer.toString()); //事务处理 + response.setStatus(200); + } else if ("refund.succeeded".equals(event.getType())) { //退款的回调 + response.setStatus(200); + } else { + response.setStatus(500); + } + } + + public int doPaySuccess(String buffer){ + Charge charge = (Charge)Webhooks.parseEvnet(buffer); + + System.out.println(JSON.toJSONString(charge)); + //获得charge对象 + Map paramMap=new HashMap(); + + paramMap.put("togetherId",charge.getOrderNo()); + paramMap.put("amount",charge.getAmount()*1.0/100); + + System.out.println(paramMap); + int flag=orderService.updateOrderStatusAndAmount(paramMap); //支付完成后更新订单状态以及更新价格 + System.out.println("更新数据"+flag); + + final Integer campusId=orderService.getCampusIdByTogetherId(paramMap); + // 开启线程去访问极光推送 + + new Thread(new Runnable() { + + @Override public void run() { //向超级管理员推送，让其分发订单 + + //推送 + //pushService.sendPushByTag("0","一笔新的订单已经到达，请前往选单中查看，并尽早分派配送员进行配送。For优。", 1); + + Map paramterMap=new HashMap(); + paramterMap.put("campusId",campusId); + List superPhones=userService.getAllSuperAdminPhone(paramterMap); + for(String phone:superPhones){ + + //推送 + pushService.sendPush(phone,"一笔新的订单已经到达，请前往选单中查看，并尽早分派配送员进行配送。for优。", 1); + } + } + }).start(); + return flag; } + } diff --git a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java index e196f45..13403f8 100644 --- a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java +++ b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java @@ -104,6 +104,7 @@ public interface OrderMapper { Integer updateOrderPrice(Map paramMap); - + int updateOrderStatusAndAmount(Map paramMap); //支付成功后更新订单和价格 + Integer getCampusIdByTogetherId(Map paramMap); //获取某笔订单的校区号 } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml index c57b8ea..4bb3866 100644 --- a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml @@ -871,4 +871,22 @@ where order_id=#{orderId} + + + update + orders + set total_price=#{amount,jdbcType=REAL}, + status=2 + where together_id=#{togetherId,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/OrderService.java b/src/main/java/com/changyu/foryou/service/OrderService.java index 353a859..a1c3245 100644 --- a/src/main/java/com/changyu/foryou/service/OrderService.java +++ b/src/main/java/com/changyu/foryou/service/OrderService.java @@ -104,6 +104,10 @@ public interface OrderService { Integer updateOrder(Order order); + int updateOrderStatusAndAmount(Map paramMap); + + Integer getCampusIdByTogetherId(Map paramMap); + diff --git a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java index c1b3c6e..325bca5 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java @@ -232,7 +232,6 @@ public String getAdminPhone(Map requestMap) { @Override public Preferential getPreferentialById(Integer preferentialId) { - // TODO Auto-generated method stub return preferentialMapper.selectByPrimaryKey(preferentialId); } @@ -247,22 +246,29 @@ public void setPreferentialMapper(PreferentialMapper preferentialMapper) { @Override public List getPreferential(Map paramMap) { - // TODO Auto-generated method stub return preferentialMapper.getPreferential(paramMap); } @Override public Integer updateOrderPrice(Map paramMap) { - // TODO Auto-generated method stub return orderMapper.updateOrderPrice(paramMap); } @Override public Integer updateOrder(Order order) { - // TODO Auto-generated method stub return orderMapper.updateByPrimaryKeySelective(order); } + @Override + public int updateOrderStatusAndAmount(Map paramMap) { + return orderMapper.updateOrderStatusAndAmount(paramMap); + } + + @Override + public Integer getCampusIdByTogetherId(Map paramMap) { + return orderMapper.getCampusIdByTogetherId(paramMap); + } + diff --git a/src/test/java/com/changyu/test/event.json b/src/test/java/com/changyu/test/event.json new file mode 100644 index 0000000..fa62c72 --- /dev/null +++ b/src/test/java/com/changyu/test/event.json @@ -0,0 +1,45 @@ +{ + "id": "evt_ugB6x3K43D16wXCcqbplWAJo", + "created": 1427555101, + "livemode": true, + "type": "charge.succeeded", + "data": { + "object": { + "id": "ch_Xsr7u35O3m1Gw4ed2ODmi4Lw", + "object": "charge", + "created": 1427555076, + "livemode": true, + "paid": true, + "refunded": false, + "app": "app_1Gqj58ynP0mHeX1q", + "channel": "upacp", + "order_no": "188965548801440400103925", + "client_ip": "127.0.0.1", + "amount": 100, + "amount_settle": 0, + "currency": "cny", + "subject": "Your Subject", + "body": "Your Body", + "extra": {}, + "time_paid": 1427555101, + "time_expire": 1427641476, + "time_settle": null, + "transaction_no": "1224524301201505066067849274", + "refunds": { + "object": "list", + "url": "/v1/charges/ch_L8qn10mLmr1GS8e5OODmHaL4/refunds", + "has_more": false, + "data": [] + }, + "amount_refunded": 0, + "failure_code": null, + "failure_msg": null, + "metadata": {}, + "credential": {}, + "description": null + } + }, + "object": "event", + "pending_webhooks": 0, + "request": "iar_qH4y1KbTy5eLGm1uHSTS00s" +} \ No newline at end of file diff --git a/src/test/java/com/changyu/test/orderTest.java b/src/test/java/com/changyu/test/orderTest.java index dd9c780..87c810f 100644 --- a/src/test/java/com/changyu/test/orderTest.java +++ b/src/test/java/com/changyu/test/orderTest.java @@ -2,6 +2,11 @@ import static org.junit.Assert.assertEquals; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.InputStream; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -28,6 +33,9 @@ import com.changyu.foryou.service.PushService; import com.changyu.foryou.service.UserService; import com.changyu.foryou.tools.Constants; +import com.pingplusplus.model.Charge; +import com.pingplusplus.model.Event; +import com.pingplusplus.model.Webhooks; @RunWith(SpringJUnit4ClassRunner.class) @@ -306,4 +314,71 @@ public void testGetUserPhoneAndAdminPhoneByTogetherId(){ } + /** + * 测试更新订单的总价和状态 + */ + @Test + public void updateOrderStatusAndAmount(){ + Map paramMap=new HashMap(); + + paramMap.put("togetherId", "153651867351430139990413"); + + paramMap.put("amount",300*1.0/100); + int flag=orderService.updateOrderStatusAndAmount(paramMap); + System.out.println(flag); + } + + /** + * 测试更新订单的总价和状态 + */ + @Test + public void testWebHooks(){ + String path=this.getClass().getResource("/").getPath(); + System.out.println(path); + StringBuffer stringBuffer=new StringBuffer(); + try { + File file = new File(path + "com/changyu/test/event.json"); + BufferedReader br = new BufferedReader(new FileReader(file)); + String temp = br.readLine(); + while (temp != null) { + stringBuffer.append(temp); + temp = br.readLine(); + } + br.close(); + } + catch(Exception e){ + e.printStackTrace(); + } + + Charge charge = (Charge)Webhooks.parseEvnet(stringBuffer.toString()); + System.out.println(charge.toString()); + + Map paramMap=new HashMap(); + paramMap.put("togetherId",charge.getOrderNo()); + paramMap.put("amount",charge.getAmount()*1.0/100); + + System.out.println(paramMap); + int flag=orderService.updateOrderStatusAndAmount(paramMap); //支付完成后更新订单状态以及更新价格 + System.out.println("更新数据"+flag); + + final Integer campusId=orderService.getCampusIdByTogetherId(paramMap); + // 开启线程去访问极光推送 + + new Thread(new Runnable(){ + @Override public void run() { //向超级管理员推送，让其分发订单 + + //推送 + //pushService.sendPushByTag("0","一笔新的订单已经到达，请前往选单中查看，并尽早分派配送员进行配送。For优。", 1); + + Map paramterMap=new HashMap(); + paramterMap.put("campusId",campusId); + List superPhones=userService.getAllSuperAdminPhone(paramterMap); + for(String phone:superPhones){ + + //推送 + pushService.sendPush(phone,"一笔新的订单已经到达，请前往选单中查看，并尽早分派配送员进行配送。for优。", 1); + } + } + }).start(); + } } From 868495ee85871c3bb77f9096264fc2a44af8075c Mon Sep 17 00:00:00 2001 From: xiaowei Date: Tue, 25 Aug 2015 15:08:38 +0800 Subject: [PATCH 092/132] u --- .../foryou/controller/OrderController.java | 12 ++- .../foryou/controller/UserController.java | 2 +- .../changyu/foryou/mapper/OrderMapper.java | 2 + .../changyu/foryou/mapping/OrderMapper.xml | 14 ++- .../changyu/foryou/mapping/UsersMapper.xml | 3 +- .../com/changyu/foryou/model/CartGood.java | 2 - .../changyu/foryou/service/OrderService.java | 4 +- .../foryou/serviceImpl/OrderServiceImpl.java | 86 +++++++++++++------ .../foryou/serviceImpl/SellerServiceImpl.java | 5 ++ .../changyu/foryou/tools/JpushInterface.java | 6 +- src/test/java/com/changyu/test/orderTest.java | 15 ++++ 11 files changed, 111 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index c09150c..2f70d4b 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -518,6 +518,7 @@ public void setOrderService(OrderService orderService) { paramMap.put("orderId",orderString[0]); paramMap.put("phoneId",phoneId); Campus campus=campusService.getCampus(paramMap); //根据订单获取该校区的详细情况 + Integer campusId=campus.getCampusId(); //判断该校区是否正在营业 if(campus.getStatus()==0){ map.put(Constants.STATUS, Constants.FAILURE); @@ -560,7 +561,14 @@ public void setOrderService(OrderService orderService) { map.put(Constants.MESSAGE,message2.toString()); return map; } + DecimalFormat df = new DecimalFormat("####.0"); + Float serverPrice=orderService.getPriceDiscounted(orderString,campusId,phoneId); + if(Math.abs(serverPrice-totalPrice)>=1){ //判断客户端价格和服务器端价格是否一致 + map.put(Constants.STATUS,Constants.FAILURE); + map.put(Constants.MESSAGE,"价格有误"); + return map; + } //写入单价操作 for (String id : orderString) { float price=(float) 0.0; @@ -592,13 +600,13 @@ public void setOrderService(OrderService orderService) { }else{ channel="wx"; } - DecimalFormat df = new DecimalFormat("0.0"); + if (flag != -1 && flag != 0) { map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "下单成功，即将开始配送！"); String clientIp=getIpAddr(request); - map.put("charge", ChargeInterface.charge(channel,togetherId,(int)(totalPrice*100),clientIp)); //支付 + map.put("charge", ChargeInterface.charge(channel,togetherId,(int)(Float.parseFloat(df.format(totalPrice))*100),clientIp)); //支付 map.put("totalPrice",df.format(totalPrice)); } else { map.put(Constants.STATUS, Constants.FAILURE); diff --git a/src/main/java/com/changyu/foryou/controller/UserController.java b/src/main/java/com/changyu/foryou/controller/UserController.java index 6961e51..a396124 100644 --- a/src/main/java/com/changyu/foryou/controller/UserController.java +++ b/src/main/java/com/changyu/foryou/controller/UserController.java @@ -322,7 +322,7 @@ Map resetPassword(@RequestParam String phone, try { Map paramMap = new HashMap(); Users users=userService.selectByUsername(phone); - Map counts=orderService.getOrderSummaryCount(phone); + //Map counts=orderService.getOrderSummaryCount(phone); paramMap.put("phoneId", phone); paramMap.put("status", 1); List togetherId1=orderService.getTogetherId(paramMap); diff --git a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java index 13403f8..ae8731f 100644 --- a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java +++ b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java @@ -107,4 +107,6 @@ public interface OrderMapper { int updateOrderStatusAndAmount(Map paramMap); //支付成功后更新订单和价格 Integer getCampusIdByTogetherId(Map paramMap); //获取某笔订单的校区号 + + CartGood getOrderByOrderId(Map paramMap); //获取某笔小订单 } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml index 4bb3866..bd7bc12 100644 --- a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml @@ -612,7 +612,7 @@ set admin_phone=#{adminPhone,jdbcType=VARCHAR} where together_id= - #{togetherId,jdbcType=VARCHAR} and status = 1 + #{togetherId,jdbcType=VARCHAR} and status = 2 @@ -889,4 +889,16 @@ where together_id=#{togetherId,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml b/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml index e6275f2..890eadc 100644 --- a/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml @@ -32,7 +32,8 @@ from users,receiver where users.phone = #{phone,jdbcType=VARCHAR} and receiver.phone_id=users.phone - AND receiver.tag=0 + AND receiver.tag=0 + limit 1 delete from users diff --git a/src/main/java/com/changyu/foryou/model/CartGood.java b/src/main/java/com/changyu/foryou/model/CartGood.java index 0bca05d..650cad5 100644 --- a/src/main/java/com/changyu/foryou/model/CartGood.java +++ b/src/main/java/com/changyu/foryou/model/CartGood.java @@ -21,13 +21,11 @@ public class CartGood { private Short isFullDiscount; - //private Integer foodSpecial; private Long foodId; private String imageUrl; - //private String specialName; private Integer foodCount; diff --git a/src/main/java/com/changyu/foryou/service/OrderService.java b/src/main/java/com/changyu/foryou/service/OrderService.java index a1c3245..a175894 100644 --- a/src/main/java/com/changyu/foryou/service/OrderService.java +++ b/src/main/java/com/changyu/foryou/service/OrderService.java @@ -108,9 +108,7 @@ public interface OrderService { Integer getCampusIdByTogetherId(Map paramMap); - - - + Float getPriceDiscounted(String[] orderId,int campusId,String phoneId); } diff --git a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java index 325bca5..f747f4b 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java @@ -9,17 +9,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.alibaba.fastjson.JSON; import com.changyu.foryou.mapper.OrderMapper; import com.changyu.foryou.mapper.PreferentialMapper; -import com.changyu.foryou.model.BigOrder; -import com.changyu.foryou.model.Campus; import com.changyu.foryou.model.CartGood; import com.changyu.foryou.model.DeliverChildOrder; import com.changyu.foryou.model.DeliverOrder; import com.changyu.foryou.model.Order; import com.changyu.foryou.model.PCOrder; import com.changyu.foryou.model.Preferential; -import com.changyu.foryou.model.Receiver; import com.changyu.foryou.model.SmallOrder; import com.changyu.foryou.model.SuperAdminOrder; import com.changyu.foryou.service.OrderService; @@ -38,7 +36,16 @@ public OrderMapper getOrderMapper() { public void setOrderMapper(OrderMapper orderMapper) { this.orderMapper = orderMapper; } + + @Autowired + public void setPreferentialMapper(PreferentialMapper preferentialMapper) { + this.preferentialMapper = preferentialMapper; + } + public List getPreferential(Map paramMap) { + return preferentialMapper.getPreferential(paramMap); + } + public List getOrderList(Map paramMap) { return orderMapper.getOrderListByPhone(paramMap); } @@ -183,54 +190,44 @@ public int setOrderInvalid(Map parameterMap) { return orderMapper.setOrderInvalid(parameterMap); } - @Override public List selectOrdersByDate(Map paramMap) { return orderMapper.selectOrdersByDate(paramMap); } - @Override public List getAllChildOrders( Map paramMap) { return orderMapper.getAllChildOrder(paramMap); } - @Override public Date getTogetherDate(Map paramMap) { return orderMapper.getTogetherDate(paramMap); } - @Override public List getOrdersById(Map paramMap) { return orderMapper.getOrdersById(paramMap); } - @Override public Integer modifyOrderStatus(Map paramMap) { return orderMapper.modifyOrderStatus(paramMap); } - @Override public void deleteOrder(Map paramMap) { orderMapper.deleteOrder(paramMap); } - @Override public SmallOrder getOrderById(Map paramMap) { return orderMapper.getOrderById(paramMap); } - @Override public String getUserPhone(Map requestMap) { return orderMapper.getUserPhone(requestMap); } - @Override public String getAdminPhone(Map requestMap) { return orderMapper.getAdminPhone(requestMap); } - @Override public Preferential getPreferentialById(Integer preferentialId) { return preferentialMapper.selectByPrimaryKey(preferentialId); } @@ -239,36 +236,71 @@ public PreferentialMapper getPreferentialMapper() { return preferentialMapper; } - @Autowired - public void setPreferentialMapper(PreferentialMapper preferentialMapper) { - this.preferentialMapper = preferentialMapper; - } - - @Override - public List getPreferential(Map paramMap) { - return preferentialMapper.getPreferential(paramMap); - } + - @Override public Integer updateOrderPrice(Map paramMap) { return orderMapper.updateOrderPrice(paramMap); } - @Override public Integer updateOrder(Order order) { return orderMapper.updateByPrimaryKeySelective(order); } - @Override public int updateOrderStatusAndAmount(Map paramMap) { return orderMapper.updateOrderStatusAndAmount(paramMap); } - @Override + /** + * 获取某笔订单的校区状态 + * @param paramMap + * @return + */ public Integer getCampusIdByTogetherId(Map paramMap) { return orderMapper.getCampusIdByTogetherId(paramMap); } - + + // + public Float getPriceDiscounted(String[] orderId,int campusId,String phoneId){ + //获取满减的信息 + Map paramMap=new HashMap(); + paramMap.put("campusId",campusId); + paramMap.put("phoneId", phoneId); + System.out.println(paramMap); + List prefers = getPreferential(paramMap); + + System.out.println(JSON.toJSONString(prefers)); + Float discountPrice=0f; //折扣之后的总价 + Float fullDiscount=0f; //满减商品之后的总价 + System.out.println(JSON.toJSONString(orderId)); + for (String id : orderId) { + paramMap.put("orderId",Long.parseLong(id)); + Float price = 0f; //temp + CartGood order=orderMapper.getOrderByOrderId(paramMap); + System.out.println("order is"+JSON.toJSONString(order)); + if(order.getIsDiscount()==1){ + System.out.println(order.getDiscountPrice()); + price = order.getOrderCount()*order.getDiscountPrice(); + }else{ + price = order.getOrderCount()*order.getPrice(); + } + + if(order.getIsFullDiscount()==1){ + fullDiscount+=price; + } + + discountPrice+=price; + } + + Integer discount=0; + for (Preferential preferential : prefers) { + if(fullDiscount>preferential.getNeedNumber()){ + discount=preferential.getDiscountNum(); + break; + } + } + return discountPrice-discount; + } + diff --git a/src/main/java/com/changyu/foryou/serviceImpl/SellerServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/SellerServiceImpl.java index d56ddd0..2dedaab 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/SellerServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/SellerServiceImpl.java @@ -9,6 +9,11 @@ import com.changyu.foryou.model.Sellers; import com.changyu.foryou.service.SellerService; +/** + * 商家账号管理 + * @author xiaowei + * + */ @Service("sellerService") public class SellerServiceImpl implements SellerService { diff --git a/src/main/java/com/changyu/foryou/tools/JpushInterface.java b/src/main/java/com/changyu/foryou/tools/JpushInterface.java index a9021c7..e37d8e3 100644 --- a/src/main/java/com/changyu/foryou/tools/JpushInterface.java +++ b/src/main/java/com/changyu/foryou/tools/JpushInterface.java @@ -20,7 +20,7 @@ public static PushPayload buildPushObject_all_all_alert(String message) { .setNotification(Notification.alert(message)) .setMessage(Message.newBuilder() .setMsgContent(message) - .addExtra("from", "mickey") + .addExtra("from", "foryou") .build()) .build(); } @@ -35,7 +35,7 @@ public static PushPayload buildPushObject_android_and_ios_alias_alert(String ale .setOptions(Options.newBuilder().setApnsProduction(true).build()) .setMessage(Message.newBuilder() .setMsgContent(alertString) - .addExtra("from", "mickey") + .addExtra("from", "foryou") .build()) .build(); } @@ -50,7 +50,7 @@ public static PushPayload buildPushObject_android_and_ios_tag_alert( .setOptions(Options.newBuilder().setApnsProduction(false).build()) .setMessage(Message.newBuilder() .setMsgContent(message) - .addExtra("from", "mickey") + .addExtra("from", "foryou") .build()) .build(); } diff --git a/src/test/java/com/changyu/test/orderTest.java b/src/test/java/com/changyu/test/orderTest.java index 87c810f..1796cf0 100644 --- a/src/test/java/com/changyu/test/orderTest.java +++ b/src/test/java/com/changyu/test/orderTest.java @@ -24,6 +24,7 @@ import com.alibaba.fastjson.JSON; import com.changyu.foryou.model.Campus; import com.changyu.foryou.model.Order; +import com.changyu.foryou.model.Preferential; import com.changyu.foryou.model.SmallOrder; import com.changyu.foryou.model.TogetherOrder; import com.changyu.foryou.payment.ChargeInterface; @@ -381,4 +382,18 @@ public void testWebHooks(){ } }).start(); } + + @Test + public void testCalcularPrice(){ + String[] orderIds={ + "2429775447983","1488888888888","1477777777777" + }; + Map paramMap=new HashMap(); + paramMap.put("campusId", 1); + paramMap.put("phoneId", "18896554880"); + + Float price=orderService.getPriceDiscounted(orderIds,1,"18896554880"); + //List prefers = orderService.getPreferential(paramMap); + System.out.println(price); + } } From 9824b34676eb53e9bf2d18e6c752fba3fcddd695 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Tue, 25 Aug 2015 17:11:22 +0800 Subject: [PATCH 093/132] udpate refund refund --- .../foryou/controller/OrderController.java | 24 +++++++++++++++++++ .../changyu/foryou/mapper/OrderMapper.java | 2 ++ .../changyu/foryou/mapping/OrderMapper.xml | 8 +++++++ .../changyu/foryou/service/OrderService.java | 2 ++ .../foryou/serviceImpl/OrderServiceImpl.java | 5 ++++ 5 files changed, 41 insertions(+) diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index 2f70d4b..6e71432 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -1325,4 +1325,28 @@ public String getIpAddr(HttpServletRequest request){ } return ip; } + + @RequestMapping("/cancelOrderWithRefund") + public @ResponseBody Map cancelOrderWithRefund(String togetherId){ + Map map=new HashMap(); + + try { + Map paramMap=new HashMap(); + paramMap.put("togetherId", togetherId); + + Integer flag=orderService.cancelOrderWithRefund(paramMap); + if(flag!=-1){ + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE,"取消订单成功，退款受理中，请耐心等待"); + }else{ + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE,"取消订单失败，请重试"); + } + } catch (Exception e) { + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE,"取消订单失败，请重试"); + } + + return map; + } } diff --git a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java index ae8731f..a2ad224 100644 --- a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java +++ b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java @@ -109,4 +109,6 @@ public interface OrderMapper { Integer getCampusIdByTogetherId(Map paramMap); //获取某笔订单的校区号 CartGood getOrderByOrderId(Map paramMap); //获取某笔小订单 + + Integer cancelOrderWithRefund(Map paramMap); } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml index bd7bc12..0309243 100644 --- a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml @@ -901,4 +901,12 @@ and order_id=#{orderId,jdbcType=BIGINT} and phone = #{phoneId,jdbcType=VARCHAR} + + update + orders + set + status=9 + where + together_id=#{togetherId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/OrderService.java b/src/main/java/com/changyu/foryou/service/OrderService.java index a175894..939cfcb 100644 --- a/src/main/java/com/changyu/foryou/service/OrderService.java +++ b/src/main/java/com/changyu/foryou/service/OrderService.java @@ -110,5 +110,7 @@ public interface OrderService { Float getPriceDiscounted(String[] orderId,int campusId,String phoneId); + Integer cancelOrderWithRefund(Map paramMap); + } diff --git a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java index f747f4b..6fc753b 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java @@ -300,6 +300,11 @@ public Float getPriceDiscounted(String[] orderId,int campusId,String phoneId){ } return discountPrice-discount; } + + @Override + public Integer cancelOrderWithRefund(Map paramMap) { + return orderMapper.cancelOrderWithRefund(paramMap); + } From dd69fc72d115be0e11d881be70fdb0bfe0b8bb45 Mon Sep 17 00:00:00 2001 From: SimonsunDev Date: Tue, 25 Aug 2015 17:28:16 +0800 Subject: [PATCH 094/132] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foryou/controller/OrderController.java | 93 ++++++++----------- .../foryou/controller/UserController.java | 2 +- .../changyu/foryou/mapper/OrderMapper.java | 5 +- .../changyu/foryou/mapping/OrderMapper.xml | 74 +++++++-------- .../changyu/foryou/mapping/UsersMapper.xml | 5 +- .../foryou/model/DeliverChildOrder.java | 2 +- .../java/com/changyu/foryou/model/Users.java | 10 ++ .../changyu/foryou/service/OrderService.java | 8 +- .../changyu/foryou/service/UserService.java | 2 +- .../foryou/serviceImpl/OrderServiceImpl.java | 30 ++---- src/main/webapp/index.html | 34 ++++--- src/main/webapp/login.html | 10 +- src/test/java/com/changyu/test/userTest.java | 7 +- 13 files changed, 139 insertions(+), 143 deletions(-) diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index 273da08..8a05ea6 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -163,7 +163,7 @@ public void setOrderService(OrderService orderService) { paramMap.put("offset", (page - 1) * limit); } List togetherIds = orderService.getTogetherId(paramMap); - + System.out.println(JSON.toJSONString(togetherIds)); if (togetherIds.size() != 0) { @@ -196,7 +196,8 @@ public void setOrderService(OrderService orderService) { .getTogetherDate()); togetherOrdersList.add(togetherOrder); } - + + map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "获取订单成功"); map.put("orderList", JSON.parse(JSON @@ -786,35 +787,18 @@ public void setOrderService(OrderService orderService) { Map requestMap = new HashMap(); requestMap.put("isSelected", isSelected); requestMap.put("campusId", campusId); - + requestMap.put("tag", 1); //订单有效 + requestMap.put("status", 2); //2，待确认 + //System.out.println(isSelected); if (page != null && limit != null) { requestMap.put("limit", limit); requestMap.put("offset", (page - 1) * limit); - } else { - - } + } + try { List orders = orderService .superAdminGetOrder(requestMap); - for (SuperAdminOrder superAdminOrder : orders) { - String togetherId = superAdminOrder.getTogetherId(); - - List deliverChildOrders = orderService - .getDeliverChildOrders(togetherId); - Float priceFloat = 0f; - - // 获取该笔订单总价 - for (DeliverChildOrder deliverChildOrder : deliverChildOrders) { - if (deliverChildOrder.getIsDiscount() == 0) { - priceFloat += deliverChildOrder.getPrice() - * deliverChildOrder.getOrderCount(); - } else { - priceFloat += deliverChildOrder.getDiscountPrice() - * deliverChildOrder.getOrderCount(); - } - } - superAdminOrder.setPrice(priceFloat); - } + map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "获取订单成功！"); map.put("orderList", JSONArray.parse(JSON @@ -886,43 +870,44 @@ public void run() { if (page != null && limit != null) { requestMap.put("offset", (page - 1) * limit); requestMap.put("limit", limit); - } else { - requestMap.put("offset", 0); - requestMap.put("limit", 5); } try { // 获取一笔订单列表 List deliverOrders = orderService - .deliverGetOrder(phoneId); - - for (DeliverOrder deliverOrder : deliverOrders) { - String togetherId = deliverOrder.getTogetherId(); - // 获取订单食品集 - List deliverChildOrders = orderService - .getDeliverChildOrders(togetherId); - Float priceFloat = 0f; - - // 获取该笔订单总价 - for (DeliverChildOrder deliverChildOrder : deliverChildOrders) { - if (deliverChildOrder.getIsDiscount() == 0) { - priceFloat += deliverChildOrder.getPrice() - * deliverChildOrder.getOrderCount(); - } else { - priceFloat += deliverChildOrder.getDiscountPrice() - * deliverChildOrder.getOrderCount(); - } + .deliverGetOrder(requestMap); + if(deliverOrders.size()<=0){ + map.put(Constants.STATUS, Constants.FAILURE); + map.put(Constants.MESSAGE, "订单列表为空，请检查phoneId和campusId是否正确。如正确，则当前没有要配送的订单"); + }else{ + for (DeliverOrder deliverOrder : deliverOrders) { + String togetherId = deliverOrder.getTogetherId(); + // 获取订单食品集 + List deliverChildOrders = orderService + .getDeliverChildOrders(togetherId); + Float priceFloat = 0f; + priceFloat = orderService.getTotalPriceByTogetherId(togetherId); +// // 获取该笔订单总价 +// for (DeliverChildOrder deliverChildOrder : deliverChildOrders) { +// if (deliverChildOrder.getIsDiscount() == 0) { +// priceFloat += deliverChildOrder.getPrice() +// * deliverChildOrder.getOrderCount(); +// } else { +// priceFloat += deliverChildOrder.getDiscountPrice() +// * deliverChildOrder.getOrderCount(); +// } +// } + deliverOrder.setTotalPrice(priceFloat); + deliverOrder.setOrderList(deliverChildOrders); } - deliverOrder.setTotalPrice(priceFloat); - deliverOrder.setOrderList(deliverChildOrders); - } - map.put(Constants.STATUS, Constants.SUCCESS); - map.put(Constants.MESSAGE, "获取订单成功！"); - map.put("orderList", JSONArray.parse(JSON - .toJSONStringWithDateFormat(deliverOrders, "yyyy-MM-dd"))); + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE, "获取配送订单成功！"); + map.put("orderList", JSONArray.parse(JSON + .toJSONStringWithDateFormat(deliverOrders, "yyyy-MM-dd"))); + } } catch (Exception e) { map.put(Constants.STATUS, Constants.FAILURE); - map.put(Constants.MESSAGE, "获取订单失败！"); + map.put(Constants.MESSAGE, "获取配送订单失败！"); } return map; diff --git a/src/main/java/com/changyu/foryou/controller/UserController.java b/src/main/java/com/changyu/foryou/controller/UserController.java index a27ced7..c1688ab 100644 --- a/src/main/java/com/changyu/foryou/controller/UserController.java +++ b/src/main/java/com/changyu/foryou/controller/UserController.java @@ -340,7 +340,7 @@ Map resetPassword(@RequestParam String phone, //map.put("waitDeliveryOrder", counts.get("wait")); //map.put("waitReceiveOrder",counts.get("deliver")); //map.put("waitCommentOrder", counts.get("comment")); - + map.put(Constants.STATUS,Constants.SUCCESS); map.put(Constants.MESSAGE, "获取数据成功"); map.put("waitPayOrder", togetherId1.size()); diff --git a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java index e196f45..df648b1 100644 --- a/src/main/java/com/changyu/foryou/mapper/OrderMapper.java +++ b/src/main/java/com/changyu/foryou/mapper/OrderMapper.java @@ -68,7 +68,7 @@ public interface OrderMapper { Order selectByPrimaryKey(@Param(value="orderId")Long orderId, @Param(value="phoneId")String phoneId); - List deliverGetOrder(@Param(value="phone")String phone); + List deliverGetOrder(Map paramMap); List getDeliverChildOrders(@Param(value="togetherId")String togetherId); @@ -103,7 +103,6 @@ public interface OrderMapper { String getAdminPhone(Map requestMap); //获取配送员手机号 Integer updateOrderPrice(Map paramMap); - - + Float selectTotalPriceByTogetherId(@Param(value="togetherId")String togetherId); } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml index c57b8ea..4a72b01 100644 --- a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml @@ -91,7 +91,6 @@ - @@ -101,6 +100,7 @@ + @@ -562,37 +562,30 @@ + SELECT + together_id, + together_date, + message, + reserve_time, + total_price,address, + admin_phone + FROM + together_order + WHERE + campus_id = #{campusId,jdbcType=INTEGER} + AND tag = #{tag,jdbcType=SMALLINT} + AND status = #{status,jdbcType=SMALLINT} + + AND admin_phone IS NULL + + + AND admin_phone IS NOT NULL + + GROUP BY + together_id + ORDER BY + together_date DESC + @@ -871,4 +867,8 @@ where order_id=#{orderId} + + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml b/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml index 26738bf..a94bb3f 100644 --- a/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/UsersMapper.xml @@ -17,7 +17,8 @@ - + + phone, password, type, nickname, img_url, @@ -28,7 +29,7 @@ select users.phone as phone, password, type, nickname, img_url, last_login_date,create_time,sex,academy,qq,weixin - , receiver.address as default_address + , receiver.address as default_address,users.campus_id from users,receiver where users.phone = #{phone,jdbcType=VARCHAR} and receiver.phone_id=users.phone diff --git a/src/main/java/com/changyu/foryou/model/DeliverChildOrder.java b/src/main/java/com/changyu/foryou/model/DeliverChildOrder.java index d8cbaad..2edd447 100644 --- a/src/main/java/com/changyu/foryou/model/DeliverChildOrder.java +++ b/src/main/java/com/changyu/foryou/model/DeliverChildOrder.java @@ -14,7 +14,7 @@ public class DeliverChildOrder { private Short isDiscount; private Integer orderCount; - + //private String imageUrl; // private String specialName; diff --git a/src/main/java/com/changyu/foryou/model/Users.java b/src/main/java/com/changyu/foryou/model/Users.java index b190b63..62c0333 100644 --- a/src/main/java/com/changyu/foryou/model/Users.java +++ b/src/main/java/com/changyu/foryou/model/Users.java @@ -29,6 +29,8 @@ public class Users { private String weiXin; + private Integer campusId; + public Users(String phone2, String password2, String nickname2) { phone=phone2; password=password2; @@ -145,4 +147,12 @@ public String getWeiXin() { public void setWeiXin(String weiXin) { this.weiXin = weiXin; } + + public Integer getCampusId() { + return campusId; + } + + public void setCampusId(Integer campusId) { + this.campusId = campusId; + } } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/OrderService.java b/src/main/java/com/changyu/foryou/service/OrderService.java index 353a859..56a45b9 100644 --- a/src/main/java/com/changyu/foryou/service/OrderService.java +++ b/src/main/java/com/changyu/foryou/service/OrderService.java @@ -64,7 +64,7 @@ public interface OrderService { Order selectOneOrder(String phoneId, String orderId); - List deliverGetOrder(String phoneId); + List deliverGetOrder(Map paramMap); List getDeliverChildOrders(String togetherId); @@ -103,10 +103,6 @@ public interface OrderService { Integer updateOrderPrice(Map paramMap); Integer updateOrder(Order order); - - - - - + Float getTotalPriceByTogetherId(String togetherId); } diff --git a/src/main/java/com/changyu/foryou/service/UserService.java b/src/main/java/com/changyu/foryou/service/UserService.java index 49e6f7a..4c55a39 100644 --- a/src/main/java/com/changyu/foryou/service/UserService.java +++ b/src/main/java/com/changyu/foryou/service/UserService.java @@ -9,7 +9,7 @@ public interface UserService { - Users selectByUsername(String id); + Users selectByUsername(String id);//根据用户手机号获取用户信息 void addUsers(Users users); diff --git a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java index c1b3c6e..6287ff1 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java @@ -145,8 +145,8 @@ public Order selectOneOrder(String phoneId, String orderId) { //配送员获取配送订单 - public List deliverGetOrder(String phoneId) { - return orderMapper.deliverGetOrder(phoneId); + public List deliverGetOrder(Map paramMap) { + return orderMapper.deliverGetOrder(paramMap); } public List getDeliverChildOrders(String togetherId) { @@ -263,26 +263,10 @@ public Integer updateOrder(Order order) { return orderMapper.updateByPrimaryKeySelective(order); } - - - - - - - - - - - - - - - - - - - - - + @Override + public Float getTotalPriceByTogetherId(String togetherId) { + // TODO Auto-generated method stub + return orderMapper.selectTotalPriceByTogetherId(togetherId); + } } diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 33711fe..31f8df5 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -45,18 +45,24 @@
foryou
-
- -
- -
- -
-
-
+
+
+ +
+
+
+ +
+ +
+ +
+
+

@@ -192,6 +198,9 @@ diff --git a/src/main/webapp/login.html b/src/main/webapp/login.html index 046651e..ebe1477 100644 --- a/src/main/webapp/login.html +++ b/src/main/webapp/login.html @@ -58,7 +58,15 @@ //alert(data); document.cookie = "campusId="+data.seller.campusId; document.cookie = "type="+data.seller.type; - window.location.href="index.html?backurl="+window.location.href; + //获取校区状态（0休息，1营业）并写入Cookie + $.post("campus/getCampusById.do",{ + campusId : data.seller.campusId + },function(data){ + document.cookie = "status="+data.campus.status; + //跳转到主页 + window.location.href="index.html?backurl="+window.location.href; + },"json"); + },"json"); }else if($("#dropdownMenu1").text()=='校区管理员'){ $("#message").html("对不起，您不是校区管理员！"); diff --git a/src/test/java/com/changyu/test/userTest.java b/src/test/java/com/changyu/test/userTest.java index 77e8863..95a34f0 100644 --- a/src/test/java/com/changyu/test/userTest.java +++ b/src/test/java/com/changyu/test/userTest.java @@ -588,9 +588,12 @@ public void feedbackMessage(){ public void getDeliverAdmin() { Map map=new HashMap(); - + Map paramMap = new HashMap(); + + paramMap.put("campusId", 1); + try{ - List users=userService.getDeliverAdmin(); + List users=userService.getDeliverAdmin(paramMap); map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "获取配送员成功!"); map.put("deliverAdmins", users); From 483c426d7ddca78287457351995abba8f3c1c6a4 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Thu, 27 Aug 2015 11:26:46 +0800 Subject: [PATCH 095/132] modify bugs calculate price wrong MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将满减的>改为>= --- .../com/changyu/foryou/controller/OrderController.java | 1 + .../com/changyu/foryou/serviceImpl/OrderServiceImpl.java | 7 +++++-- src/test/java/com/changyu/test/orderTest.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index 6e71432..973fce8 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -567,6 +567,7 @@ public void setOrderService(OrderService orderService) { if(Math.abs(serverPrice-totalPrice)>=1){ //判断客户端价格和服务器端价格是否一致 map.put(Constants.STATUS,Constants.FAILURE); map.put(Constants.MESSAGE,"价格有误"); + System.out.println(serverPrice); return map; } //写入单价操作 diff --git a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java index 6fc753b..8be0a1f 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/OrderServiceImpl.java @@ -259,7 +259,9 @@ public Integer getCampusIdByTogetherId(Map paramMap) { return orderMapper.getCampusIdByTogetherId(paramMap); } - // + /** + * 计算折扣和优惠后的价格 + */ public Float getPriceDiscounted(String[] orderId,int campusId,String phoneId){ //获取满减的信息 Map paramMap=new HashMap(); @@ -293,8 +295,9 @@ public Float getPriceDiscounted(String[] orderId,int campusId,String phoneId){ Integer discount=0; for (Preferential preferential : prefers) { - if(fullDiscount>preferential.getNeedNumber()){ + if(fullDiscount>=preferential.getNeedNumber()){ discount=preferential.getDiscountNum(); + break; } } diff --git a/src/test/java/com/changyu/test/orderTest.java b/src/test/java/com/changyu/test/orderTest.java index 1796cf0..f3cb419 100644 --- a/src/test/java/com/changyu/test/orderTest.java +++ b/src/test/java/com/changyu/test/orderTest.java @@ -386,7 +386,7 @@ public void testWebHooks(){ @Test public void testCalcularPrice(){ String[] orderIds={ - "2429775447983","1488888888888","1477777777777" + "1440642075330" }; Map paramMap=new HashMap(); paramMap.put("campusId", 1); From 4da160626527f7efdaf9ea28822c185992d5d616 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Fri, 28 Aug 2015 23:05:47 +0800 Subject: [PATCH 096/132] add hotsearch --- .../controller/HotSearchController.java | 165 +++++++++++ .../foryou/mapper/HotSearchMapper.java | 26 ++ .../foryou/mapping/HotSearchMapper.xml | 131 +++++++++ .../com/changyu/foryou/model/HotSearch.java | 65 +++++ .../foryou/service/HotSearchService.java | 22 ++ .../serviceImpl/HotSearchServiceImpl.java | 56 ++++ src/main/webapp/css/style.css | 25 +- src/main/webapp/index.html | 39 +-- src/main/webapp/index.jsp | 5 - src/main/webapp/pages/food_category.html | 2 +- src/main/webapp/pages/hotsearch.html | 275 ++++++++++++++++++ .../java/com/changyu/test/HotSearchTest.java | 57 ++++ .../java/com/changyu/test/receiverTest.java | 4 +- .../java/com/changyu/test/sellerTest.java | 4 +- 14 files changed, 848 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/changyu/foryou/controller/HotSearchController.java create mode 100644 src/main/java/com/changyu/foryou/mapper/HotSearchMapper.java create mode 100644 src/main/java/com/changyu/foryou/mapping/HotSearchMapper.xml create mode 100644 src/main/java/com/changyu/foryou/model/HotSearch.java create mode 100644 src/main/java/com/changyu/foryou/service/HotSearchService.java create mode 100644 src/main/java/com/changyu/foryou/serviceImpl/HotSearchServiceImpl.java delete mode 100644 src/main/webapp/index.jsp create mode 100644 src/main/webapp/pages/hotsearch.html create mode 100644 src/test/java/com/changyu/test/HotSearchTest.java diff --git a/src/main/java/com/changyu/foryou/controller/HotSearchController.java b/src/main/java/com/changyu/foryou/controller/HotSearchController.java new file mode 100644 index 0000000..a9aeacd --- /dev/null +++ b/src/main/java/com/changyu/foryou/controller/HotSearchController.java @@ -0,0 +1,165 @@ +package com.changyu.foryou.controller; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.changyu.foryou.model.HotSearch; +import com.changyu.foryou.service.HotSearchService; +import com.changyu.foryou.tools.Constants; + +@Controller +@RequestMapping("/hotSearch") +public class HotSearchController { + @Resource private HotSearchService hotSearchService; + + /** + * 获取所有的热门搜索标签 + * @param campusId 校区id + * @return + */ + @RequestMapping("/getHotSearchs") + public @ResponseBody List getHotSearchs(@RequestParam Integer campusId){ + Map paramMap=new HashMap(); + paramMap.put("campusId",campusId); + List searchs=hotSearchService.getHotSearchs(paramMap); + + return searchs; + } + + /** + * 将标签设为不显示 + * @param campusId //校区id + * @param hotId 搜索标签id + * @return + */ + @RequestMapping("/setNot2Display") + public @ResponseBody Map setNot2Display(@RequestParam Integer hotId){ + Map resultMap=new HashMap<>(); + + try { + Map paramMap=new HashMap(); + //paramMap.put("campusId",campusId); + paramMap.put("hotId",hotId); + int flag=hotSearchService.setNot2Display(paramMap); + if(flag!=-1){ + resultMap.put(Constants.STATUS,Constants.SUCCESS); + resultMap.put(Constants.MESSAGE, "修改成功"); + }else{ + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + } catch (Exception e) { + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + + return resultMap; + } + + /** + * 将标签设为显示 + * @param campusId + * @param hotId + * @return + */ + @RequestMapping("/set2Display") + public @ResponseBody Map set2Display(@RequestParam Integer hotId){ + Map resultMap=new HashMap<>(); + try { + Map paramMap=new HashMap(); + //paramMap.put("campusId",campusId); + paramMap.put("hotId",hotId); + int flag=hotSearchService.set2Display(paramMap); + if(flag!=-1){ + resultMap.put(Constants.STATUS,Constants.SUCCESS); + resultMap.put(Constants.MESSAGE, "修改成功"); + }else{ + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + } catch (Exception e) { + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + + + return resultMap; + } + + /** + * 删除标签 + * @param hotIds + * @return + */ + @RequestMapping("/deleteHotSearchs") + public @ResponseBody Map deleteHotSearchs(@RequestParam String hotIds){ + Map resultMap=new HashMap<>(); + + try { + Map paramMap=new HashMap<>(); + + String[] hotIdsStrings=hotIds.split(","); + paramMap.put("hotIds",hotIdsStrings); + int flag= hotSearchService.deleteHotSearchs(paramMap); + if(flag!=-1){ + resultMap.put(Constants.STATUS,Constants.SUCCESS); + resultMap.put(Constants.MESSAGE, "修改成功"); + }else{ + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + } catch (Exception e) { + e.getStackTrace(); + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + + return resultMap; + } + + @RequestMapping("/updateHotSearch") + public @ResponseBody Map updateHotSearch(Integer hotId,String displayName,Integer campusId,String searchTag){ + Map resultMap=new HashMap(); + + try { + HotSearch hotSearch=new HotSearch(); + hotSearch.setSearchTag(searchTag); + hotSearch.setDisplayName(displayName); + + int flag=-1; + if(hotId==0||hotId==null){ + //新增 + hotSearch.setCampusId(campusId); + hotSearch.setCreateTime(new Date().getTime()); + flag=hotSearchService.insert(hotSearch); //添加 + }else{ + hotSearch.setHotId(hotId); + flag=hotSearchService.update(hotSearch); //更新 + } + + if(flag!=-1){ + resultMap.put(Constants.STATUS,Constants.SUCCESS); + resultMap.put(Constants.MESSAGE, "修改成功"); + }else{ + resultMap.put(Constants.STATUS,Constants.FAILURE); + 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/mapper/HotSearchMapper.java b/src/main/java/com/changyu/foryou/mapper/HotSearchMapper.java new file mode 100644 index 0000000..4dd686e --- /dev/null +++ b/src/main/java/com/changyu/foryou/mapper/HotSearchMapper.java @@ -0,0 +1,26 @@ +package com.changyu.foryou.mapper; + +import java.util.List; +import java.util.Map; + +import com.changyu.foryou.model.HotSearch; + +public interface HotSearchMapper { + int deleteByPrimaryKey(Integer hotId); + + int insert(HotSearch record); + + int insertSelective(HotSearch record); + + HotSearch selectByPrimaryKey(Integer hotId); + + int updateByPrimaryKeySelective(HotSearch record); + + int updateByPrimaryKey(HotSearch record); + + List getHotSearchs(Map paramMap); //获取校区的所有热搜标签 + + int setNot2Display(Map paramMap); //将标签拿下来 + + int set2Dispaly(Map paramMap); //显示标签 +} \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/HotSearchMapper.xml b/src/main/java/com/changyu/foryou/mapping/HotSearchMapper.xml new file mode 100644 index 0000000..df1a3dc --- /dev/null +++ b/src/main/java/com/changyu/foryou/mapping/HotSearchMapper.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + hot_id, display_name, search_tag, create_time, is_display, campus_id + + + + delete from hot_search + where hot_id = #{hotId,jdbcType=INTEGER} + + + insert into hot_search (hot_id, display_name, search_tag, + create_time, is_display, campus_id + ) + values (#{hotId,jdbcType=INTEGER}, #{displayName,jdbcType=VARCHAR}, #{searchTag,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{isDisplay,jdbcType=TINYINT}, #{campusId,jdbcType=INTEGER} + ) + + + insert into hot_search + + + hot_id, + + + display_name, + + + search_tag, + + + create_time, + + + is_display, + + + campus_id, + + + + + #{hotId,jdbcType=INTEGER}, + + + #{displayName,jdbcType=VARCHAR}, + + + #{searchTag,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{isDisplay,jdbcType=TINYINT}, + + + #{campusId,jdbcType=INTEGER}, + + + + + update hot_search + + + display_name = #{displayName,jdbcType=VARCHAR}, + + + search_tag = #{searchTag,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + is_display = #{isDisplay,jdbcType=TINYINT}, + + + campus_id = #{campusId,jdbcType=INTEGER}, + + + where hot_id = #{hotId,jdbcType=INTEGER} + + + update hot_search + set display_name = #{displayName,jdbcType=VARCHAR}, + search_tag = #{searchTag,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + is_display = #{isDisplay,jdbcType=TINYINT}, + campus_id = #{campusId,jdbcType=INTEGER} + where hot_id = #{hotId,jdbcType=INTEGER} + + + + + + + update + hot_search + set + is_display=0 + where hot_id=#{hotId,jdbcType=INTEGER} + + + + update + hot_search + set + is_display=1 + where hot_id=#{hotId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/model/HotSearch.java b/src/main/java/com/changyu/foryou/model/HotSearch.java new file mode 100644 index 0000000..7de239f --- /dev/null +++ b/src/main/java/com/changyu/foryou/model/HotSearch.java @@ -0,0 +1,65 @@ +package com.changyu.foryou.model; + +public class HotSearch { + private Integer hotId; + + private String displayName; + + private String searchTag; + + private Long createTime; + + private Byte isDisplay; + + private Integer campusId; + + + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName == null ? null : displayName.trim(); + } + + public String getSearchTag() { + return searchTag; + } + + public void setSearchTag(String searchTag) { + this.searchTag = searchTag == null ? null : searchTag.trim(); + } + + public Long getCreateTime() { + return createTime; + } + + public void setCreateTime(Long createTime) { + this.createTime = createTime; + } + + public Byte getIsDisplay() { + return isDisplay; + } + + public void setIsDisplay(Byte isDisplay) { + this.isDisplay = isDisplay; + } + + public Integer getCampusId() { + return campusId; + } + + public void setCampusId(Integer campusId) { + this.campusId = campusId; + } + + public Integer getHotId() { + return hotId; + } + + public void setHotId(Integer hotId) { + this.hotId = hotId; + } +} \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/HotSearchService.java b/src/main/java/com/changyu/foryou/service/HotSearchService.java new file mode 100644 index 0000000..17ef650 --- /dev/null +++ b/src/main/java/com/changyu/foryou/service/HotSearchService.java @@ -0,0 +1,22 @@ +package com.changyu.foryou.service; + +import java.util.List; +import java.util.Map; + +import com.changyu.foryou.model.HotSearch; + +public interface HotSearchService { + + List getHotSearchs(Map paramMap); + + int setNot2Display(Map paramMap); + + int set2Display(Map paramMap); + + int deleteHotSearchs(Map paramMap); + + int insert(HotSearch hotSearch); + + int update(HotSearch hotSearch); + +} diff --git a/src/main/java/com/changyu/foryou/serviceImpl/HotSearchServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/HotSearchServiceImpl.java new file mode 100644 index 0000000..b94953a --- /dev/null +++ b/src/main/java/com/changyu/foryou/serviceImpl/HotSearchServiceImpl.java @@ -0,0 +1,56 @@ +package com.changyu.foryou.serviceImpl; + +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import com.alibaba.fastjson.JSON; +import com.changyu.foryou.mapper.HotSearchMapper; +import com.changyu.foryou.model.HotSearch; +import com.changyu.foryou.service.HotSearchService; + +@Service("/hotSearchService") +public class HotSearchServiceImpl implements HotSearchService { + @Resource private HotSearchMapper hotSearchMapper; + + @Override + public List getHotSearchs(Map paramMap) { + return hotSearchMapper.getHotSearchs(paramMap); + } + + @Override + public int setNot2Display(Map paramMap) { + return hotSearchMapper.setNot2Display(paramMap); + } + + @Override + public int set2Display(Map paramMap) { + return hotSearchMapper.set2Dispaly(paramMap); + } + + @Override + public int deleteHotSearchs(Map paramMap) { + String[] hotIdsStrings=(String[])paramMap.get("hotIds"); + + int flag=-1; + System.out.println(JSON.toJSONString(hotIdsStrings)); + for (String id : hotIdsStrings) { + flag=hotSearchMapper.deleteByPrimaryKey(Integer.parseInt(id)); + } + return flag; + } + + @Override + public int insert(HotSearch hotSearch) { + return hotSearchMapper.insertSelective(hotSearch); + } + + @Override + public int update(HotSearch hotSearch) { + return hotSearchMapper.updateByPrimaryKeySelective(hotSearch); + } + +} diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 7160bf2..6520c4a 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -549,4 +549,27 @@ button.sp{ .noFM{ margin-left:0 !important; padding-left:0; -} \ No newline at end of file +} + +/**提示样式*/ +#info{ + width: 180px; + height: 26px; + background: #FF6347; + position: absolute; + top: 60px; + left: 50%; + margin-left: -90px; + font-weight: bold; + font-size:14px; + display: none; + color: #fff; + text-align: center; + line-height: 26px; + position: fixed; + z-index: 99; +} + +.none{ + display: none; +} diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 31f8df5..bf3fd84 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -95,15 +95,6 @@
-
@@ -158,17 +149,10 @@ 用户反馈
-
- 帮助 -
-
-
- - 一键关店 - -
+ +
+

@@ -185,6 +169,23 @@

+
+ 搜索标签 +
+
+
+
+ + 一键关店 + +
+
+
+ 帮助 +
+

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index c38169b..0000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - - -
Hello World!
- - diff --git a/src/main/webapp/pages/food_category.html b/src/main/webapp/pages/food_category.html index b2ed0ca..082e4cb 100644 --- a/src/main/webapp/pages/food_category.html +++ b/src/main/webapp/pages/food_category.html @@ -25,7 +25,7 @@

-
零食管理
+
零食分类管理

diff --git a/src/main/webapp/pages/hotsearch.html b/src/main/webapp/pages/hotsearch.html new file mode 100644 index 0000000..4cd8f29 --- /dev/null +++ b/src/main/webapp/pages/hotsearch.html @@ -0,0 +1,275 @@ + + + + +搜索标签管理 + + + + + + + + + + + + + + + + + +
+
+
+
+
搜索标签管理网站搜索框下的热门搜索
+
+
+
+ + + +
+ + + + + + + + + + + +
# 显示名称搜索标签是否显示显示操作
+
+
+ + + + + + \ No newline at end of file diff --git a/src/test/java/com/changyu/test/HotSearchTest.java b/src/test/java/com/changyu/test/HotSearchTest.java new file mode 100644 index 0000000..9267345 --- /dev/null +++ b/src/test/java/com/changyu/test/HotSearchTest.java @@ -0,0 +1,57 @@ +package com.changyu.test; + +import static org.junit.Assert.assertEquals; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Resource; + +import org.apache.log4j.Logger; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.alibaba.fastjson.JSON; +import com.changyu.foryou.service.HotSearchService; +import com.changyu.foryou.tools.Constants; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "classpath:spring.xml", "classpath:spring-mybatis.xml" }) +public class HotSearchTest { + private static final Logger LOGGER = Logger + .getLogger(HotSearchTest.class); + + @Resource private HotSearchService hotSearchService; + + @Test + public void setNot2Display(){ + Map resultMap=new HashMap<>(); + + try { + Map paramMap=new HashMap(); + paramMap.put("campusId",1); + paramMap.put("hotId",4); + int flag=hotSearchService.setNot2Display(paramMap); + if(flag!=-1){ + resultMap.put(Constants.STATUS,Constants.SUCCESS); + resultMap.put(Constants.MESSAGE, "修改成功"); + }else{ + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + } + + assertEquals(1,flag); + } catch (Exception e) { + resultMap.put(Constants.STATUS,Constants.FAILURE); + resultMap.put(Constants.MESSAGE, "修改失败"); + LOGGER.info(JSON.toJSONString(e)); + } + + LOGGER.info(JSON.toJSONString(resultMap)); + } +} diff --git a/src/test/java/com/changyu/test/receiverTest.java b/src/test/java/com/changyu/test/receiverTest.java index 6d2277e..990d279 100644 --- a/src/test/java/com/changyu/test/receiverTest.java +++ b/src/test/java/com/changyu/test/receiverTest.java @@ -110,6 +110,7 @@ public void addReceiver(){ * @return */ + @Test public void relectReceiver(){ // String phoneId="18896554880"; // case2 @@ -140,7 +141,7 @@ public void relectReceiver(){ * @param campusId 校区 * @return */ - + @Test public void updateReceiver(){ // case1 // String phoneId="18896554880"; @@ -211,6 +212,7 @@ public void updateReceiver(){ * @return */ + @Test public void setDefaultAddress(){ // case1 // String phoneId="18896554880"; diff --git a/src/test/java/com/changyu/test/sellerTest.java b/src/test/java/com/changyu/test/sellerTest.java index 868f0fe..02fde4d 100644 --- a/src/test/java/com/changyu/test/sellerTest.java +++ b/src/test/java/com/changyu/test/sellerTest.java @@ -47,6 +47,7 @@ public void setSellerService(SellerService sellerService) { * @param password * */ + @Test public void toLogin() { // case1 // String campusAdmin="18860902711"; @@ -88,6 +89,7 @@ public void toLogin() { * */ + @Test public void getSellerById() { // String campusAdmin="18860902711"; @@ -108,7 +110,7 @@ public void getSellerById() * @return */ - + @Test public void registerIn() { // case1.2 From 71486e459ab14a1e615bd16fe41c49dd5dde4b46 Mon Sep 17 00:00:00 2001 From: xiaowei Date: Sat, 29 Aug 2015 00:54:08 +0800 Subject: [PATCH 097/132] add modify password --- .../foryou/controller/CampusController.java | 36 ++++++ .../changyu/foryou/mapper/CampusMapper.java | 4 + .../changyu/foryou/mapping/CampusMapper.xml | 16 +++ .../changyu/foryou/service/CampusService.java | 4 + .../foryou/serviceImpl/CampusServiceImpl.java | 16 ++- src/main/webapp/index.html | 21 ++-- src/main/webapp/pages/modifypassword.html | 110 ++++++++++++++++++ src/main/webapp/pages/order_deliver.html | 2 +- src/main/webapp/pages/order_wait_release.html | 2 +- 9 files changed, 194 insertions(+), 17 deletions(-) create mode 100644 src/main/webapp/pages/modifypassword.html diff --git a/src/main/java/com/changyu/foryou/controller/CampusController.java b/src/main/java/com/changyu/foryou/controller/CampusController.java index 9cc6d16..f145362 100644 --- a/src/main/java/com/changyu/foryou/controller/CampusController.java +++ b/src/main/java/com/changyu/foryou/controller/CampusController.java @@ -23,6 +23,7 @@ import com.changyu.foryou.service.CampusService; import com.changyu.foryou.service.FoodService; import com.changyu.foryou.tools.Constants; +import com.changyu.foryou.tools.Md5; @Controller @RequestMapping("/campus") @@ -371,4 +372,39 @@ public Map updateCampus(@RequestParam String campusId,@RequestPa return responseMap; } + + @RequestMapping("/updateCampusAdminPassword") + public @ResponseBody Map updateCampusAdminPassword(Integer campusId,String campusAdmin,String oldPassword,String newPassword){ + Map resultMap=new HashMap<>(); + + try { + Map paramMap=new HashMap(); + paramMap.put("campusId",campusId); + paramMap.put("campusAdmin",campusAdmin); + + String password=campusService.getOldPassword(paramMap); + + if(password.equals(Md5.GetMD5Code(oldPassword))){ + paramMap.put("newPassword",newPassword); + + int flag=campusService.updateCampusAdminPassword(paramMap); + if(flag!=-1){ + resultMap.put(Constants.STATUS, Constants.SUCCESS); + resultMap.put(Constants.MESSAGE,"修改密码成功"); + }else{ + resultMap.put(Constants.STATUS, Constants.FAILURE); + resultMap.put(Constants.MESSAGE,"修改密码失败"); + } + }else{ + resultMap.put(Constants.STATUS, Constants.FAILURE); + 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/mapper/CampusMapper.java b/src/main/java/com/changyu/foryou/mapper/CampusMapper.java index 533333b..819e7cb 100644 --- a/src/main/java/com/changyu/foryou/mapper/CampusMapper.java +++ b/src/main/java/com/changyu/foryou/mapper/CampusMapper.java @@ -52,4 +52,8 @@ public interface CampusMapper { City getCityByName(String cityName); Integer updateCampus(Map paramMap); + + String getOldPassword(Map paramMap); //获取原密码 + + int updateCampusAdminPassword(Map paramMap); //更新密码 } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/mapping/CampusMapper.xml b/src/main/java/com/changyu/foryou/mapping/CampusMapper.xml index 55081e5..66f79a2 100644 --- a/src/main/java/com/changyu/foryou/mapping/CampusMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/CampusMapper.xml @@ -275,4 +275,20 @@ where campus_id=#{campusId,jdbcType=INTEGER} + + + + + update + campus_admin + set + password=#{newPassword,jdbcType=VARCHAR} + where campus_admin=#{campusAdmin,jdbcType=VARCHAR} and campus_id=#{campusId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/CampusService.java b/src/main/java/com/changyu/foryou/service/CampusService.java index b8a7410..0de149f 100644 --- a/src/main/java/com/changyu/foryou/service/CampusService.java +++ b/src/main/java/com/changyu/foryou/service/CampusService.java @@ -41,4 +41,8 @@ public interface CampusService { City getCityByName(String cityName); Integer updateCampus(Map paramMap); + + String getOldPassword(Map paramMap); + + int updateCampusAdminPassword(Map paramMap); } diff --git a/src/main/java/com/changyu/foryou/serviceImpl/CampusServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/CampusServiceImpl.java index 8d9d8e8..21e44fd 100644 --- a/src/main/java/com/changyu/foryou/serviceImpl/CampusServiceImpl.java +++ b/src/main/java/com/changyu/foryou/serviceImpl/CampusServiceImpl.java @@ -157,38 +157,42 @@ public Campus getCampus(Map paramMap) { @Override public Integer deleteCampusAdmin(Map paramMap) { - // TODO Auto-generated method stub return campusMapper.deleteCampusAdmin(paramMap); } @Override public Integer addCampusAdmin(Map paramMap) { - // TODO Auto-generated method stub return campusMapper.insertCampusAdmin(paramMap); } @Override public List getAllCity() { - // TODO Auto-generated method stub return campusMapper.selectAllCity(); } @Override public Integer addCity(Map paramMap) { - // TODO Auto-generated method stub return campusMapper.insertCity(paramMap); } @Override public City getCityByName(String cityName) { - // TODO Auto-generated method stub return campusMapper.getCityByName(cityName); } @Override public Integer updateCampus(Map paramMap) { - // TODO Auto-generated method stub return campusMapper.updateCampus(paramMap); } + @Override + public String getOldPassword(Map paramMap) { + return campusMapper.getOldPassword(paramMap); + } + + @Override + public int updateCampusAdminPassword(Map paramMap) { + return campusMapper.updateCampusAdminPassword(paramMap); + } + } diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index bf3fd84..82953eb 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -145,14 +145,6 @@
-
- 用户反馈 -
- - - -

@@ -171,7 +163,7 @@

搜索标签 + class='icon-zoom-out'>搜索标签

@@ -186,6 +178,17 @@ class='icon-question-sign'> 帮助

+ +
+ 用户反馈 +
+ +
+ 修改密码 +
+
diff --git a/src/main/webapp/pages/modifypassword.html b/src/main/webapp/pages/modifypassword.html new file mode 100644 index 0000000..e7b0ae2 --- /dev/null +++ b/src/main/webapp/pages/modifypassword.html @@ -0,0 +1,110 @@ + + + + 修改密码 + + + + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/main/webapp/pages/order_deliver.html b/src/main/webapp/pages/order_deliver.html index 3825950..3543429 100644 --- a/src/main/webapp/pages/order_deliver.html +++ b/src/main/webapp/pages/order_deliver.html @@ -78,7 +78,7 @@
var campusId = getCookie("campusId"); //alert(campusId); $("#table").bootstrapTable({ - url:"../../foryou/order/getPCSimpleOrder.do?status=2&campusId="+campusId + url:"../../foryou/order/getPCSimpleOrder.do?status=3&campusId="+campusId }); }); diff --git a/src/main/webapp/pages/order_wait_release.html b/src/main/webapp/pages/order_wait_release.html index e1f4d46..b91c40c 100644 --- a/src/main/webapp/pages/order_wait_release.html +++ b/src/main/webapp/pages/order_wait_release.html @@ -80,7 +80,7 @@
var campusId = getCookie("campusId"); //alert(campusId); $("#table").bootstrapTable({ - url:"../../foryou/order/getPCSimpleOrder.do?status=1&campusId="+campusId + url:"../../foryou/order/getPCSimpleOrder.do?status=2&campusId="+campusId }); }); From b96d1957bf0267b2b84ab0410a53354fde1a1ce7 Mon Sep 17 00:00:00 2001 From: SimonsunDev Date: Sat, 29 Aug 2015 16:10:25 +0800 Subject: [PATCH 098/132] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=BB=A1?= =?UTF-8?q?=E5=87=8F=E4=BC=98=E6=83=A0=EF=BC=8C=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=AA=8C=E8=AF=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=BA=86=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foryou/controller/CampusController.java | 27 +- .../foryou/controller/OrderController.java | 21 +- .../controller/PreferentialController.java | 135 ++ .../foryou/mapping/FoodCommentMapper.xml | 2 +- .../changyu/foryou/mapping/OrderMapper.xml | 11 +- .../foryou/mapping/PreferentialMapper.xml | 36 +- .../changyu/foryou/model/Preferential.java | 1 + .../foryou/service/PreferentialService.java | 22 + .../serviceImpl/PreferentialServiceImpl.java | 60 + .../assets/bootstrap-table/jquery.validate.js | 1398 +++++++++++++++++ .../assets/bootstrap-table/messages_cn.js | 22 + src/main/webapp/index.html | 54 +- src/main/webapp/login.html | 10 +- src/main/webapp/pages/campus_admin.html | 93 +- src/main/webapp/pages/close.html | 58 +- src/main/webapp/pages/feedback.html | 42 +- src/main/webapp/pages/food.html | 52 +- src/main/webapp/pages/food_category.html | 255 +-- src/main/webapp/pages/food_comment.html | 47 +- .../webapp/pages/food_first_category.html | 49 +- src/main/webapp/pages/news.html | 55 +- src/main/webapp/pages/preferential.html | 317 +++- src/main/webapp/pages/statistic.html | 13 + 23 files changed, 2465 insertions(+), 315 deletions(-) create mode 100644 src/main/java/com/changyu/foryou/controller/PreferentialController.java create mode 100644 src/main/java/com/changyu/foryou/service/PreferentialService.java create mode 100644 src/main/java/com/changyu/foryou/serviceImpl/PreferentialServiceImpl.java create mode 100644 src/main/webapp/assets/bootstrap-table/jquery.validate.js create mode 100644 src/main/webapp/assets/bootstrap-table/messages_cn.js create mode 100644 src/main/webapp/pages/statistic.html diff --git a/src/main/java/com/changyu/foryou/controller/CampusController.java b/src/main/java/com/changyu/foryou/controller/CampusController.java index 9cc6d16..b47b133 100644 --- a/src/main/java/com/changyu/foryou/controller/CampusController.java +++ b/src/main/java/com/changyu/foryou/controller/CampusController.java @@ -106,7 +106,7 @@ public void setCampusService(CampusService campusService) { return map; } - //一键关店 + //一键关店、开店 /** * * @param campusId @@ -116,7 +116,7 @@ public void setCampusService(CampusService campusService) { * @return */ @RequestMapping("/closeCampus") - public @ResponseBody Map closeCampus(@RequestParam Integer campusId, @RequestParam String closeReason, @RequestParam Short status){ + public @ResponseBody Map closeCampus(@RequestParam Integer campusId, String closeReason, @RequestParam Short status){ Map requestMap = new HashMap(); Map responseMap = new HashMap(); try{ @@ -126,15 +126,26 @@ public void setCampusService(CampusService campusService) { //requestMap.put("closeTime", date); requestMap.put("closeReason", closeReason); requestMap.put("status", status); - Integer isClosed = campusService.closeCampus(requestMap); + Integer flag = campusService.closeCampus(requestMap); - responseMap.put("isClosed", isClosed); - responseMap.put(Constants.STATUS, Constants.SUCCESS); - responseMap.put(Constants.MESSAGE, "关店成功！"); + if(status==1){ + responseMap.put("isOpened", flag); + responseMap.put(Constants.STATUS, Constants.SUCCESS); + responseMap.put(Constants.MESSAGE, "开店成功！"); + }else if(status==0){ + responseMap.put("isClosed", flag); + responseMap.put(Constants.STATUS, Constants.SUCCESS); + responseMap.put(Constants.MESSAGE, "关店成功！"); + } }catch(Exception e){ e.getStackTrace(); - responseMap.put(Constants.STATUS, Constants.FAILURE); - responseMap.put(Constants.MESSAGE, "关店失败！"); + if(status==1){ + responseMap.put(Constants.STATUS, Constants.FAILURE); + responseMap.put(Constants.MESSAGE, "开店失败！"); + }else if(status==0){ + responseMap.put(Constants.STATUS, Constants.FAILURE); + responseMap.put(Constants.MESSAGE, "关店失败！"); + } } return responseMap; } diff --git a/src/main/java/com/changyu/foryou/controller/OrderController.java b/src/main/java/com/changyu/foryou/controller/OrderController.java index 8c26da1..6579007 100644 --- a/src/main/java/com/changyu/foryou/controller/OrderController.java +++ b/src/main/java/com/changyu/foryou/controller/OrderController.java @@ -13,6 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -37,6 +38,7 @@ import com.changyu.foryou.service.CampusService; import com.changyu.foryou.service.FoodService; import com.changyu.foryou.service.OrderService; +import com.changyu.foryou.service.PreferentialService; import com.changyu.foryou.service.PushService; import com.changyu.foryou.service.ReceiverService; import com.changyu.foryou.service.UserService; @@ -57,6 +59,10 @@ public class OrderController { private ReceiverService receiverService; private CampusService campusService; private PushService pushService; + + @Autowired() + @Qualifier("preferentialService") + private PreferentialService preferentialService; @Autowired public void setReceiverService(ReceiverService receiverService) { @@ -197,7 +203,6 @@ public void setOrderService(OrderService orderService) { togetherOrdersList.add(togetherOrder); } - map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "获取订单成功"); map.put("orderList", JSON.parse(JSON @@ -773,7 +778,6 @@ public void setOrderService(OrderService orderService) { requestMap.put("isSelected", isSelected); requestMap.put("campusId", campusId); requestMap.put("tag", 1); //订单有效 - requestMap.put("status", 2); //2，待确认 //System.out.println(isSelected); if (page != null && limit != null) { requestMap.put("limit", limit); @@ -809,8 +813,13 @@ public void setOrderService(OrderService orderService) { @RequestParam final String adminPhone) { Map map = new HashMap(); try { - int flag = orderService.setDeliverAdmin(togetherId, adminPhone); // 设置配送员 - if (flag != -1 && flag != 0) { + int flag1 = orderService.setDeliverAdmin(togetherId, adminPhone); // 设置配送员 + //修改大订单状态为3（配送中） + Map paramMap = new HashMap(); + paramMap.put("togetherId", togetherId); + paramMap.put("status", 3); + int flag2 = orderService.modifyOrderStatus(paramMap); + if (flag1 != -1 && flag1 != 0 && flag2!=-1 && flag2!=0) { map.put(Constants.STATUS, Constants.SUCCESS); map.put(Constants.MESSAGE, "设置配送员成功！"); @@ -1010,7 +1019,7 @@ public Map getOrdersByDate(String date, List deliverChildOrders = orderService .getAllChildOrders(paramMap); Float priceFloat = 0f; - + // 获取该笔订单总价 for (DeliverChildOrder deliverChildOrder : deliverChildOrders) { if (deliverChildOrder.getIsDiscount() == 0) { @@ -1312,7 +1321,7 @@ public String getIpAddr(HttpServletRequest request){ } @RequestMapping("/cancelOrderWithRefund") - public @ResponseBody Map cancelOrderWithRefund(String togetherId){ + public @ResponseBody Map cancelOrderWithRefund(@RequestParam String togetherId){ Map map=new HashMap(); try { diff --git a/src/main/java/com/changyu/foryou/controller/PreferentialController.java b/src/main/java/com/changyu/foryou/controller/PreferentialController.java new file mode 100644 index 0000000..8ab868a --- /dev/null +++ b/src/main/java/com/changyu/foryou/controller/PreferentialController.java @@ -0,0 +1,135 @@ +package com.changyu.foryou.controller; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Controller; +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.alibaba.fastjson.JSONArray; +import com.changyu.foryou.model.Preferential; +import com.changyu.foryou.service.CampusService; +import com.changyu.foryou.service.PreferentialService; +import com.changyu.foryou.tools.Constants; + +@Controller +@RequestMapping("preferential") +/** + * 满减优惠 + * @author Simon Sun + * + */ +public class PreferentialController { + @Resource(name="preferentialService") + private PreferentialService preferentialService; + + @Resource(name="campusService") + private CampusService campusService; + + /** + * 添加满减优惠 + * @param needNumber + * @param discountNum + * @param campusId + * @return + */ + @RequestMapping("addPref") + @ResponseBody + public Map addPref(@RequestParam Integer needNumber,@RequestParam Integer discountNum,Integer campusId, String campusName){ + Map map = new HashMap(); + + Preferential preferential =new Preferential(); + preferential.setPreferentialId(null); + preferential.setNeedNumber(needNumber); + preferential.setDiscountNum(discountNum); + if(campusId==null){ + Map tempMap = new HashMap(); + tempMap.put("campusName", campusName); + preferential.setCampusId(campusService.getIdByName(tempMap)); + }else{ + preferential.setCampusId(campusId); + } + + int flag = preferentialService.insert(preferential); + if(flag!=0&&flag!=-1){ + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE, "添加成功"); + }else{ + map.put(Constants.STATUS, Constants.FAILURE); + map.put(Constants.MESSAGE, "添加失败"); + } + return map; + } + + /** + * 删除满减优惠 + * @param preferentialId + * @return + */ + @RequestMapping("deletePref") + @ResponseBody + public Map deletePref(@RequestParam Integer preferentialId){ + Map map = new HashMap(); + + int flag = preferentialService.deleteByPrimaryKey(preferentialId); + if(flag!=0&&flag!=-1){ + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE, "删除成功"); + }else{ + map.put(Constants.STATUS, Constants.FAILURE); + map.put(Constants.MESSAGE, "删除失败"); + } + return map; + } + + /** + * 更新满减优惠 + * @param preferentialId + * @param needNumber + * @param discountNum + * @param campusId + * @return + */ + @RequestMapping("updatePref") + @ResponseBody + public Map updatePref(@RequestParam Integer preferentialId, @RequestParam Integer needNumber, @RequestParam Integer discountNum, @RequestParam Integer campusId){ + Map map = new HashMap(); + + Preferential preferential =new Preferential(); + preferential.setPreferentialId(preferentialId); + preferential.setNeedNumber(needNumber); + preferential.setDiscountNum(discountNum); + preferential.setCampusId(campusId); + int flag = preferentialService.updateByPrimaryKey(preferential); + if(flag!=0&&flag!=-1){ + map.put(Constants.STATUS, Constants.SUCCESS); + map.put(Constants.MESSAGE, "更新成功"); + }else{ + map.put(Constants.STATUS, Constants.FAILURE); + map.put(Constants.MESSAGE, "更新失败"); + } + return map; + } + + /** + * 获取满减优惠信息（客户端分页） + * @param campusId + * @return + */ + @RequestMapping("getAllPref") + @ResponseBody + public JSONArray getAllPref(Integer campusId){ + Map paramMap = new HashMap(); + paramMap.put("campusId", campusId); + + List list = preferentialService.getPreferential(paramMap); + + return (JSONArray) JSON.toJSON(list); + } +} diff --git a/src/main/java/com/changyu/foryou/mapping/FoodCommentMapper.xml b/src/main/java/com/changyu/foryou/mapping/FoodCommentMapper.xml index 916da13..9e40fc8 100644 --- a/src/main/java/com/changyu/foryou/mapping/FoodCommentMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/FoodCommentMapper.xml @@ -105,7 +105,7 @@ FROM food_comment,users,orders WHERE food_comment.phone = users.phone and food_comment.order_id =orders.order_id AND food_comment.food_id=#{foodId,jdbcType=BIGINT} and food_comment.campus_id=#{campusId,jdbcType=INTEGER} - AND food_comment.tag=1 and comment is not null and comment !=' ' + AND food_comment.tag=1 LIMIT #{limit} OFFSET #{offset,jdbcType=INTEGER} diff --git a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml index 143dbbb..2783316 100644 --- a/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/OrderMapper.xml @@ -404,7 +404,7 @@ is_discount, food.price as price,food.name as name, - discount_price,food.message as message,pay_way,total_price + discount_price,food.message as message,pay_way,total_price,is_full_discount from orders,food where @@ -568,13 +568,14 @@ message, reserve_time, total_price,address, - admin_phone + admin_phone, + admin_name FROM together_order WHERE campus_id = #{campusId,jdbcType=INTEGER} AND tag = #{tag,jdbcType=SMALLINT} - AND status = #{status,jdbcType=SMALLINT} + AND status IN (2,3) AND admin_phone IS NULL @@ -599,13 +600,14 @@ + update orders set admin_phone=#{adminPhone,jdbcType=VARCHAR} where together_id= - #{togetherId,jdbcType=VARCHAR} and status = 2 + #{togetherId,jdbcType=VARCHAR} and status IN (2,3) @@ -798,6 +800,7 @@ order by together_date DESC,create_time DESC + update orders set diff --git a/src/main/java/com/changyu/foryou/mapping/PreferentialMapper.xml b/src/main/java/com/changyu/foryou/mapping/PreferentialMapper.xml index 3bd657d..3bcd620 100644 --- a/src/main/java/com/changyu/foryou/mapping/PreferentialMapper.xml +++ b/src/main/java/com/changyu/foryou/mapping/PreferentialMapper.xml @@ -2,7 +2,7 @@ - + @@ -22,9 +22,9 @@ where preferential_id = #{preferentialId,jdbcType=INTEGER} - insert into preferential ( preferential_id, need_number, discount_num + insert into preferential ( preferential_id, need_number, discount_num,campus_id ) - values (#{preferentialId,jdbcType=INTEGER}, #{needNumber,jdbcType=INTEGER}, #{discountNum,jdbcType=INTEGER} + values (null, #{needNumber,jdbcType=INTEGER}, #{discountNum,jdbcType=INTEGER},#{campusId,jdbcType=INTEGER} ) @@ -52,28 +52,48 @@ + + update preferential - need_number = #{needNumber,jdbcType=INTEGER}, + need_number = #{needNumber,jdbcType=INTEGER} - discount_num = #{discountNum,jdbcType=INTEGER}, + ,discount_num = #{discountNum,jdbcType=INTEGER} + + + ,campus_id = #{campusId,jdbcType=INTEGER} where preferential_id = #{preferentialId,jdbcType=INTEGER} + update preferential - set need_number = #{needNumber,jdbcType=INTEGER}, - discount_num = #{discountNum,jdbcType=INTEGER} + set + + need_number = #{needNumber,jdbcType=INTEGER} + + + ,discount_num = #{discountNum,jdbcType=INTEGER} + + + ,campus_id = #{campusId,jdbcType=INTEGER} + where preferential_id = #{preferentialId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/model/Preferential.java b/src/main/java/com/changyu/foryou/model/Preferential.java index c6c388a..6b22e42 100644 --- a/src/main/java/com/changyu/foryou/model/Preferential.java +++ b/src/main/java/com/changyu/foryou/model/Preferential.java @@ -40,4 +40,5 @@ public Integer getDiscountNum() { public void setDiscountNum(Integer discountNum) { this.discountNum = discountNum; } + } \ No newline at end of file diff --git a/src/main/java/com/changyu/foryou/service/PreferentialService.java b/src/main/java/com/changyu/foryou/service/PreferentialService.java new file mode 100644 index 0000000..9a1b5a9 --- /dev/null +++ b/src/main/java/com/changyu/foryou/service/PreferentialService.java @@ -0,0 +1,22 @@ +package com.changyu.foryou.service; + +import java.util.List; +import java.util.Map; + +import com.changyu.foryou.model.Preferential; + +public interface PreferentialService { + int deleteByPrimaryKey(Integer preferentialId); + + int insert(Preferential record); + + int insertSelective(Preferential record); + + Preferential selectByPrimaryKey(Integer preferentialId); + + int updateByPrimaryKeySelective(Preferential record); + + int updateByPrimaryKey(Preferential record); + + List getPreferential(Map paramMap); +} diff --git a/src/main/java/com/changyu/foryou/serviceImpl/PreferentialServiceImpl.java b/src/main/java/com/changyu/foryou/serviceImpl/PreferentialServiceImpl.java new file mode 100644 index 0000000..1a3bca3 --- /dev/null +++ b/src/main/java/com/changyu/foryou/serviceImpl/PreferentialServiceImpl.java @@ -0,0 +1,60 @@ +package com.changyu.foryou.serviceImpl; + +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.changyu.foryou.mapper.PreferentialMapper; +import com.changyu.foryou.model.Preferential; +import com.changyu.foryou.service.PreferentialService; + +@Service("preferentialService") +public class PreferentialServiceImpl implements PreferentialService { + @Autowired + private PreferentialMapper preferentialMapper; + + @Override + public int deleteByPrimaryKey(Integer preferentialId) { + // TODO Auto-generated method stub + return preferentialMapper.deleteByPrimaryKey(preferentialId); + } + + @Override + public int insert(Preferential record) { + // TODO Auto-generated method stub + return preferentialMapper.insert(record); + } + + @Override + public int insertSelective(Preferential record) { + // TODO Auto-generated method stub + return preferentialMapper.insert(record); + } + + @Override + public Preferential selectByPrimaryKey(Integer preferentialId) { + // TODO Auto-generated method stub + return preferentialMapper.selectByPrimaryKey(preferentialId); + } + + @Override + public int updateByPrimaryKeySelective(Preferential record) { + // TODO Auto-generated method stub + return preferentialMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(Preferential record) { + // TODO Auto-generated method stub + return preferentialMapper.updateByPrimaryKey(record); + } + + @Override + public List getPreferential(Map paramMap) { + // TODO Auto-generated method stub + return preferentialMapper.getPreferential(paramMap); + } + +} diff --git a/src/main/webapp/assets/bootstrap-table/jquery.validate.js b/src/main/webapp/assets/bootstrap-table/jquery.validate.js new file mode 100644 index 0000000..4e979bc --- /dev/null +++ b/src/main/webapp/assets/bootstrap-table/jquery.validate.js @@ -0,0 +1,1398 @@ +/*! + * jQuery Validation Plugin v1.14.0 + * + * http://jqueryvalidation.org/ + * + * Copyright (c) 2015 Jörn Zaefferer + * Released under the MIT license + */ +(function( factory ) { + if ( typeof define === "function" && define.amd ) { + define( ["jquery"], factory ); + } else { + factory( jQuery ); + } +}(function( $ ) { + +$.extend($.fn, { + // http://jqueryvalidation.org/validate/ + validate: function( options ) { + + // if nothing is selected, return nothing; can't chain anyway + if ( !this.length ) { + if ( options && options.debug && window.console ) { + console.warn( "Nothing selected, can't validate, returning nothing." ); + } + return; + } + + // check if a validator for this form was already created + var validator = $.data( this[ 0 ], "validator" ); + if ( validator ) { + return validator; + } + + // Add novalidate tag if HTML5. + this.attr( "novalidate", "novalidate" ); + + validator = new $.validator( options, this[ 0 ] ); + $.data( this[ 0 ], "validator", validator ); + + if ( validator.settings.onsubmit ) { + + this.on( "click.validate", ":submit", function( event ) { + if ( validator.settings.submitHandler ) { + validator.submitButton = event.target; + } + + // allow suppressing validation by adding a cancel class to the submit button + if ( $( this ).hasClass( "cancel" ) ) { + validator.cancelSubmit = true; + } + + // allow suppressing validation by adding the html5 formnovalidate attribute to the submit button + if ( $( this ).attr( "formnovalidate" ) !== undefined ) { + validator.cancelSubmit = true; + } + }); + + // validate the form on submit + this.on( "submit.validate", function( event ) { + if ( validator.settings.debug ) { + // prevent form submit to be able to see console output + event.preventDefault(); + } + function handle() { + var hidden, result; + if ( validator.settings.submitHandler ) { + if ( validator.submitButton ) { + // insert a hidden input as a replacement for the missing submit button + hidden = $( "" ) + .attr( "name", validator.submitButton.name ) + .val( $( validator.submitButton ).val() ) + .appendTo( validator.currentForm ); + } + result = validator.settings.submitHandler.call( validator, validator.currentForm, event ); + if ( validator.submitButton ) { + // and clean up afterwards; thanks to no-block-scope, hidden can be referenced + hidden.remove(); + } + if ( result !== undefined ) { + return result; + } + return false; + } + return true; + } + + // prevent submit for invalid forms or custom submit handlers + if ( validator.cancelSubmit ) { + validator.cancelSubmit = false; + return handle(); + } + if ( validator.form() ) { + if ( validator.pendingRequest ) { + validator.formSubmitted = true; + return false; + } + return handle(); + } else { + validator.focusInvalid(); + return false; + } + }); + } + + return validator; + }, + // http://jqueryvalidation.org/valid/ + valid: function() { + var valid, validator, errorList; + + if ( $( this[ 0 ] ).is( "form" ) ) { + valid = this.validate().form(); + } else { + errorList = []; + valid = true; + validator = $( this[ 0 ].form ).validate(); + this.each( function() { + valid = validator.element( this ) && valid; + errorList = errorList.concat( validator.errorList ); + }); + validator.errorList = errorList; + } + return valid; + }, + + // http://jqueryvalidation.org/rules/ + rules: function( command, argument ) { + var element = this[ 0 ], + settings, staticRules, existingRules, data, param, filtered; + + if ( command ) { + settings = $.data( element.form, "validator" ).settings; + staticRules = settings.rules; + existingRules = $.validator.staticRules( element ); + switch ( command ) { + case "add": + $.extend( existingRules, $.validator.normalizeRule( argument ) ); + // remove messages from rules, but allow them to be set separately + delete existingRules.messages; + staticRules[ element.name ] = existingRules; + if ( argument.messages ) { + settings.messages[ element.name ] = $.extend( settings.messages[ element.name ], argument.messages ); + } + break; + case "remove": + if ( !argument ) { + delete staticRules[ element.name ]; + return existingRules; + } + filtered = {}; + $.each( argument.split( /\s/ ), function( index, method ) { + filtered[ method ] = existingRules[ method ]; + delete existingRules[ method ]; + if ( method === "required" ) { + $( element ).removeAttr( "aria-required" ); + } + }); + return filtered; + } + } + + data = $.validator.normalizeRules( + $.extend( + {}, + $.validator.classRules( element ), + $.validator.attributeRules( element ), + $.validator.dataRules( element ), + $.validator.staticRules( element ) + ), element ); + + // make sure required is at front + if ( data.required ) { + param = data.required; + delete data.required; + data = $.extend( { required: param }, data ); + $( element ).attr( "aria-required", "true" ); + } + + // make sure remote is at back + if ( data.remote ) { + param = data.remote; + delete data.remote; + data = $.extend( data, { remote: param }); + } + + return data; + } +}); + +// Custom selectors +$.extend( $.expr[ ":" ], { + // http://jqueryvalidation.org/blank-selector/ + blank: function( a ) { + return !$.trim( "" + $( a ).val() ); + }, + // http://jqueryvalidation.org/filled-selector/ + filled: function( a ) { + return !!$.trim( "" + $( a ).val() ); + }, + // http://jqueryvalidation.org/unchecked-selector/ + unchecked: function( a ) { + return !$( a ).prop( "checked" ); + } +}); + +// constructor for validator +$.validator = function( options, form ) { + this.settings = $.extend( true, {}, $.validator.defaults, options ); + this.currentForm = form; + this.init(); +}; + +// http://jqueryvalidation.org/jQuery.validator.format/ +$.validator.format = function( source, params ) { + if ( arguments.length === 1 ) { + return function() { + var args = $.makeArray( arguments ); + args.unshift( source ); + return $.validator.format.apply( this, args ); + }; + } + if ( arguments.length > 2 && params.constructor !== Array ) { + params = $.makeArray( arguments ).slice( 1 ); + } + if ( params.constructor !== Array ) { + params = [ params ]; + } + $.each( params, function( i, n ) { + source = source.replace( new RegExp( "\\{" + i + "\\}", "g" ), function() { + return n; + }); + }); + return source; +}; + +$.extend( $.validator, { + + defaults: { + messages: {}, + groups: {}, + rules: {}, + errorClass: "error", + validClass: "valid", + errorElement: "label", + focusCleanup: false, + focusInvalid: true, + errorContainer: $( [] ), + errorLabelContainer: $( [] ), + onsubmit: true, + ignore: ":hidden", + ignoreTitle: false, + onfocusin: function( element ) { + this.lastActive = element; + + // Hide error label and remove error class on focus if enabled + if ( this.settings.focusCleanup ) { + if ( this.settings.unhighlight ) { + this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass ); + } + this.hideThese( this.errorsFor( element ) ); + } + }, + onfocusout: function( element ) { + if ( !this.checkable( element ) && ( element.name in this.submitted || !this.optional( element ) ) ) { + this.element( element ); + } + }, + onkeyup: function( element, event ) { + // Avoid revalidate the field when pressing one of the following keys + // Shift => 16 + // Ctrl => 17 + // Alt => 18 + // Caps lock => 20 + // End => 35 + // Home => 36 + // Left arrow => 37 + // Up arrow => 38 + // Right arrow => 39 + // Down arrow => 40 + // Insert => 45 + // Num lock => 144 + // AltGr key => 225 + var excludedKeys = [ + 16, 17, 18, 20, 35, 36, 37, + 38, 39, 40, 45, 144, 225 + ]; + + if ( event.which === 9 && this.elementValue( element ) === "" || $.inArray( event.keyCode, excludedKeys ) !== -1 ) { + return; + } else if ( element.name in this.submitted || element === this.lastElement ) { + this.element( element ); + } + }, + onclick: function( element ) { + // click on selects, radiobuttons and checkboxes + if ( element.name in this.submitted ) { + this.element( element ); + + // or option elements, check parent select in that case + } else if ( element.parentNode.name in this.submitted ) { + this.element( element.parentNode ); + } + }, + highlight: function( element, errorClass, validClass ) { + if ( element.type === "radio" ) { + this.findByName( element.name ).addClass( errorClass ).removeClass( validClass ); + } else { + $( element ).addClass( errorClass ).removeClass( validClass ); + } + }, + unhighlight: function( element, errorClass, validClass ) { + if ( element.type === "radio" ) { + this.findByName( element.name ).removeClass( errorClass ).addClass( validClass ); + } else { + $( element ).removeClass( errorClass ).addClass( validClass ); + } + } + }, + + // http://jqueryvalidation.org/jQuery.validator.setDefaults/ + setDefaults: function( settings ) { + $.extend( $.validator.defaults, settings ); + }, + + messages: { + required: "This field is required.", + remote: "Please fix this field.", + email: "Please enter a valid email address.", + url: "Please enter a valid URL.", + date: "Please enter a valid date.", + dateISO: "Please enter a valid date ( ISO ).", + number: "Please enter a valid number.", + digits: "Please enter only digits.", + creditcard: "Please enter a valid credit card number.", + equalTo: "Please enter the same value again.", + maxlength: $.validator.format( "Please enter no more than {0} characters." ), + minlength: $.validator.format( "Please enter at least {0} characters." ), + rangelength: $.validator.format( "Please enter a value between {0} and {1} characters long." ), + range: $.validator.format( "Please enter a value between {0} and {1}." ), + max: $.validator.format( "Please enter a value less than or equal to {0}." ), + min: $.validator.format( "Please enter a value greater than or equal to {0}." ) + }, + + autoCreateRanges: false, + + prototype: { + + init: function() { + this.labelContainer = $( this.settings.errorLabelContainer ); + this.errorContext = this.labelContainer.length && this.labelContainer || $( this.currentForm ); + this.containers = $( this.settings.errorContainer ).add( this.settings.errorLabelContainer ); + this.submitted = {}; + this.valueCache = {}; + this.pendingRequest = 0; + this.pending = {}; + this.invalid = {}; + this.reset(); + + var groups = ( this.groups = {} ), + rules; + $.each( this.settings.groups, function( key, value ) { + if ( typeof value === "string" ) { + value = value.split( /\s/ ); + } + $.each( value, function( index, name ) { + groups[ name ] = key; + }); + }); + rules = this.settings.rules; + $.each( rules, function( key, value ) { + rules[ key ] = $.validator.normalizeRule( value ); + }); + + function delegate( event ) { + var validator = $.data( this.form, "validator" ), + eventType = "on" + event.type.replace( /^validate/, "" ), + settings = validator.settings; + if ( settings[ eventType ] && !$( this ).is( settings.ignore ) ) { + settings[ eventType ].call( validator, this, event ); + } + } + + $( this.currentForm ) + .on( "focusin.validate focusout.validate keyup.validate", + ":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " + + "[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " + + "[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " + + "[type='radio'], [type='checkbox']", delegate) + // Support: Chrome, oldIE + // "select" is provided as event.target when clicking a option + .on("click.validate", "select, option, [type='radio'], [type='checkbox']", delegate); + + if ( this.settings.invalidHandler ) { + $( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler ); + } + + // Add aria-required to any Static/Data/Class required fields before first validation + // Screen readers require this attribute to be present before the initial submission http://www.w3.org/TR/WCAG-TECHS/ARIA2.html + $( this.currentForm ).find( "[required], [data-rule-required], .required" ).attr( "aria-required", "true" ); + }, + + // http://jqueryvalidation.org/Validator.form/ + form: function() { + this.checkForm(); + $.extend( this.submitted, this.errorMap ); + this.invalid = $.extend({}, this.errorMap ); + if ( !this.valid() ) { + $( this.currentForm ).triggerHandler( "invalid-form", [ this ]); + } + this.showErrors(); + return this.valid(); + }, + + checkForm: function() { + this.prepareForm(); + for ( var i = 0, elements = ( this.currentElements = this.elements() ); elements[ i ]; i++ ) { + this.check( elements[ i ] ); + } + return this.valid(); + }, + + // http://jqueryvalidation.org/Validator.element/ + element: function( element ) { + var cleanElement = this.clean( element ), + checkElement = this.validationTargetFor( cleanElement ), + result = true; + + this.lastElement = checkElement; + + if ( checkElement === undefined ) { + delete this.invalid[ cleanElement.name ]; + } else { + this.prepareElement( checkElement ); + this.currentElements = $( checkElement ); + + result = this.check( checkElement ) !== false; + if ( result ) { + delete this.invalid[ checkElement.name ]; + } else { + this.invalid[ checkElement.name ] = true; + } + } + // Add aria-invalid status for screen readers + $( element ).attr( "aria-invalid", !result ); + + if ( !this.numberOfInvalids() ) { + // Hide error containers on last error + this.toHide = this.toHide.add( this.containers ); + } + this.showErrors(); + return result; + }, + + // http://jqueryvalidation.org/Validator.showErrors/ + showErrors: function( errors ) { + if ( errors ) { + // add items to error list and map + $.extend( this.errorMap, errors ); + this.errorList = []; + for ( var name in errors ) { + this.errorList.push({ + message: errors[ name ], + element: this.findByName( name )[ 0 ] + }); + } + // remove items from success list + this.successList = $.grep( this.successList, function( element ) { + return !( element.name in errors ); + }); + } + if ( this.settings.showErrors ) { + this.settings.showErrors.call( this, this.errorMap, this.errorList ); + } else { + this.defaultShowErrors(); + } + }, + + // http://jqueryvalidation.org/Validator.resetForm/ + resetForm: function() { + if ( $.fn.resetForm ) { + $( this.currentForm ).resetForm(); + } + this.submitted = {}; + this.lastElement = null; + this.prepareForm(); + this.hideErrors(); + var i, elements = this.elements() + .removeData( "previousValue" ) + .removeAttr( "aria-invalid" ); + + if ( this.settings.unhighlight ) { + for ( i = 0; elements[ i ]; i++ ) { + this.settings.unhighlight.call( this, elements[ i ], + this.settings.errorClass, "" ); + } + } else { + elements.removeClass( this.settings.errorClass ); + } + }, + + numberOfInvalids: function() { + return this.objectLength( this.invalid ); + }, + + objectLength: function( obj ) { + /* jshint unused: false */ + var count = 0, + i; + for ( i in obj ) { + count++; + } + return count; + }, + + hideErrors: function() { + this.hideThese( this.toHide ); + }, + + hideThese: function( errors ) { + errors.not( this.containers ).text( "" ); + this.addWrapper( errors ).hide(); + }, + + valid: function() { + return this.size() === 0; + }, + + size: function() { + return this.errorList.length; + }, + + focusInvalid: function() { + if ( this.settings.focusInvalid ) { + try { + $( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || []) + .filter( ":visible" ) + .focus() + // manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find + .trigger( "focusin" ); + } catch ( e ) { + // ignore IE throwing errors when focusing hidden elements + } + } + }, + + findLastActive: function() { + var lastActive = this.lastActive; + return lastActive && $.grep( this.errorList, function( n ) { + return n.element.name === lastActive.name; + }).length === 1 && lastActive; + }, + + elements: function() { + var validator = this, + rulesCache = {}; + + // select all valid inputs inside the form (no submit or reset buttons) + return $( this.currentForm ) + .find( "input, select, textarea" ) + .not( ":submit, :reset, :image, :disabled" ) + .not( this.settings.ignore ) + .filter( function() { + if ( !this.name && validator.settings.debug && window.console ) { + console.error( "%o has no name assigned", this ); + } + + // select only the first element for each name, and only those with rules specified + if ( this.name in rulesCache || !validator.objectLength( $( this ).rules() ) ) { + return false; + } + + rulesCache[ this.name ] = true; + return true; + }); + }, + + clean: function( selector ) { + return $( selector )[ 0 ]; + }, + + errors: function() { + var errorClass = this.settings.errorClass.split( " " ).join( "." ); + return $( this.settings.errorElement + "." + errorClass, this.errorContext ); + }, + + reset: function() { + this.successList = []; + this.errorList = []; + this.errorMap = {}; + this.toShow = $( [] ); + this.toHide = $( [] ); + this.currentElements = $( [] ); + }, + + prepareForm: function() { + this.reset(); + this.toHide = this.errors().add( this.containers ); + }, + + prepareElement: function( element ) { + this.reset(); + this.toHide = this.errorsFor( element ); + }, + + elementValue: function( element ) { + var val, + $element = $( element ), + type = element.type; + + if ( type === "radio" || type === "checkbox" ) { + return this.findByName( element.name ).filter(":checked").val(); + } else if ( type === "number" && typeof element.validity !== "undefined" ) { + return element.validity.badInput ? false : $element.val(); + } + + val = $element.val(); + if ( typeof val === "string" ) { + return val.replace(/\r/g, "" ); + } + return val; + }, + + check: function( element ) { + element = this.validationTargetFor( this.clean( element ) ); + + var rules = $( element ).rules(), + rulesCount = $.map( rules, function( n, i ) { + return i; + }).length, + dependencyMismatch = false, + val = this.elementValue( element ), + result, method, rule; + + for ( method in rules ) { + rule = { method: method, parameters: rules[ method ] }; + try { + + result = $.validator.methods[ method ].call( this, val, element, rule.parameters ); + + // if a method indicates that the field is optional and therefore valid, + // don't mark it as valid when there are no other rules + if ( result === "dependency-mismatch" && rulesCount === 1 ) { + dependencyMismatch = true; + continue; + } + dependencyMismatch = false; + + if ( result === "pending" ) { + this.toHide = this.toHide.not( this.errorsFor( element ) ); + return; + } + + if ( !result ) { + this.formatAndAdd( element, rule ); + return false; + } + } catch ( e ) { + if ( this.settings.debug && window.console ) { + console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e ); + } + if ( e instanceof TypeError ) { + e.message += ". Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method."; + } + + throw e; + } + } + if ( dependencyMismatch ) { + return; + } + if ( this.objectLength( rules ) ) { + this.successList.push( element ); + } + return true; + }, + + // return the custom message for the given element and validation method + // specified in the element's HTML5 data attribute + // return the generic message if present and no method specific message is present + customDataMessage: function( element, method ) { + return $( element ).data( "msg" + method.charAt( 0 ).toUpperCase() + + method.substring( 1 ).toLowerCase() ) || $( element ).data( "msg" ); + }, + + // return the custom message for the given element name and validation method + customMessage: function( name, method ) { + var m = this.settings.messages[ name ]; + return m && ( m.constructor === String ? m : m[ method ]); + }, + + // return the first defined argument, allowing empty strings + findDefined: function() { + for ( var i = 0; i < arguments.length; i++) { + if ( arguments[ i ] !== undefined ) { + return arguments[ i ]; + } + } + return undefined; + }, + + defaultMessage: function( element, method ) { + return this.findDefined( + this.customMessage( element.name, method ), + this.customDataMessage( element, method ), + // title is never undefined, so handle empty string as undefined + !this.settings.ignoreTitle && element.title || undefined, + $.validator.messages[ method ], + "Warning: No message defined for " + element.name + "" + ); + }, + + formatAndAdd: function( element, rule ) { + var message = this.defaultMessage( element, rule.method ), + theregex = /\$?\{(\d+)\}/g; + if ( typeof message === "function" ) { + message = message.call( this, rule.parameters, element ); + } else if ( theregex.test( message ) ) { + message = $.validator.format( message.replace( theregex, "{$1}" ), rule.parameters ); + } + this.errorList.push({ + message: message, + element: element, + method: rule.method + }); + + this.errorMap[ element.name ] = message; + this.submitted[ element.name ] = message; + }, + + addWrapper: function( toToggle ) { + if ( this.settings.wrapper ) { + toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) ); + } + return toToggle; + }, + + defaultShowErrors: function() { + var i, elements, error; + for ( i = 0; this.errorList[ i ]; i++ ) { + error = this.errorList[ i ]; + if ( this.settings.highlight ) { + this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass ); + } + this.showLabel( error.element, error.message ); + } + if ( this.errorList.length ) { + this.toShow = this.toShow.add( this.containers ); + } + if ( this.settings.success ) { + for ( i = 0; this.successList[ i ]; i++ ) { + this.showLabel( this.successList[ i ] ); + } + } + if ( this.settings.unhighlight ) { + for ( i = 0, elements = this.validElements(); elements[ i ]; i++ ) { + this.settings.unhighlight.call( this, elements[ i ], this.settings.errorClass, this.settings.validClass ); + } + } + this.toHide = this.toHide.not( this.toShow ); + this.hideErrors(); + this.addWrapper( this.toShow ).show(); + }, + + validElements: function() { + return this.currentElements.not( this.invalidElements() ); + }, + + invalidElements: function() { + return $( this.errorList ).map(function() { + return this.element; + }); + }, + + showLabel: function( element, message ) { + var place, group, errorID, + error = this.errorsFor( element ), + elementID = this.idOrName( element ), + describedBy = $( element ).attr( "aria-describedby" ); + if ( error.length ) { + // refresh error/success class + error.removeClass( this.settings.validClass ).addClass( this.settings.errorClass ); + // replace message on existing label + error.html( message ); + } else { + // create error element + error = $( "<" + this.settings.errorElement + ">" ) + .attr( "id", elementID + "-error" ) + .addClass( this.settings.errorClass ) + .html( message || "" ); + + // Maintain reference to the element to be placed into the DOM + place = error; + if ( this.settings.wrapper ) { + // make sure the element is visible, even in IE + // actually showing the wrapped element is handled elsewhere + place = error.hide().show().wrap( "<" + this.settings.wrapper + "/>" ).parent(); + } + if ( this.labelContainer.length ) { + this.labelContainer.append( place ); + } else if ( this.settings.errorPlacement ) { + this.settings.errorPlacement( place, $( element ) ); + } else { + place.insertAfter( element ); + } + + // Link error back to the element + if ( error.is( "label" ) ) { + // If the error is a label, then associate using 'for' + error.attr( "for", elementID ); + } else if ( error.parents( "label[for='" + elementID + "']" ).length === 0 ) { + // If the element is not a child of an associated label, then it's necessary + // to explicitly apply aria-describedby + + errorID = error.attr( "id" ).replace( /(:|\.|\[|\]|\$)/g, "\\$1"); + // Respect existing non-error aria-describedby + if ( !describedBy ) { + describedBy = errorID; + } else if ( !describedBy.match( new RegExp( "\\b" + errorID + "\\b" ) ) ) { + // Add to end of list if not already present + describedBy += " " + errorID; + } + $( element ).attr( "aria-describedby", describedBy ); + + // If this element is grouped, then assign to all elements in the same group + group = this.groups[ element.name ]; + if ( group ) { + $.each( this.groups, function( name, testgroup ) { + if ( testgroup === group ) { + $( "[name='" + name + "']", this.currentForm ) + .attr( "aria-describedby", error.attr( "id" ) ); + } + }); + } + } + } + if ( !message && this.settings.success ) { + error.text( "" ); + if ( typeof this.settings.success === "string" ) { + error.addClass( this.settings.success ); + } else { + this.settings.success( error, element ); + } + } + this.toShow = this.toShow.add( error ); + }, + + errorsFor: function( element ) { + var name = this.idOrName( element ), + describer = $( element ).attr( "aria-describedby" ), + selector = "label[for='" + name + "'], label[for='" + name + "'] *"; + + // aria-describedby should directly reference the error element + if ( describer ) { + selector = selector + ", #" + describer.replace( /\s+/g, ", #" ); + } + return this + .errors() + .filter( selector ); + }, + + idOrName: function( element ) { + return this.groups[ element.name ] || ( this.checkable( element ) ? element.name : element.id || element.name ); + }, + + validationTargetFor: function( element ) { + + // If radio/checkbox, validate first element in group instead + if ( this.checkable( element ) ) { + element = this.findByName( element.name ); + } + + // Always apply ignore filter + return $( element ).not( this.settings.ignore )[ 0 ]; + }, + + checkable: function( element ) { + return ( /radio|checkbox/i ).test( element.type ); + }, + + findByName: function( name ) { + return $( this.currentForm ).find( "[name='" + name + "']" ); + }, + + getLength: function( value, element ) { + switch ( element.nodeName.toLowerCase() ) { + case "select": + return $( "option:selected", element ).length; + case "input": + if ( this.checkable( element ) ) { + return this.findByName( element.name ).filter( ":checked" ).length; + } + } + return value.length; + }, + + depend: function( param, element ) { + return this.dependTypes[typeof param] ? this.dependTypes[typeof param]( param, element ) : true; + }, + + dependTypes: { + "boolean": function( param ) { + return param; + }, + "string": function( param, element ) { + return !!$( param, element.form ).length; + }, + "function": function( param, element ) { + return param( element ); + } + }, + + optional: function( element ) { + var val = this.elementValue( element ); + return !$.validator.methods.required.call( this, val, element ) && "dependency-mismatch"; + }, + + startRequest: function( element ) { + if ( !this.pending[ element.name ] ) { + this.pendingRequest++; + this.pending[ element.name ] = true; + } + }, + + stopRequest: function( element, valid ) { + this.pendingRequest--; + // sometimes synchronization fails, make sure pendingRequest is never < 0 + if ( this.pendingRequest < 0 ) { + this.pendingRequest = 0; + } + delete this.pending[ element.name ]; + if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) { + $( this.currentForm ).submit(); + this.formSubmitted = false; + } else if (!valid && this.pendingRequest === 0 && this.formSubmitted ) { + $( this.currentForm ).triggerHandler( "invalid-form", [ this ]); + this.formSubmitted = false; + } + }, + + previousValue: function( element ) { + return $.data( element, "previousValue" ) || $.data( element, "previousValue", { + old: null, + valid: true, + message: this.defaultMessage( element, "remote" ) + }); + }, + + // cleans up all forms and elements, removes validator-specific events + destroy: function() { + this.resetForm(); + + $( this.currentForm ) + .off( ".validate" ) + .removeData( "validator" ); + } + + }, + + classRuleSettings: { + required: { required: true }, + email: { email: true }, + url: { url: true }, + date: { date: true }, + dateISO: { dateISO: true }, + number: { number: true }, + digits: { digits: true }, + creditcard: { creditcard: true } + }, + + addClassRules: function( className, rules ) { + if ( className.constructor === String ) { + this.classRuleSettings[ className ] = rules; + } else { + $.extend( this.classRuleSettings, className ); + } + }, + + classRules: function( element ) { + var rules = {}, + classes = $( element ).attr( "class" ); + + if ( classes ) { + $.each( classes.split( " " ), function() { + if ( this in $.validator.classRuleSettings ) { + $.extend( rules, $.validator.classRuleSettings[ this ]); + } + }); + } + return rules; + }, + + normalizeAttributeRule: function( rules, type, method, value ) { + + // convert the value to a number for number inputs, and for text for backwards compability + // allows type="date" and others to be compared as strings + if ( /min|max/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) { + value = Number( value ); + + // Support Opera Mini, which returns NaN for undefined minlength + if ( isNaN( value ) ) { + value = undefined; + } + } + + if ( value || value === 0 ) { + rules[ method ] = value; + } else if ( type === method && type !== "range" ) { + + // exception: the jquery validate 'range' method + // does not test for the html5 'range' type + rules[ method ] = true; + } + }, + + attributeRules: function( element ) { + var rules = {}, + $element = $( element ), + type = element.getAttribute( "type" ), + method, value; + + for ( method in $.validator.methods ) { + + // support for in both html5 and older browsers + if ( method === "required" ) { + value = element.getAttribute( method ); + + // Some browsers return an empty string for the required attribute + // and non-HTML5 browsers might have required="" markup + if ( value === "" ) { + value = true; + } + + // force non-HTML5 browsers to return bool + value = !!value; + } else { + value = $element.attr( method ); + } + + this.normalizeAttributeRule( rules, type, method, value ); + } + + // maxlength may be returned as -1, 2147483647 ( IE ) and 524288 ( safari ) for text inputs + if ( rules.maxlength && /-1|2147483647|524288/.test( rules.maxlength ) ) { + delete rules.maxlength; + } + + return rules; + }, + + dataRules: function( element ) { + var rules = {}, + $element = $( element ), + type = element.getAttribute( "type" ), + method, value; + + for ( method in $.validator.methods ) { + value = $element.data( "rule" + method.charAt( 0 ).toUpperCase() + method.substring( 1 ).toLowerCase() ); + this.normalizeAttributeRule( rules, type, method, value ); + } + return rules; + }, + + staticRules: function( element ) { + var rules = {}, + validator = $.data( element.form, "validator" ); + + if ( validator.settings.rules ) { + rules = $.validator.normalizeRule( validator.settings.rules[ element.name ] ) || {}; + } + return rules; + }, + + normalizeRules: function( rules, element ) { + // handle dependency check + $.each( rules, function( prop, val ) { + // ignore rule when param is explicitly false, eg. required:false + if ( val === false ) { + delete rules[ prop ]; + return; + } + if ( val.param || val.depends ) { + var keepRule = true; + switch ( typeof val.depends ) { + case "string": + keepRule = !!$( val.depends, element.form ).length; + break; + case "function": + keepRule = val.depends.call( element, element ); + break; + } + if ( keepRule ) { + rules[ prop ] = val.param !== undefined ? val.param : true; + } else { + delete rules[ prop ]; + } + } + }); + + // evaluate parameters + $.each( rules, function( rule, parameter ) { + rules[ rule ] = $.isFunction( parameter ) ? parameter( element ) : parameter; + }); + + // clean number parameters + $.each([ "minlength", "maxlength" ], function() { + if ( rules[ this ] ) { + rules[ this ] = Number( rules[ this ] ); + } + }); + $.each([ "rangelength", "range" ], function() { + var parts; + if ( rules[ this ] ) { + if ( $.isArray( rules[ this ] ) ) { + rules[ this ] = [ Number( rules[ this ][ 0 ]), Number( rules[ this ][ 1 ] ) ]; + } else if ( typeof rules[ this ] === "string" ) { + parts = rules[ this ].replace(/[\[\]]/g, "" ).split( /[\s,]+/ ); + rules[ this ] = [ Number( parts[ 0 ]), Number( parts[ 1 ] ) ]; + } + } + }); + + if ( $.validator.autoCreateRanges ) { + // auto-create ranges + if ( rules.min != null && rules.max != null ) { + rules.range = [ rules.min, rules.max ]; + delete rules.min; + delete rules.max; + } + if ( rules.minlength != null && rules.maxlength != null ) { + rules.rangelength = [ rules.minlength, rules.maxlength ]; + delete rules.minlength; + delete rules.maxlength; + } + } + + return rules; + }, + + // Converts a simple string to a {string: true} rule, e.g., "required" to {required:true} + normalizeRule: function( data ) { + if ( typeof data === "string" ) { + var transformed = {}; + $.each( data.split( /\s/ ), function() { + transformed[ this ] = true; + }); + data = transformed; + } + return data; + }, + + // http://jqueryvalidation.org/jQuery.validator.addMethod/ + addMethod: function( name, method, message ) { + $.validator.methods[ name ] = method; + $.validator.messages[ name ] = message !== undefined ? message : $.validator.messages[ name ]; + if ( method.length < 3 ) { + $.validator.addClassRules( name, $.validator.normalizeRule( name ) ); + } + }, + + methods: { + + // http://jqueryvalidation.org/required-method/ + required: function( value, element, param ) { + // check if dependency is met + if ( !this.depend( param, element ) ) { + return "dependency-mismatch"; + } + if ( element.nodeName.toLowerCase() === "select" ) { + // could be an array for select-multiple or a string, both are fine this way + var val = $( element ).val(); + return val && val.length > 0; + } + if ( this.checkable( element ) ) { + return this.getLength( value, element ) > 0; + } + return value.length > 0; + }, + + // http://jqueryvalidation.org/email-method/ + email: function( value, element ) { + // From https://html.spec.whatwg.org/multipage/forms.html#valid-e-mail-address + // Retrieved 2014-01-14 + // If you have a problem with this implementation, report a bug against the above spec + // Or use custom methods to implement your own email validation + return this.optional( element ) || /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test( value ); + }, + + // http://jqueryvalidation.org/url-method/ + url: function( value, element ) { + + // Copyright (c) 2010-2013 Diego Perini, MIT licensed + // https://gist.github.com/dperini/729294 + // see also https://mathiasbynens.be/demo/url-regex + // modified to allow protocol-relative URLs + return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value ); + }, + + // http://jqueryvalidation.org/date-method/ + date: function( value, element ) { + return this.optional( element ) || !/Invalid|NaN/.test( new Date( value ).toString() ); + }, + + // http://jqueryvalidation.org/dateISO-method/ + dateISO: function( value, element ) { + return this.optional( element ) || /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test( value ); + }, + + // http://jqueryvalidation.org/number-method/ + number: function( value, element ) { + return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value ); + }, + + // http://jqueryvalidation.org/digits-method/ + digits: function( value, element ) { + return this.optional( element ) || /^\d+$/.test( value ); + }, + + // http://jqueryvalidation.org/creditcard-method/ + // based on http://en.wikipedia.org/wiki/Luhn_algorithm + creditcard: function( value, element ) { + if ( this.optional( element ) ) { + return "dependency-mismatch"; + } + // accept only spaces, digits and dashes + if ( /[^0-9 \-]+/.test( value ) ) { + return false; + } + var nCheck = 0, + nDigit = 0, + bEven = false, + n, cDigit; + + value = value.replace( /\D/g, "" ); + + // Basing min and max length on + // http://developer.ean.com/general_info/Valid_Credit_Card_Types + if ( value.length < 13 || value.length > 19 ) { + return false; + } + + for ( n = value.length - 1; n >= 0; n--) { + cDigit = value.charAt( n ); + nDigit = parseInt( cDigit, 10 ); + if ( bEven ) { + if ( ( nDigit *= 2 ) > 9 ) { + nDigit -= 9; + } + } + nCheck += nDigit; + bEven = !bEven; + } + + return ( nCheck % 10 ) === 0; + }, + + // http://jqueryvalidation.org/minlength-method/ + minlength: function( value, element, param ) { + var length = $.isArray( value ) ? value.length : this.getLength( value, element ); + return this.optional( element ) || length >= param; + }, + + // http://jqueryvalidation.org/maxlength-method/ + maxlength: function( value, element, param ) { + var length = $.isArray( value ) ? value.length : this.getLength( value, element ); + return this.optional( element ) || length <= param; + }, + + // http://jqueryvalidation.org/rangelength-method/ + rangelength: function( value, element, param ) { + var length = $.isArray( value ) ? value.length : this.getLength( value, element ); + return this.optional( element ) || ( length >= param[ 0 ] && length <= param[ 1 ] ); + }, + + // http://jqueryvalidation.org/min-method/ + min: function( value, element, param ) { + return this.optional( element ) || value >= param; + }, + + // http://jqueryvalidation.org/max-method/ + max: function( value, element, param ) { + return this.optional( element ) || value <= param; + }, + + // http://jqueryvalidation.org/range-method/ + range: function( value, element, param ) { + return this.optional( element ) || ( value >= param[ 0 ] && value <= param[ 1 ] ); + }, + + // http://jqueryvalidation.org/equalTo-method/ + equalTo: function( value, element, param ) { + // bind to the blur event of the target in order to revalidate whenever the target field is updated + // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead + var target = $( param ); + if ( this.settings.onfocusout ) { + target.off( ".validate-equalTo" ).on( "blur.validate-equalTo", function() { + $( element ).valid(); + }); + } + return value === target.val(); + }, + + // http://jqueryvalidation.org/remote-method/ + remote: function( value, element, param ) { + if ( this.optional( element ) ) { + return "dependency-mismatch"; + } + + var previous = this.previousValue( element ), + validator, data; + + if (!this.settings.messages[ element.name ] ) { + this.settings.messages[ element.name ] = {}; + } + previous.originalMessage = this.settings.messages[ element.name ].remote; + this.settings.messages[ element.name ].remote = previous.message; + + param = typeof param === "string" && { url: param } || param; + + if ( previous.old === value ) { + return previous.valid; + } + + previous.old = value; + validator = this; + this.startRequest( element ); + data = {}; + data[ element.name ] = value; + $.ajax( $.extend( true, { + mode: "abort", + port: "validate" + element.name, + dataType: "json", + data: data, + context: validator.currentForm, + success: function( response ) { + var valid = response === true || response === "true", + errors, message, submitted; + + validator.settings.messages[ element.name ].remote = previous.originalMessage; + if ( valid ) { + submitted = validator.formSubmitted; + validator.prepareElement( element ); + validator.formSubmitted = submitted; + validator.successList.push( element ); + delete validator.invalid[ element.name ]; + validator.showErrors(); + } else { + errors = {}; + message = response || validator.defaultMessage( element, "remote" ); + errors[ element.name ] = previous.message = $.isFunction( message ) ? message( value ) : message; + validator.invalid[ element.name ] = true; + validator.showErrors( errors ); + } + previous.valid = valid; + validator.stopRequest( element, valid ); + } + }, param ) ); + return "pending"; + } + } + +}); + +// ajax mode: abort +// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]}); +// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort() + +var pendingRequests = {}, + ajax; +// Use a prefilter if available (1.5+) +if ( $.ajaxPrefilter ) { + $.ajaxPrefilter(function( settings, _, xhr ) { + var port = settings.port; + if ( settings.mode === "abort" ) { + if ( pendingRequests[port] ) { + pendingRequests[port].abort(); + } + pendingRequests[port] = xhr; + } + }); +} else { + // Proxy ajax + ajax = $.ajax; + $.ajax = function( settings ) { + var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode, + port = ( "port" in settings ? settings : $.ajaxSettings ).port; + if ( mode === "abort" ) { + if ( pendingRequests[port] ) { + pendingRequests[port].abort(); + } + pendingRequests[port] = ajax.apply(this, arguments); + return pendingRequests[port]; + } + return ajax.apply(this, arguments); + }; +} + +})); \ No newline at end of file diff --git a/src/main/webapp/assets/bootstrap-table/messages_cn.js b/src/main/webapp/assets/bootstrap-table/messages_cn.js new file mode 100644 index 0000000..d38bf55 --- /dev/null +++ b/src/main/webapp/assets/bootstrap-table/messages_cn.js @@ -0,0 +1,22 @@ +/** + * 修改jquery.validate.js的默认提示 + */ +jQuery.extend(jQuery.validator.messages, { + required: "必选字段", + remote: "请修正该字段", + email: "请输入正确格式的电子邮件", + url: "请输入合法的网址", + date: "请输入合法的日期", + dateISO: "请输入合法的日期 (ISO).", + number: "请输入合法的数字", + digits: "只能输入整数", + creditcard: "请输入合法的信用卡号", + equalTo: "请再次输入相同的值", + accept: "请输入拥有合法后缀名的字符串", + maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"), + minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"), + rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"), + range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"), + max: jQuery.validator.format("请输入一个最大为{0} 的值"), + min: jQuery.validator.format("请输入一个最小为{0} 的值") +}); \ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 31f8df5..17ab9ad 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -47,7 +47,7 @@

- +

@@ -112,7 +112,14 @@
- +
+
+ + 满减优惠 + +
+
+

食品评价 @@ -197,9 +204,46 @@ + + - - - - - - - - - - -
@@ -72,7 +56,7 @@
校区管理员管理

添加校区管理员

-
+
校区名称
@@ -90,20 +74,20 @@
添加校区管理员

校区管理员名称
- +

密码
- +

- +

@@ -121,7 +105,7 @@
添加校区管理员

删除校区管理员

-
+

校区ID
@@ -163,7 +147,7 @@
修改校区管理员

- +
校区名称
@@ -181,7 +165,7 @@
修改校区管理员

校区管理员
- +

@@ -196,12 +180,62 @@
修改校区管理员

- + + + + + + + + + + + + + + + +
@@ -15,27 +24,32 @@
一键关店

+
+ + 设置成功 + +

- 校区 + 校区
-

- 原因 + 原因
- +

- - + +

@@ -43,17 +57,32 @@

+ \ No newline at end of file diff --git a/src/main/webapp/pages/feedback.html b/src/main/webapp/pages/feedback.html index 1d4b0d1..0aad053 100644 --- a/src/main/webapp/pages/feedback.html +++ b/src/main/webapp/pages/feedback.html @@ -3,25 +3,14 @@ 用户反馈 - - + + + - - - - - - - - - - - -

@@ -50,6 +39,23 @@
用户反馈

- + + + + + + + + + + + + + + diff --git a/src/main/webapp/pages/food.html b/src/main/webapp/pages/food.html index 1ba08ee..d71292d 100644 --- a/src/main/webapp/pages/food.html +++ b/src/main/webapp/pages/food.html @@ -3,24 +3,13 @@ 食品管理 - - + + + - - - - - - - - - - - - +

@@ -52,13 +42,13 @@
零食管理

@@ -71,7 +61,7 @@
零食管理
食品Id - 昵称 + 昵称食品价格折扣价 @@ -426,7 +416,24 @@
编辑口味

--> - + + + + + + + + + + + + + + + diff --git a/src/main/webapp/pages/food_category.html b/src/main/webapp/pages/food_category.html index b2ed0ca..9387e58 100644 --- a/src/main/webapp/pages/food_category.html +++ b/src/main/webapp/pages/food_category.html @@ -3,53 +3,38 @@ 无标题文档 - - - + + + + + +

+
+
零食管理
+
- - - - - - - - - - - -

-
-
零食管理
-
- -
- - - -
-
- + + + + +
+
@@ -58,12 +43,12 @@
零食管理
+ data-sortable="true">折扣价 + data-sortable="true">成本价 + data-sortable="true">食品标签

昵称食品价格折扣价食品状态成本价食品标签

@@ -73,97 +58,116 @@
零食管理

零食一级分类管理

零食分类管理

零食一级分类管理

零食管理

编辑口味

编辑口味

零食分类管理

零食分类管理

添加食品

校区管理

用户管理

return "超级管理员"; else if (value == "1") { return "管理员"; - } else { + } else if(value == "2"){ return "普通用户"; } } @@ -99,14 +135,14 @@

function actionFormatter(value, row, index) { if(adminType==0){ return [ - '', - '', + '', + '', '', - '', - '', + '', + '', '', - '', - '', + '', + '', '' ].join(''); }else if(adminType==1){ @@ -121,11 +157,14 @@

校区管理

校区管理

添加食品

修改校区管理员

- 用户管理 -

用户管理

校区管理员管理

校区管理

添加城市

添加城市

添加城市

添加城市

添加城市

添加城市

添加城市

添加城市

添加城市

校区管理员管理

添加校区管理员

删除校区管理员

修改校区管理员

修改校区管理员

修改校区管理员

修改校区管理员

修改校区管理员

Hello World!

零食管理

零食分类管理

搜索标签管理 网站搜索框下的热门搜索

校区管理员管理

添加校区管理员

添加校区管理员

添加校区管理员

删除校区管理员

修改校区管理员

修改校区管理员

修改校区管理员

一键关店

用户反馈

零食管理

零食管理

编辑口味

零食管理

零食管理

零食管理

零食管理

添加新闻

满减优惠管理

添加口味

编辑口味

编辑口味

编辑口味

编辑口味

编辑口味

编辑口味

零食分类管理

商品分类管理

零食分类管理

零食分类管理

添加食品

添加商品

添加食品

添加食品

添加食品

- 食品评价管理 + 商品评价管理

零食分类管理

商品分类管理

搜索标签管理网站搜索框下的热门搜索

文件为非图片格式

文件太大
-
服务器崩溃
-
在该时间（精确到秒）同时有多人上传图片。（可能性较小）

如还不能够解决请联系管理员！