文件重复

src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceManagementController.java

@@ -1,71 +0,0 @@
-package cn.chjyj.szwh.controller.admin;
-
-import cn.chjyj.szwh.controller.BaseController;
-import cn.chjyj.szwh.service.InvoiceService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 售后服务
- * 发票管理
- */
-@RestController
-@RequestMapping("/admin/order.InvoiceManagement")
-public class AdminInvoiceManagementController extends BaseController {
-    /**
-     * 发票
-     */
-    @Autowired
-    private InvoiceService invoiceService;
-
-    @RequestMapping("/list")
-    public JSONObject list(@RequestBody String rejson){
-        JSONObject request = JSON.parseObject(rejson);
-        Map query =new HashMap<>();
-        String invoiceNumber = request.getString("invoice_number");
-        if(StringUtils.isNotBlank(invoiceNumber)){
-            query.put("ticketid",invoiceNumber);
-        }
-
-        String seller = request.getString("seller");
-        if(StringUtils.isNotBlank(seller)){
-            query.put("saller",seller);
-        }
-        String buy = request.getString("buy");
-        if(StringUtils.isNotBlank(buy)){
-            query.put("u.name",buy);
-        }
-
-        String batchcode = request.getString("batchcode");
-        if(StringUtils.isNotBlank(batchcode)){
-            query.put("ticket.batchcode",batchcode);
-        }
-
-        String status = request.getString("status");
-        if(StringUtils.isNotBlank(status)){
-            query.put("order.status",status);
-        }
-
-        String createtime = request.getString("createtime");
-        //分页
-        String page = request.getString("page");
-        int ipage = StringUtils.isBlank(page)?1:Integer.valueOf(page);
-
-        String limit = request.getString("limit");
-        int ilimit = StringUtils.isBlank(limit)?20:Integer.valueOf(limit);
-        Map mp = invoiceService.getOrderTicketList(query,ipage,ilimit);
-
-        jsonObject.put("data",mp);
-        jsonObject.put("code",200);
-        jsonObject.put("msg","成功");
-        return jsonObject;
-    }
-}

src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceMgtController.java

@@ -1,12 +1,19 @@
 package cn.chjyj.szwh.controller.admin;
 
 import cn.chjyj.szwh.controller.BaseController;
+import cn.chjyj.szwh.service.InvoiceService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 发票管理
@@ -16,23 +23,51 @@ import javax.servlet.http.HttpServletRequest;
 public class AdminInvoiceMgtController extends BaseController {
 
     /**
-     * 发票列表
+     * 发票
-     * @param request
-     * @return
      */
+    @Autowired
+    private InvoiceService invoiceService;
+
     @PostMapping("/list")
-    public JSONObject ivlist(HttpServletRequest request){
+    public JSONObject list(@RequestBody String rejson){
-        //发票编号
+        JSONObject request = JSON.parseObject(rejson);
-        String invoNumber=request.getParameter("invoice_number");
+        Map query =new HashMap<>();
-
+        String invoiceNumber = request.getString("invoice_number");
-//        $invoice_number = $this->request->post('invoice_number');
+        if(StringUtils.isNotBlank(invoiceNumber)){
-//        $seller = $this->request->post('seller');
+            query.put("ticketid",invoiceNumber);
-//        $buy = $this->request->post('buy');
+        }
-//        $batchcode = $this->request->post('batchcode');
+
-//        $status = $this->request->post('status');
+        String seller = request.getString("seller");
-//        $createtime = $this->request->post('createtime');
+        if(StringUtils.isNotBlank(seller)){
-//        $page = $this->request->post('page', 1);
+            query.put("saller",seller);
-//        $limit = $this->request->post('limit', 20);
+        }
+        String buy = request.getString("buy");
+        if(StringUtils.isNotBlank(buy)){
+            query.put("u.name",buy);
+        }
+
+        String batchcode = request.getString("batchcode");
+        if(StringUtils.isNotBlank(batchcode)){
+            query.put("ticket.batchcode",batchcode);
+        }
+
+        String status = request.getString("status");
+        if(StringUtils.isNotBlank(status)){
+            query.put("order.status",status);
+        }
+
+        String createtime = request.getString("createtime");
+        //分页
+        String page = request.getString("page");
+        int ipage = StringUtils.isBlank(page)?1:Integer.valueOf(page);
+
+        String limit = request.getString("limit");
+        int ilimit = StringUtils.isBlank(limit)?20:Integer.valueOf(limit);
+        Map mp = invoiceService.getOrderTicketList(query,ipage,ilimit);
+
+        jsonObject.put("data",mp);
+        jsonObject.put("code",200);
+        jsonObject.put("msg","成功");
         return jsonObject;
     }
 }

src/main/resources/mapper/szwh/TiketMapper.xml

@@ -46,8 +46,7 @@
 
     <!--统计符合条件的-->
     <select id="countOrderTicket" parameterType="java.util.Map" resultType="java.lang.Integer">
-        SELECT o.`status`,u.`name`,ticket.id,ticket.pdfUrl,u.uscc,ticket.tickettime,ticket.ticketid,ticket.batchcode,
+        SELECT COUNT(*)
-        ticket.ticket_status,ticket.ticketimage,ticket.ticketurl,ticket.ticketmoney,ticket.islicode,ticket.ticketApiMessage
         FROM ticket
         INNER JOIN order_user u ON u.batchcode = ticket.batchcode AND u.islicode = ticket.islicode
         INNER JOIN `order` as o ON o.batchcode = ticket.batchcode

src/main/resources/mybatis/mybatis-config.xml

@@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 		<setting name="cacheEnabled"             value="true"  />  <!-- 全局映射器启用缓存 -->
 		<setting name="useGeneratedKeys"         value="true"  />  <!-- 允许 JDBC 支持自动生成主键 -->
 		<setting name="defaultExecutorType"      value="REUSE" />  <!-- 配置默认的执行器 -->
-		<setting name="logImpl"                  value="SLF4J" />  <!-- 指定 MyBatis 所用日志的具体实现 -->
+<!--		<setting name="logImpl"                  value="SLF4J" />  &lt;!&ndash; 指定 MyBatis 所用日志的具体实现 &ndash;&gt;-->
+		<setting name="logImpl" value="STDOUT_LOGGING"/>
 		<setting name="mapUnderscoreToCamelCase" value="true"/>  <!--驼峰式命名 -->
 	</settings>
 </configuration>

src/test/java/cn/chjyj/szwh/mapper/TicketMapperTest.java

@@ -0,0 +1,43 @@
+package cn.chjyj.szwh.mapper;
+
+import cn.chjyj.szwh.dto.OrderTicketDTO;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class TicketMapperTest {
+    @Autowired
+    private TicketMapper ticketMapper;
+
+    @Test
+    public void getTicketLikeTid() {
+    }
+
+    @Test
+    public void getOrderTicketList() {
+        Map mp =new HashMap<>();
+        int start=0;
+        int limit=10;
+        List<OrderTicketDTO> ottlist = ticketMapper.getOrderTicketList(mp,start,limit);
+        for(OrderTicketDTO ott:ottlist){
+            System.out.println(ott.getPdfUrl());
+        }
+    }
+
+    @Test
+    public void countOrderTicket() {
+        Map mp =new HashMap();
+        int tt = ticketMapper.countOrderTicket(mp);
+        System.out.println(tt);
+    }
+}