Merge branch 'master-invoice-modular' into dev

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

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-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -24,6 +24,11 @@ public class OrderPageVO extends BaseOrder {
     //更换还车公司记录
     List<BookRecordUpdateLog> bookRecordUpdateLogs;
 
+    /**
+     * 订单最终支付金额：扣除所有费用之后
+     */
+    private BigDecimal orderRealAmount;
+
     /**
      * 用户名
      */

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

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -29,7 +31,6 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
 import com.xxfc.platform.order.pojo.price.CancelStartedVO;
 import com.xxfc.platform.order.pojo.price.CostDetailExtend;
-import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -37,9 +38,11 @@ import com.xxfc.platform.universal.vo.OrderRefundVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.jexl2.MapContext;
+import org.apache.commons.lang3.StringUtils;
 import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -451,10 +454,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
 
             //设置违约金
-                //设置原来算出的违约金及描述
+            //设置原来算出的违约金及描述
             csv.setViolateAmount(inProgressVO.getViolateAmount());
             csv.setViolateDesc("");
-                //处理更改之后的违约金及描述
+            //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
             handleCrosstownDelayDetail(crosstown, oad);
 
@@ -464,10 +467,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
-                    //crosstown.getRestDeposit().subtract(illegalReserve);
+            //crosstown.getRestDeposit().subtract(illegalReserve);
             //原退款的钱
             BigDecimal originalRefundAmount = oad.getOriginDepositAmount().add(oad.getOriginOrderAmount());
-                    //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+            //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
 
             String refundDesc = "退还车辆押金："+ refundAmont.toString();
 
@@ -790,4 +793,36 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             log.error(StrUtil.format("退款异常{}，订单号为：{}", ex.getMessage(), baseOrder.getNo()), ex);
         }
     }
+
+    public List<OrderAccount> getByOrderId(Integer orderId) {
+        Example example = new Example(OrderAccount.class);
+        example.createCriteria().andEqualTo("orderId", orderId).andGreaterThan("accountType", 200);
+        return mapper.selectByExample(example);
+    }
+
+    public BigDecimal getAllOrderCost(Integer orderId) {
+        List<OrderAccount> list = getByOrderId(orderId);
+        BigDecimal bigDecimal = new BigDecimal("0");
+        if (list != null && list.size() > 0) {
+            list.parallelStream().forEach(result -> {
+                if(StringUtils.isNotBlank(result.getAccountDetail())) {
+                    JSONObject jsonObject = JSONObject.parseObject(result.getAccountDetail());
+                    log.info("获取订单的费用金额：", jsonObject.toJSONString());
+                    if (jsonObject != null) {
+                        JSONArray jsonArray = jsonObject.getJSONArray("deductions");
+                        if(jsonArray != null && jsonArray.size() > 0) {
+                            for (int i =0; i<jsonArray.size(); i++) {
+                                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
+                                if (jsonObject1 != null) {
+                                    bigDecimal.add(new BigDecimal(jsonObject1.getString("amount")));
+                                }
+                            }
+                            log.info("获取订单的费用金额： {}", bigDecimal);
+                        }
+                    }
+                }
+            });
+        }
+        return bigDecimal;
+    }
 }
\ No newline at end of file

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

@@ -9,10 +9,15 @@ 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.contant.enumerate.OrderTypeEnum;
 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 +47,10 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 
 	@Autowired
 	HttpServletRequest request;
