From 49a9a2a5c16ada8749b9576420f7282971a0a11e Mon Sep 17 00:00:00 2001 From: "eason.qian" Date: Tue, 17 Apr 2018 10:47:28 +0800 Subject: [PATCH 1/3] fix --- .../manage/system/core/impl/ClientContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java index 4c6892ebd..ac0e040b2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java @@ -49,7 +49,7 @@ public class ClientContractServiceImpl implements ClientContractService { try { clientManager.getNewAggregateAgreeFile(client.getString("client_moniker"), null, true); } catch (Exception e) { - logger.info("App generate PDF failed"); + logger.error("App generate PDF failed"); // throw new ServerErrorException("System error"); } From 312193b298ff450466e5ada02cc4fca4c9a612f9 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Tue, 17 Apr 2018 11:06:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AB=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0partner=5Finvoice.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/PartnerInvoiceController.java | 33 +++ src/main/ui/index.html | 11 +- src/main/ui/static/boot/index-boot.js | 3 +- .../ui/static/invoice/invoice_assistant.js | 98 +++++++ .../invoice/templates/invoice_assistant.html | 252 ++++++++++++++++++ 5 files changed, 395 insertions(+), 2 deletions(-) create mode 100644 src/main/java/au/com/royalpay/payment/manage/partnerinvoice/web/PartnerInvoiceController.java create mode 100644 src/main/ui/static/invoice/invoice_assistant.js create mode 100644 src/main/ui/static/invoice/templates/invoice_assistant.html diff --git a/src/main/java/au/com/royalpay/payment/manage/partnerinvoice/web/PartnerInvoiceController.java b/src/main/java/au/com/royalpay/payment/manage/partnerinvoice/web/PartnerInvoiceController.java new file mode 100644 index 000000000..24698d698 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/partnerinvoice/web/PartnerInvoiceController.java @@ -0,0 +1,33 @@ +package au.com.royalpay.payment.manage.partnerinvoice.web; + +import au.com.royalpay.payment.manage.permission.manager.PartnerMapping; +import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; +import au.com.royalpay.payment.manage.tradelog.core.TradeLogService; +import au.com.royalpay.payment.tools.CommonConsts; +import au.com.royalpay.payment.tools.permission.enums.PartnerRole; +import com.alibaba.fastjson.JSONObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; + +/** + * Created by yuan on 2018/4/17. + */ +@RestController +@RequestMapping("/partner/invoice") +public class PartnerInvoiceController { + + @Resource + private TradeLogService tradeLogService; + + @PartnerMapping(value = "/trans_flow",method = RequestMethod.GET,roles = PartnerRole.ADMIN) + public JSONObject listTransFlow(TradeLogQuery query,@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) throws Exception { + return tradeLogService.listPartnerTransFlowPage(query,partner); + } + + @PartnerMapping(value = "/trans_flow/pdf", method = RequestMethod.GET,roles = PartnerRole.ADMIN) + public void exportTransFlowPDF(TradeLogQuery query,@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, HttpServletResponse httpResponse) throws Exception { + tradeLogService.exportTransFlow(query,partner,httpResponse); + } +} diff --git a/src/main/ui/index.html b/src/main/ui/index.html index 2bcc76f7a..26b8502c2 100644 --- a/src/main/ui/index.html +++ b/src/main/ui/index.html @@ -899,6 +899,15 @@ margin-bottom: 10%;"/> +
  • + +
    • @@ -938,7 +947,7 @@ margin-bottom: 10%;"/>
  • - Integral Mall + Promotion