修改优惠券BUG，修改订单列表

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

@@ -153,7 +153,6 @@ public class TbCfOrderController {
         int res = tbCfOrderService.saveOrUpdateAgentInfo(platformOrderVo);
         return R.ok().put("result", res);
     }
-
     /**
      * 订单列表（运营简表）
      */
@@ -161,12 +160,12 @@ public class TbCfOrderController {
     @RequiresPermissions("tbcforder:orderlist")
     @ResponseBody
     public R orderList(@RequestParam Map<String, Object> params){
-            //查询列表数据
-             Query query = new Query(params);
-            List<TbCfOrderListEntity> tbCfOrderList = tbCfOrderListService.queryOrderList(query);
-           int total = tbCfOrderListService.queryOrderTotal(query);
-            PageUtils pageUtil = new PageUtils(tbCfOrderList,total, query.getLimit(), query.getPage());
-            return R.ok().put("page", pageUtil);
+        //查询列表数据
+        Query query = new Query(params);
+        List<TbCfOrderListEntity> tbCfOrderList = tbCfOrderListService.queryOrderList(query);
+        int total = tbCfOrderListService.queryOrderTotal(query);
+        PageUtils pageUtil = new PageUtils(tbCfOrderList,total, query.getLimit(), query.getPage());
+        return R.ok().put("page", pageUtil);
     }
     /**
      * 订单列表（运营简表）

platform-admin/src/main/java/com/platform/controller/TbCfOrderListController.java

+package com.platform.controller;
+
+import com.platform.entity.TbCfItemDetailEntity;
+import com.platform.entity.TbCfOrderEntity;
+import com.platform.entity.TbCfOrderListEntity;
+import com.platform.service.TbCfOrderListService;
+import com.platform.service.TbCfOrderService;
+import com.platform.utils.PageUtils;
+import com.platform.utils.Query;
+import com.platform.utils.R;
+import com.platform.vo.PlatformOrderVo;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Controller
+ *
+ * @author lipengjun
+ * @date 2019-09-20 11:03:37
+ */
+@Controller
+@RequestMapping(value = "tbcforderlist",produces = "application/json; charset=utf-8")
+public class TbCfOrderListController {
+    @Autowired
+    private TbCfOrderListService tbCfOrderListService;
+
+    /**
+     * 订单列表（运营简表）
+     */
+    @GetMapping("/orderList")
+    @RequiresPermissions("tbcforderlist:orderlist")
+    @ResponseBody
+    public R orderList(@RequestParam Map<String, Object> params){
+        //查询列表数据
+        Query query = new Query(params);
+        List<TbCfOrderListEntity> tbCfOrderList = tbCfOrderListService.queryOrderList(query);
+        int total = tbCfOrderListService.queryOrderTotal(query);
+        PageUtils pageUtil = new PageUtils(tbCfOrderList,total, query.getLimit(), query.getPage());
+        return R.ok().put("page", pageUtil);
+    }
+    /**
+     * 订单列表（运营简表）
+     */
+    @GetMapping("/totalPay")
+    @ResponseBody
+    public R totalPay(){
+        //查询列表数据
+        int totalPay = tbCfOrderListService.totalPay();
+        return R.ok().put("totalPay", totalPay);
+    }
+
+}

platform-admin/src/main/resources/dev/platform.properties

@@ -8,7 +8,7 @@ jdbc.password=diaoyun666
 
 jdbc.initialSize=5
 jdbc.maxActive=30
-
+2
 jdbc.minPoolSize=2
 jdbc.maxIdleTime=30000
 jdbc.idleConnectionTestPeriod=100   
\ No newline at end of file