Merge branch 'master-invoice-modular' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

@@ -94,7 +94,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 					BigDecimal cost = orderAccountBiz.getAllOrderCost(baseOrder.getId());
 					log.info("{}退款费用总计：{}",baseOrder.getNo(), cost);
 					log.info("{}订单实际金额：{}", baseOrder.getNo(), baseOrder.getRealAmount());
-					orderData.setPrice(baseOrder.getRealAmount().multiply(cost));
+					orderData.setPrice(baseOrder.getRealAmount().subtract(cost));
 					log.info("{}用户实际支付金额: {}", baseOrder.getNo(), orderData.getPrice());
 					list.add(orderData);
 					continue;

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

@@ -8,8 +8,10 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +26,8 @@ import java.util.Map;
 @RequestMapping("/invoice")
 @Slf4j
 public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
+    @Autowired
+    private HttpServletRequest request;
 
 
     /**
@@ -71,9 +75,9 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
      */
     @PostMapping("/invoicing")
     public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo) {
-         log.info("开票信息={}",invoiceVo);
+        log.info("开票信息={}", invoiceVo);
         try {
-            String invoicing = baseBiz.Invoicing(invoiceVo);
+            String invoicing = baseBiz.Invoicing(invoiceVo,request);
             return ObjectRestResponse.succ(invoicing);
         } catch (BaseException e) {
             log.error("开票错误信息={}", e);

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

@@ -45,7 +45,6 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
 
     private final InvoiceDao invoiceDao;
     private final UserAuthConfig userAuthConfig;
-    private final HttpServletRequest request;
     private final UserAuthUtil userAuthUtil;
     private final InvoiceQueryErrorBiz invoiceQueryErrorBiz;
     private final OrderFeign orderFeign;
@@ -109,10 +108,11 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
      * 开票
      *
      * @param invoiceVo
+     * @param request
      * @return
      * @throws Exception
      */
-    public String Invoicing(InvoiceVo invoiceVo) throws Exception {
+    public String Invoicing(InvoiceVo invoiceVo, HttpServletRequest request) throws Exception {
         //没有填写邮箱不需要进行推送
         if (StringUtils.isBlank(invoiceVo.getPurchaserEmail())) {
             pushMode = -1;
@@ -141,7 +141,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
         //调用第三方开票
         String invoiceSerialNum = invoiceDao.Invoicing(invoice, orders);
 
-        insertInvoic(invoice, invoiceSerialNum, orders);
+        insertInvoic(invoice, invoiceSerialNum, orders,request);
         return invoiceSerialNum;
     }
 
@@ -153,8 +153,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
      * @param orders
      * @throws Exception
      */
-    public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders) 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());

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

@@ -188,6 +188,7 @@ 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);
         //把字符串json数据转换为map
         try {
             JSONObject jsonObject = JSON.parseObject(result);