Merge remote-tracking branch 'origin/master-invoice-modular' into master-invoice-modular

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/vo/InvoiceVo.java

@@ -64,7 +64,7 @@ public class InvoiceVo {
     /**
      * 购方手机
      */
-    private String purchaserPhone;
+    private String purchaserPhone="13691751141";
 
 
     private List<OrderData> orders;

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/InvoiceController.java

@@ -2,9 +2,11 @@ package com.xxfc.platform.universal.controller;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.universal.entity.Invoice;
 import com.xxfc.platform.universal.entity.vo.InvoiceVo;
 import com.xxfc.platform.universal.service.InvoiceBiz;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -18,6 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/invoice")
+@Slf4j
 public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
 
 
@@ -50,9 +53,17 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
      * @throws Exception
      */
     @PostMapping("/invoicing")
-    public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo) throws Exception {
-        String invoicing = baseBiz.Invoicing(invoiceVo);
-        return ObjectRestResponse.succ(invoicing);
+    public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo)  {
+
+        String invoicing = null;
+        try {
+            invoicing = baseBiz.Invoicing(invoiceVo);
+            return ObjectRestResponse.succ(invoicing);
+        } catch (Exception e) {
+         log.error("开票错误信息={}",e);
+         return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"开票失败");
+        }
+
     }
 
     /**