+
+	@Autowired
+	ThirdFeign thirdFeign;
+
 	/**
 	 * 添加发票记录
 	 * @return
@@ -56,6 +65,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];
@@ -66,26 +76,68 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 				//查询是否已开票
 				OrderInvoice oldValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
 				if (oldValue == null) { //不存在就添加
-					orderInvoice.setUserId(appUserDTO.getUserid());
-					insertSelectiveRe(orderInvoice);
-					log.info("添加发票记录成功: {}", orderInvoice);
-					OrderInvoice newValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
-					if(newValue != null) {
-						baseOrder.setInvoiceStatus(1);
-						baseOrder.setInvoiceId(newValue.getId());
-						baseOrderBiz.updateBaseOrder(baseOrder);
-					} else {
-						return ObjectRestResponse.createFailedResult(ResultCode.DB_OPERATION_FAIL_CODE, ResultCode.getMsg(ResultCode.DB_OPERATION_FAIL_CODE));
+					OrderData orderData = new OrderData();
+					if (baseOrder.getType() == OrderTypeEnum.RENT_VEHICLE.getCode()) {
+						orderData.setOrderName(OrderTypeEnum.RENT_VEHICLE.getDesc());
 					}
+					if (baseOrder.getType() == OrderTypeEnum.TOUR.getCode()) {
+						orderData.setOrderName(OrderTypeEnum.TOUR.getDesc());
+					}
+					if (baseOrder.getType() == OrderTypeEnum.MEMBER.getCode()) {
+						orderData.setOrderName(OrderTypeEnum.MEMBER.getDesc());
+					}
+					orderData.setPrice(baseOrder.getRealAmount());
+					list.add(orderData);
+					continue;
 				} else {//已开票
 					log.info("该订单已经开票， {}", orderId);
 					return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该订单已经开票: orderId = " + orderId);
 				}
 			}
+			orderInvoice.setUserId(appUserDTO.getUserid());
+			insertSelectiveRe(orderInvoice);
+			log.info("添加发票记录成功: {}", orderInvoice);
+			List<OrderInvoice> invoiceList = selectByIds(orderInvoice.getOrderIds()).getData();
+			if(invoiceList != null && invoiceList.size() > 0) {
+				OrderInvoice newValue = invoiceList.get(0);
+				//调用第三方开票接口
+				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());
+				invoiceVo.setOrderInvoiceId(newValue.getId());
+				invoiceVo.setOrders(list);
+				ObjectRestResponse objectRestResponse = thirdFeign.invoicing(invoiceVo);
+				if (!objectRestResponse.isRel()) {
+					mapper.delete(newValue);
+					return objectRestResponse;
+				}
+				//更新订单状态
+				for (int a = 0; a <= orderIdArray.length - 1; a ++) {
+					String orderId = StringUtils.isBlank(orderIdArray[a]) ? "0" : orderIdArray[a];
+					BaseOrder baseOrder = baseOrderBiz.selectById(Integer.parseInt(orderId));
+					if (baseOrder == null) {
+						return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc() + ", 订单Id = " + orderId);
+					}
+					baseOrder.setInvoiceStatus(1);
+					baseOrder.setInvoiceId(newValue.getId());
+					baseOrderBiz.updateBaseOrder(baseOrder);
+				}
+			} else {
+				return ObjectRestResponse.createFailedResult(ResultCode.DB_OPERATION_FAIL_CODE, ResultCode.getMsg(ResultCode.DB_OPERATION_FAIL_CODE));
+			}
 		}
 		return ObjectRestResponse.succ();
 	}
 
+
+
+
 	/**
 	 * 根据orderIds字符串查询对应的发票记录
 	 * @param orderIds
@@ -109,7 +161,9 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 				}
 			}
 		}
-		return ObjectRestResponse.succ(set);
+		List<OrderInvoice> list = Lists.newArrayList();
+		list.addAll(set);
+		return ObjectRestResponse.succ(list);
 	}
 
 	/**

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

@@ -171,7 +171,10 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         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));
+        pages.getData().parallelStream().forEach(data -> {
+            data.setQrcodeStr(qrcodePrefix);
+            data.setOrderRealAmount(orderAccountBiz.getAllOrderCost(data.getId()));
+        });
         return new ObjectRestResponse<>().data(pages);
     }
 
@@ -487,4 +490,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return baseOrderBiz.updateBaseOrder(baseOrder);
     }
 
+
+
 }

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

@@ -25,9 +25,11 @@ public class Invoice {
   private String orderId;
 
   /**
-   * 公司代码
+   * 发票订单表id
    */
-  private String companyCode;
+  private Integer orderInvoiceId;
+
+
 
   /**
    * 发票订单号
@@ -35,11 +37,18 @@ public class Invoice {
   private String orderNo;
 
 
+  /**
+   * 公司代码
+   */
+  private String companyCode;
+
+
   /**
    * 机构代码
    */
   private String orgCode;
 
+
   /**
    * 发票代码
    */

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

@@ -3,6 +3,8 @@ package com.xxfc.platform.universal.entity;
 
 import lombok.Data;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -13,6 +15,9 @@ import java.util.Date;
 @Data
 @Table(name = "invoice_query_error")
 public class InvoiceQueryError {
+
+  @Id
+  @GeneratedValue(generator ="JDBC" )
   private Integer id;
   private Integer invoiceId;
   private String invoiceSerialNum;

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

@@ -14,56 +14,60 @@ import java.util.List;
 @Data
 public class InvoiceVo {
 
-        /**
-         * 发票分类：01 专票,02 货物运输业增值税专用发票,03 机动车销售统一发票，
-         * 04 增值税普通发票，10 增值税普通发票（电子），11 增值税普通发票（卷票），14 增值税普通发票（卷票）
-         */
-        private Integer invoiceCategory=10;
+    /**
+     * 发票分类：01 专票,02 货物运输业增值税专用发票,03 机动车销售统一发票，
+     * 04 增值税普通发票，10 增值税普通发票（电子），11 增值税普通发票（卷票），14 增值税普通发票（卷票）
+     */
+    private Integer invoiceCategory = 10;
 
-        /**
-         * 订单id :多个以逗号隔开
-         */
-        private String orderId;
+    /**
+     * 订单id :多个以逗号隔开
+     */
+    private String orderId;
 
+    /**
+     * 发票订单表id
+     */
+    private Integer orderInvoiceId;
 
-        /**
-         * 备注
-         */
-        private String remark;
+    /**
+     * 备注
+     */
+    private String remark;
 
-        /**
-         * 购买方名称
-         */
-        private String purchaserName;
-        /**
-         * 购买方纳税人识别号
-         */
-        private String purchaserTaxCode;
-        /**
-         * 购方邮箱
-         */
-        private String purchaserEmail;
-        /**
-         * 购买方地址电话
-         */
-        private String purchaserAddressPhone;
-        /**
-         * 购买方银行账号
-         */
-        private String purchaserAccountBank;
+    /**
+     * 购买方名称
+     */
+    private String purchaserName;
+    /**
+     * 购买方纳税人识别号
+     */
+    private String purchaserTaxCode;
+    /**
+     * 购方邮箱
+     */
+    private String purchaserEmail;
+    /**
+     * 购买方地址电话
+     */
+    private String purchaserAddressPhone;
+    /**
+     * 购买方银行账号
+     */
+    private String purchaserAccountBank;
 
-        /**
-         * 开票内容
-         */
-        private String content;
-        /**
-         * 购方手机
-         */
-        private String purchaserPhone;
+    /**
+     * 开票内容
+     */
+    private String content;
 
+    /**
+     * 购方手机
+     */
+    private String purchaserPhone;
 
 
-        private List<OrderData> orders;
+    private List<OrderData> orders;
 
 
 }

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.*;
@@ -94,4 +95,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);
 }