Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/config/HeaderConfig.java

-package com.xxfc.platform.order.config;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
-
-/**
- * @author Administrator
- * @description 设置请求头部信息，防止微服务之间调用请求头部信息丢失
- * @data 2019/6/25 16:22
- */
-public class HeaderConfig implements RequestInterceptor {
-
-    @Override
-    public void apply(RequestTemplate template) {
-        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (requestAttributes instanceof ServletRequestAttributes){
-             ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
-            HttpServletRequest request = servletRequestAttributes.getRequest();
-            //请求头设置
-            Enumeration<String> headerNames = request.getHeaderNames();
-            if (headerNames!=null){
-                while (headerNames.hasMoreElements()){
-                    String headerName = headerNames.nextElement();
-                    String headerValue = request.getHeader(headerName);
-                    template.header(headerName,headerValue);
-                }
-            }
-        }
-    }
-}

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

@@ -67,7 +67,11 @@ public class InvoiceVo {
      */
     private String purchaserPhone="0";
 
-
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    private String createBy;
     private List<OrderData> orders;
 
 

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

 package com.xxfc.platform.universal.controller;
 
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -27,8 +30,9 @@ import java.util.Map;
 @Slf4j
 public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
     @Autowired
-    private HttpServletRequest request;
-
+    private  UserAuthConfig userAuthConfig;
+    @Autowired
+    private  UserAuthUtil userAuthUtil;
 
     /**
      * 根据开票代码获取税号
@@ -74,8 +78,13 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
      * @throws Exception
      */
     @PostMapping("/invoicing")
-    public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo) {
+    public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo,HttpServletRequest request) throws Exception {
+        String token = request.getHeader("Authorization");
         log.info("开票信息={}", invoiceVo);
+        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(token);
+        invoiceVo.setUserId(Integer.valueOf(infoFromToken.getId()));
+        invoiceVo.setCreateBy(infoFromToken.getName());
+
         try {
             String invoicing = baseBiz.Invoicing(invoiceVo,request);
             return ObjectRestResponse.succ(invoicing);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/InvoiceBiz.java

@@ -44,8 +44,7 @@ import java.util.concurrent.TimeUnit;
 public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
 
     private final InvoiceDao invoiceDao;
-    private final UserAuthConfig userAuthConfig;
-    private final UserAuthUtil userAuthUtil;
+
     private final InvoiceQueryErrorBiz invoiceQueryErrorBiz;
     private final OrderFeign orderFeign;
     private static final SnowflakeIdWorker snowflakeIdWorker = new SnowflakeIdWorker(0, 0);
@@ -154,9 +153,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
      * @throws Exception
      */
     public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders,HttpServletRequest request) throws Exception {
-        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-        invoice.setUserId(Integer.valueOf(infoFromToken.getId()));
-        invoice.setCreateBy(infoFromToken.getName());
+
         invoice.setInvoiceSerialNum(invoiceSerialNum);
         BigDecimal taxExcludedAmount = BigDecimal.ZERO;
         BigDecimal taxIncludedAmount = BigDecimal.ZERO;