Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

@@ -54,6 +54,11 @@ public class RentVehiclePriceVO extends OrderPriceVO{
      */
     private BigDecimal buyVehicleAmount = BigDecimal.ZERO;
 
+    /**
+     * 最后的租车金额
+     */
+    private BigDecimal realVehicleAmount = BigDecimal.ZERO;
+
     /**
      * 优惠描述
      */

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

@@ -344,7 +344,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }});
 
             if(null == crosstown) {
-                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId()));
+                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet(StrUtil.format("退款第一部分押金失败，获取不了还车/定损记录，订单号：{}, crosstownTypeEnum: {}",  orderMQDTO.getId(), crosstownTypeEnum)));
             }
 
             if(null == crosstown.getRestDeposit()
@@ -365,12 +365,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             handleDedRefundDesc = handleDed(crosstown, handleDedRefundDesc, csv);
             if(csv.getDamagesAmount().compareTo(BigDecimal.ZERO) > 0) {
                 oad.getDeductions().add(
-                        initDeduction(crosstown.getDeductionCost(), handleDedRefundDesc, DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
+                        initDeduction(csv.getDamagesAmount(), handleDedRefundDesc, DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
                 );
             }
 
             //剩余押金 = 押金 - 违章保证金 - 定损金额
-            oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(crosstown.getDeductionCost()));
+            oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
             handleCrosstownDetail(crosstown, oad);
 
             //退款
@@ -413,7 +413,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 handelCostDetailExtend(csv);
             }});
 
+            //捕捉异常
+            try {
                 orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
+            }catch (Exception e) {
+                log.error(e.getMessage(), e);
+            }
         }
     }
 

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

@@ -251,6 +251,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
             if(jsonArray != null && jsonArray.size() > 0) {
+                orderVehicleCrosstownDto.setDeduction(true);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {

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

 package com.xxfc.platform.order.biz.inner;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -385,7 +386,7 @@ public class OrderMsgBiz {
             BigDecimal residueAmount;
             //查询订单退款记录
             OrderAccount orderAccount;
-            if(RefundStatusEnum.RESIDUE_ILLEGAL.equals(baseOrder.getRefundStatus())) {
+            if(RefundStatusEnum.RESIDUE_ILLEGAL.getCode().equals(baseOrder.getRefundStatus())) {
                 smstype = SmsTemplateDTO.REFUND_A;
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
@@ -395,7 +396,7 @@ public class OrderMsgBiz {
                 violateAmount = orderAccount.getDeductAmount();
                 refundAmount = orderAccount.getAccountAmount();
                 residueAmount = orvd.getReturnPayResidue();
-            }else if(RefundStatusEnum.REFUND_DEPOSIT.equals(baseOrder.getRefundStatus())){
+            }else if(RefundStatusEnum.REFUND_DEPOSIT.getCode().equals(baseOrder.getRefundStatus())){
                 smstype = SmsTemplateDTO.REFUND_B;
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
@@ -407,7 +408,7 @@ public class OrderMsgBiz {
                 residueAmount = BigDecimal.ZERO;
             }else {
                 throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashSet<String>() {{
-                    add("当前退款状态不对，订单号："+ baseOrder.getNo());
+                    add(StrUtil.format("当前退款状态不对，订单号：{} baseOrder.getRefundStatus(): {}", baseOrder.getNo(), baseOrder.getRefundStatus()));
                 }});
             }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -356,6 +356,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setFreeDayNum(freeDayNum);
         rvp.setFreeAmount(vehicleOrderItem.getCutAmount());
         rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
+        rvp.setRealVehicleAmount(vehicleOrderItem.getRealAmount());
         rvp.setCouponDesc(couponDesc);
 
         rvp.initParamJson();

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

@@ -27,11 +27,14 @@ public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
     @ApiModelProperty(value = "状态")
-    private Integer status;
+    private Integer status=1;
     @ApiModelProperty("分类逗号分割")
     String catasStr;
     @ApiModelProperty("排除的车型id")
     String notInIds;
     @ApiModelProperty(value = "分类列表", hidden = true)
     Map<Integer, List<VehiclePlatCata>> catas;
+
+    @ApiModelProperty(value = "分类列表(1-后台,2-app和小程序)", hidden = true)
+    private Integer pathType=2;
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -49,7 +49,9 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      * @return
      */
     public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc) {
-
+        if (vmqc.getPathType()==1) {
+            vmqc.setStatus(null);
+        }
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -17,19 +17,25 @@
         <if test="isDel !=null ">
             and isdel=#{isDel}
         </if>
+
+
         <if test="status != null">
             and status = #{status}
         </if>
+
+
         <if test="vehicleName !=null and vehicleName !=''">
             AND vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
         </if>
 
         <if test="vehicleType!=null and vehicleType!=''">
-        AND  EXISTS (SELECT vc.vehicle_model_id  FROM vehicle_cata vc WHERE vc.cata_id=#{vehicleType} AND vmqc.id=vc.vehicle_model_id )
+            AND EXISTS (SELECT vc.vehicle_model_id FROM vehicle_cata vc WHERE vc.cata_id=#{vehicleType} AND
+            vmqc.id=vc.vehicle_model_id )
         </if>
 
         <if test="takeALieTheNumber!=null and takeALieTheNumber!=''">
-        AND  EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND vmqc.id=vc2.vehicle_model_id)
+            AND EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND
+            vmqc.id=vc2.vehicle_model_id)
         </if>
 
         <if test="catas != null">