diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceManagementController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceManagementController.java index d75d5e3..a7e0f6a 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceManagementController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminInvoiceManagementController.java @@ -1,12 +1,18 @@ 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; + /** * 售后服务 * 发票管理 @@ -14,18 +20,50 @@ import org.springframework.web.bind.annotation.RestController; @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"); - $buy = $this->request->post('buy'); - $batchcode = $this->request->post('batchcode'); - $status = $this->request->post('status'); - $createtime = $this->request->post('createtime'); - $page = $this->request->post('page', 1); - $limit = $this->request->post('limit', 20); + 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; diff --git a/src/main/java/cn/chjyj/szwh/service/InvoiceService.java b/src/main/java/cn/chjyj/szwh/service/InvoiceService.java new file mode 100644 index 0000000..cf1fcec --- /dev/null +++ b/src/main/java/cn/chjyj/szwh/service/InvoiceService.java @@ -0,0 +1,20 @@ +package cn.chjyj.szwh.service; + +import cn.chjyj.szwh.dto.OrderTicketDTO; + +import java.util.List; +import java.util.Map; + +/** + * 订单发票服务 + */ +public interface InvoiceService { + /** + * 查询统计订单发票信息 + * @param map + * @param page + * @param limit + * @return + */ + Map getOrderTicketList(Map map, int page, int limit); +} diff --git a/src/main/java/cn/chjyj/szwh/service/impl/InvoiceServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/InvoiceServiceImpl.java new file mode 100644 index 0000000..73e8a87 --- /dev/null +++ b/src/main/java/cn/chjyj/szwh/service/impl/InvoiceServiceImpl.java @@ -0,0 +1,49 @@ +package cn.chjyj.szwh.service.impl; + +import cn.chjyj.szwh.dto.OrderTicketDTO; +import cn.chjyj.szwh.mapper.TicketMapper; +import cn.chjyj.szwh.service.InvoiceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class InvoiceServiceImpl implements InvoiceService { + @Autowired + private TicketMapper ticketMapper; + + @Override + public Map getOrderTicketList(Map map, int page, int limit) { + Map retmap =new HashMap(); + + int start = page>1?(page-1)*limit:0; + retmap.put("cur_page",page); + retmap.put("start",start+1); + retmap.put("end",page*limit); + retmap.put("per_page",limit); + + int total = ticketMapper.countOrderTicket(map); + retmap.put("total",total); + + // 发票主机 + + //整理后list + List nlist = new ArrayList(); + List otlist = ticketMapper.getOrderTicketList(map,start,limit); + for (OrderTicketDTO ott:otlist){ + Map tmap =new HashMap(); + // todo ,下载pdf,命名为ticketid.pdf, + tmap.put("pdfUrl",ott.getPdfUrl()); + tmap.put("seller_name","深圳文化产权交易所有限公司"); + tmap.put("seller_number","91440300553866701D"); + nlist.add(tmap); + } + + retmap.put("data",nlist); + return retmap; + } +}