Merge branch 'master' of http://git.yueguanjia.com/alpha/ygj-yuemum

src/main/java/com/ygj/yuemum/controller/order/YSOrderController.java

@@ -4,23 +4,29 @@ package com.ygj.yuemum.controller.order;
 import com.alibaba.fastjson.JSONObject;
 import com.ygj.yuemum.domain.order.YSOrder;
 import com.ygj.yuemum.domain.order.YSOrderServiceLog;
+import com.ygj.yuemum.domain.pay.CustomerPay;
 import com.ygj.yuemum.service.order.YSOrderService;
+import com.ygj.yuemum.service.pay.CustomerPayService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 @Api(tags = "月嫂订单相关接口")
 @RestController
 public class YSOrderController {
 
     @Autowired
     private YSOrderService YSOrderService;
+    @Autowired
+    private CustomerPayService customerPayService;
 
     @GetMapping("/getYSOrders")
-    public String getYSOrders(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit) {
-        Map<String, Object> orderTemps = YSOrderService.getYSOrders(page,limit);
+    public String getYSOrders(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
+        Map<String, Object> orderTemps = YSOrderService.getYSOrders(page, limit);
         String jso = JSONObject.toJSONString(orderTemps);
         return jso;
     }
@@ -34,8 +40,9 @@ public class YSOrderController {
 
     @GetMapping("/getAllYSOrders")
     public List<YSOrder> getAllYSOrders() {
-            return YSOrderService.getAll();
+        return YSOrderService.getAll();
     }
+
     @GetMapping("/queryMineOrder")
     public List<YSOrder> queryMineOrder(@RequestParam("od_phone") String od_phone) {
         return YSOrderService.queryMineOrder(od_phone);
@@ -68,19 +75,24 @@ public class YSOrderController {
 
 
     @GetMapping("/getYSOrder")
-    public YSOrder getYSOrder(@RequestParam("id") Integer id) {
-        return YSOrderService.getYSOrder(id);
+    public Map<String, Object> getYSOrder(@RequestParam("id") Integer id) {
+        Map<String, Object> tableData = new HashMap<>();
+        YSOrder order = YSOrderService.getYSOrder(id);
+        List<CustomerPay> customerPays = customerPayService.selectCustomerPay(order.getOd_no());
+        tableData.put("orderInfo", order);
+        tableData.put("orderPay",customerPays);
+        return tableData;
     }
 
     @GetMapping("/getOdno")
     public String getOdno() {
         return YSOrderService.getOdno();
     }
+
     @PostMapping("/changMM")
     public int updateYSOrder(@ModelAttribute YSOrderServiceLog ysOrderServiceLog) {
         return YSOrderService.changMM(ysOrderServiceLog);
     }
 
 
-
 }

src/main/java/com/ygj/yuemum/service/order/YSOrderService.java

@@ -1,6 +1,5 @@
 package com.ygj.yuemum.service.order;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;