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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderInvoice.java

@@ -123,4 +123,9 @@ public class OrderInvoice {
      * 发票PDF路径
      */
     private String invoiceUrl;
+
+    /**
+     * 发票内容
+     */
+    private String contentTitle;
 }
\ No newline at end of file

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

@@ -9,10 +9,14 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderInvoice;
 import com.xxfc.platform.order.mapper.OrderInvoiceMapper;
 import com.xxfc.platform.order.pojo.dto.OrderInvoiceDto;
+import com.xxfc.platform.universal.entity.OrderData;
+import com.xxfc.platform.universal.entity.vo.InvoiceVo;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +46,10 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 
 	@Autowired
 	HttpServletRequest request;
+
+	@Autowired
+	ThirdFeign thirdFeign;
+
 	/**
 	 * 添加发票记录
 	 * @return
@@ -56,6 +64,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 			return  ObjectRestResponse.paramIsEmpty();
 		}
 		String[] orderIdArray = orderInvoice.getOrderIds().split(",");
+		List<OrderData> list = Lists.newArrayList();
 		if (orderIdArray.length > 0) {
 			for (int a = 0; a <= orderIdArray.length - 1; a ++) {
 				String orderId = StringUtils.isBlank(orderIdArray[a])? "0" : orderIdArray[a];
@@ -71,6 +80,17 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 					log.info("添加发票记录成功: {}", orderInvoice);
 					OrderInvoice newValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
 					if(newValue != null) {
+						//调用第三方开票接口
+						InvoiceVo invoiceVo = new InvoiceVo();
+						invoiceVo.setContent(newValue.getContentTitle());
+						invoiceVo.setOrderId(newValue.getOrderIds());
+						invoiceVo.setPurchaserAccountBank(newValue.getContentAccount());
+						invoiceVo.setPurchaserAddressPhone(newValue.getContentContact());
+						invoiceVo.setPurchaserEmail(newValue.getReceiveContent());
+						invoiceVo.setPurchaserName(newValue.getTitleName());
+						invoiceVo.setPurchaserTaxCode(newValue.getTaxCode());
+						invoiceVo.setRemark(newValue.getContentRemark());
+						thirdFeign.invoicing(invoiceVo);
 						baseOrder.setInvoiceStatus(1);
 						baseOrder.setInvoiceId(newValue.getId());
 						baseOrderBiz.updateBaseOrder(baseOrder);

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.entity.IdInformation;
+import com.xxfc.platform.universal.entity.vo.InvoiceVo;
 import com.xxfc.platform.universal.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -93,4 +94,9 @@ public interface ThirdFeign {
 
     @RequestMapping("/captcha/app/unauth/verify")
     ObjectRestResponse<Boolean> verify(@RequestParam(value = "phone")String phone, @RequestParam(value = "pointList")String pointList);
+
+
+    /************************************发票*************************************/
+    @PostMapping("/invoice/invoicing")
+    public ObjectRestResponse invoicing(@RequestBody InvoiceVo invoiceVo);
 }