Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -173,12 +173,32 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         pages.getData().parallelStream().forEach(data -> {
             data.setQrcodeStr(qrcodePrefix);
+//            data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
+//        	log.info("订单实际支付金额，扣除押金违章之后: {}", data.getOrderRealAmount());
+        });
+        return new ObjectRestResponse<>().data(pages);
+    }
+
+    @RequestMapping(value = "/getInvoiceOrderList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "发票订单列表")
+    @IgnoreClientToken
+    public ObjectRestResponse<PageDataVO<OrderPageVO>> getInvoiceOrderList(QueryOrderDTO dto) {
+        //查询列表数据
+        if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        //dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
+        dto.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+        Query query = new Query(dto);
+        PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        pages.getData().parallelStream().forEach(data -> {
+            data.setQrcodeStr(qrcodePrefix);
             data.setOrderRealAmount(data.getRealAmount().subtract(orderAccountBiz.getAllOrderCost(data.getId())));
             log.info("订单实际支付金额，扣除押金违章之后: {}", data.getOrderRealAmount());
         });
         return new ObjectRestResponse<>().data(pages);
     }
-
     @ApiOperation("查询个数")
     @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody

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

@@ -31,7 +31,7 @@ public class OrderData {
     /**
      * 税率
      */
-    private BigDecimal taxRate=new BigDecimal(0.03);
+    private BigDecimal taxRate=new BigDecimal("0.03");
 
     /**
      * 单位

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

 package com.xxfc.platform.universal.controller;
 
+import com.alibaba.fastjson.JSONException;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 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;
@@ -14,6 +16,7 @@ import java.util.Map;
 
 /**
  * 发票接口
+ *
  * @Auther: Administrator
  * @Date: 2019/12/31 09:57
  * @Description:
@@ -26,28 +29,31 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
 
     /**
      * 根据开票代码获取税号
+     *
      * @param code
      * @return
      */
     @GetMapping("/dutyParagraph")
-    public ObjectRestResponse getDutyParagraphByCode(@RequestParam("code")String code){
+    public ObjectRestResponse getDutyParagraphByCode(@RequestParam("code") String code) {
         String dutyParagraph = baseBiz.getDutyParagraphByCode(code);
         return ObjectRestResponse.succ(dutyParagraph);
     }
 
     /**
      * 模糊查询获取公司全名和开票代码
+     *
      * @param name
      * @return
      */
     @GetMapping("/corporateName")
-    public ObjectRestResponse corporateName(@RequestParam("name")String name){
+    public ObjectRestResponse corporateName(@RequestParam("name") String name) {
         List<Map<String, String>> mapList = baseBiz.corporateName(name);
         return ObjectRestResponse.succ(mapList);
     }
 
     /**
      * 开票接口
+     *
      * @param invoiceVo
      * @return
      * @throws Exception
@@ -55,25 +61,27 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
     @PostMapping("/invoicing")
     public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo) {
 
-        String invoicing = null;
         try {
-            invoicing = baseBiz.Invoicing(invoiceVo);
+            String invoicing = baseBiz.Invoicing(invoiceVo);
             return ObjectRestResponse.succ(invoicing);
+        } catch (BaseException e) {
+            log.error("开票错误信息={}", e);
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, e.getMessage());
         } catch (Exception e) {
-         log.error("开票错误信息={}",e);
-         return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"开票失败");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "开票失败");
         }
 
     }
 
     /**
      * 查询开票结果
+     *
      * @param invoiceSerialNum
      * @return
      */
     @GetMapping("/result")
-    public ObjectRestResponse invoiceResult(@RequestParam("invoiceSerialNum")String invoiceSerialNum){
-        List<Map<String,Object>> result=  baseBiz.invoiceResult(invoiceSerialNum);
+    public ObjectRestResponse invoiceResult(@RequestParam("invoiceSerialNum") String invoiceSerialNum) {
+        List<Map<String, Object>> result = baseBiz.invoiceResult(invoiceSerialNum);
         return ObjectRestResponse.succ(result);
     }
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/invoice/impl/InvoiceDaoImpl.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.universal.service.invoice.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.google.common.collect.Lists;
@@ -54,11 +55,9 @@ public class InvoiceDaoImpl implements InvoiceDao {
     private String appSecret2;
 
     @Value("${invoice.nuonuo.queryUrl}")
-    private String queryUrl ;
+    private String queryUrl;
     @Value("${invoice.nuonuo.invoiceUrl}")
-    private String invoiceUrl ;
-
-
+    private String invoiceUrl;
 
 
     /**
@@ -117,6 +116,7 @@ public class InvoiceDaoImpl implements InvoiceDao {
 
     /**
      * 调用第三方开票接口进行开票
+     *
      * @param invoice
      * @param orders
      * @return
@@ -177,16 +177,18 @@ public class InvoiceDaoImpl implements InvoiceDao {
         String jsonString = JSON.toJSONString(orderMap);
         //调用第三方接口
         String result = sdk.sendPostSyncRequest(invoiceUrl, senid, appKey2, appSecret2, token, taxnum2, method, jsonString);
-        log.info("result={}", result);
         //把字符串json数据转换为map
+
+
+        try {
             JSONObject jsonObject = JSON.parseObject(result);
             Map<String, String> data = (Map<String, String>) jsonObject.get("result");
             String invoiceSerialNum = data.get("invoiceSerialNum");
-        if (StringUtils.isBlank(invoiceSerialNum)) {
+            return invoiceSerialNum;
+        } catch (Exception e) {
             log.error("失败原因={}", result);
-            throw new BaseException("开票失败");
+            throw new BaseException(result);
         }
-        return invoiceSerialNum;
     }
 
     @Override
@@ -209,7 +211,7 @@ public class InvoiceDaoImpl implements InvoiceDao {
             e.printStackTrace();
         }
 
-        if (data!=null){
+        if (data != null) {
             try {
                 JSONObject jsonObject = JSON.parseObject(data);
                 List<Map<String, Object>> mapList = (List<Map<String, Object>>) jsonObject.get("result");