Merge remote-tracking branch 'origin/dev' into dev

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

@@ -352,8 +352,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             //剩余押金 = 押金 - 违章保证金 - 定损金额
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(crosstown.getDeductionCost()));
             handleCrosstownDetail(crosstown, oad);
-            BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
-            BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+
+            //退款
+            BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
+                    //crosstown.getRestDeposit().subtract(illegalReserve);
+            //原退款的钱
+            BigDecimal originalRefundAmount = oad.getOriginDepositAmount().add(oad.getOriginOrderAmount());
+                    //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
             refundDesc = handleDed(crosstown, refundDesc);
             refundDesc += ")";

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

@@ -173,11 +173,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
             }
-            if (userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
+            if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }
         } else {
-            if (userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
+            if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getEndCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
         }

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

@@ -176,7 +176,7 @@ public class OrderCalculateBiz {
         InProgressVO inProgressVO = inProgressCalculate(baseOrder, orderItem, orvd.getFreeDays(), useDays, oad);
 
         //定金 - （额外消费金额 + 违约金）
-        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getConsumeAmount().add(inProgressVO.getViolateAmount())));
+        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount().add(inProgressVO.getViolateAmount())));
         oad.setOrderAmount(inProgressVO.getRefundOrderAmount());
         oad.setOriginDepositAmount(orvd.getDeposit());
         oad.setOriginOrderAmount(baseOrder.getGoodsAmount());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -10,6 +10,7 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.entity.OrderViolation;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -113,9 +114,16 @@ public class RentDepositJobHandler extends IJobHandler {
                         setIsDel(SYS_FALSE);
                     }});
 
+                    OrderAccountDetail oad = new OrderAccountDetail();
+
                     String refundDesc = "退还押金：";
                     BigDecimal refundAmont;
                     if(null != orderViolation) {
+                        //设置扣款项
+                        oad.getDeductions().add(
+                                orderAccountBiz.initDeduction(orderViolation.getPrice(), DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT.getDesc(), DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT, OrderAccountDeduction.ORIGIN_DEPOSIT)
+                        );
+
                         //还车扣除款 剩余的 钱，再减去违章预备金
                         refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
                         refundDesc += refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
@@ -124,7 +132,8 @@ public class RentDepositJobHandler extends IJobHandler {
                         refundAmont = orvd.getReturnPayResidue();
                         refundDesc += refundAmont.toString();
                     }
-                    OrderAccountDetail oad = new OrderAccountDetail();
+                    oad.setOriginDepositAmount(orvd.getReturnPayResidue());
+                    oad.setDepositAmount(refundAmont);
                     orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), AccountTypeEnum.OUT_RESIDUE_DEPOSIT, oad);
                     orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
                     orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -85,6 +85,11 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         return RestResponse.data(baseBiz.getAll());
     }
 
+    @GetMapping("/app/unauth/company/list")
+    public RestResponse<List<BranchCompany>> findAll(){
+        return RestResponse.data(baseBiz.getAll());
+    }
+
     @RequestMapping(value ="/{id}",method = RequestMethod.GET)
     public RestResponse<BranchCompany> get(@PathVariable Integer id) {
         return RestResponse.data(baseBiz.getById(id));