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

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

@@ -274,7 +274,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
 				//设置违约金金额
 				getDriverInfo(orderPageVo);
-				getUserLicense1(orderPageVo);
+				getUserLicense(orderPageVo);
 			}
 			ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId());
 			if (startResponse.getData() != null) {

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-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
@@ -32,13 +30,10 @@ import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.order.*;
-import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
-import com.xxfc.platform.universal.constant.DictionaryKey;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
@@ -48,7 +43,6 @@ import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
-import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jodd.util.StringUtil;
@@ -62,15 +56,14 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
 
 @Controller
 //@RequestMapping("baseOrder")
@@ -391,7 +384,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if(flag != null && flag == true) {
             return baseOrderBiz.orderDetail(orderNo, userDTO);
         } else {
-            return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+            return baseOrderBiz.orderDetail(orderNo, userDTO);
         }
     }
 

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());
+//            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