Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -1024,8 +1024,10 @@ public class AppPermissionService {
         }
         Map<Integer, AppUserDetail> userIdAndAppUserDetail = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(appUserLogin.getId()));
         AppUserDetail appUserDetail = userIdAndAppUserDetail.get(appUserLogin.getId());
-        imiVo.setNickname(appUserDetail.getNickname());
-        imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        if (appUserDetail != null) {
+            imiVo.setNickname(appUserDetail.getNickname());
+            imiVo.setHeadimgurl(appUserDetail.getHeadimgurl());
+        }
         return imiVo;
     }
 

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/BaseOrderBiz.java

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -568,6 +569,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         if (updateSelectiveByIdRe(baseOrder) > 0) {
             return selectById(baseOrder.getId());
         } else {
+            log.error(StrUtil.format("数据更新失败：baseOrder: {}", JSONUtil.toJsonStr(baseOrder)));
             throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
         }
     }

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

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -9,6 +11,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
@@ -80,6 +83,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
 
     /**
      * 租车退款流程
@@ -208,7 +214,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         updateBaseOrder.setRefundTime(System.currentTimeMillis());
         updateBaseOrder.setVersion(baseOrder.getVersion());
         if(SYS_TRUE.equals(flag) && null != refundStatus) {
-            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder), baseOrder);
+            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder, Boolean.TRUE), baseOrder);
         }
     }
 
@@ -355,6 +361,21 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             OrderAccountDetail oad = new OrderAccountDetail();
             InProgressVO inProgressVO = orderCalculateBiz.calculateOrderComplete(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), oad, orderItem, orderMQDTO.getOrderRentVehicleDetail().getUsedDay(), Boolean.FALSE);
 
+            //返回优惠券和免费天数
+                //取消租车免费天数使用
+            if(inProgressVO.getBackFreeDays() > 0) {
+                int result = userFeign.memberDays(orderMQDTO.getUserId(), inProgressVO.getBackFreeDays(), UserFeign.MEMBER_DAYS_WITHDRAW);
+                if(result < 0) {
+                    throw new BaseException(ResultCode.FAILED_CODE);
+                }
+            }
+                //返还优惠券
+            if(inProgressVO.getBackCoupons().size() > 0) {
+                for(String backCoupon : inProgressVO.getBackCoupons()) {
+                    activityFeign.cancelUse(backCoupon);
+                }
+            }
+
             //还车扣除款 剩余的 钱，再减去违章预备金
             oad.getDeductions().add(
                     initDeduction(illegalReserve, "违章保证金", DeductionTypeEnum.VIOLATE_TRAFFIC_KEEP, OrderAccountDeduction.ORIGIN_DEPOSIT)
@@ -371,7 +392,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //剩余押金 = 押金 - 违章保证金 - 定损金额
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
-            handleCrosstownDetail(crosstown, oad);
+            handleCrosstownDetail(crosstown, oad, csv);
 
             //退款
             BigDecimal refundAmont = oad.getDepositAmount().add(oad.getOrderAmount());
@@ -409,7 +430,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.initParamJson();
             //设置明细
             orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
-                setId(orderMQDTO.getId());
+                setId(orderMQDTO.getDetailId());
                 handelCostDetailExtend(csv);
             }});
 
@@ -437,15 +458,15 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         return refundDesc;
     }
 
-    private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad) {
+    private void handleCrosstownDetail(OrderVehicleCrosstown crosstown, OrderAccountDetail oad, CancelStartedVO csv) {
         try{
             if(null != crosstown.getViolateDetail()) {
                 DedDetailDTO vio = JSONUtil.toBean(crosstown.getViolateDetail(), DedDetailDTO.class);
 
                 if(OrderViolateEnum.BEFORE.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio);
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_ADVANCE, oad, vio, csv);
                 }else if(OrderViolateEnum.AFTER.getCode().equals(vio.getType())) {
-                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio);
+                    handleViolateDetail(DeductionTypeEnum.VIOLATE_DELAY, oad, vio, csv);
                 }
             }
         }catch (Exception e) {
@@ -453,7 +474,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio) {
+    private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
             if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
@@ -461,6 +482,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 //修改归还押金金额
                 oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
                 deduction.setAmount(vio.getCost());
+
+                //设置订单明细参数
+                csv.setViolateAmount(deduction.getAmount());
+                csv.setViolateDesc(deduction.getName());
             }
         }
     }

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

@@ -193,7 +193,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
-                if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() <= vehicle.getMileageLastUpdate()) {
+                if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
                 }
             }
@@ -357,7 +357,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
@@ -370,7 +370,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);

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

@@ -115,20 +115,7 @@ public class OrderCalculateBiz {
             consumeAmount = consumeAmount.add(otherItemRealAmount);
             inProgressVO.setConsumeAmount(consumeAmount);
 
-            if(consumeAmount.compareTo(BigDecimal.ZERO) > 0) {
-                //消费金额 大于0 增加额外费用
-                OrderAccountDeduction extraDeduction = orderAccountBiz.initDeduction(consumeAmount, "消费金额", DeductionTypeEnum.CONSUME, OrderAccountDeduction.ORIGIN_ORDER_DEPOSIT);
-                oad.getDeductions().add(extraDeduction);
-            }
-
-            //消费金额 小于商品真实的金额 返回钱
-            if(consumeAmount.compareTo(goodsRealAmount) <= 0) {
-                //设置返回钱
-                refundAmount = refundAmount.add(goodsRealAmount.subtract(consumeAmount));
-            }else {
-                //设置额外扣减（押金里面扣）
-                inProgressVO.setExtraAmount(consumeAmount.subtract(goodsRealAmount));
-            }
+            refundAmount = handleConsumeAmount(oad, refundAmount, consumeAmount, goodsRealAmount, inProgressVO);
         }else {
             //设置免费天数
             inProgressVO.setUsedfreeDays(useDays);
@@ -138,6 +125,18 @@ public class OrderCalculateBiz {
             refundAmount = refundAmount.add(goodsRealAmount);
             inProgressVO.setBackFreeDays(backFreeDays);
 
+            //返回优惠券
+            if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                //返回所有优惠券
+                inProgressVO.setBackCoupons(StrUtil.split(baseOrder.getCouponTickerNos(), ','));
+            }
+
+            //设置消费金额 由于返回了优惠券，所以添加优惠券之前减免的金额
+            consumeAmount = consumeAmount.add(otherItemRealAmount).add(baseOrder.getCouponAmount());
+            inProgressVO.setConsumeAmount(consumeAmount);
+
+            refundAmount = handleConsumeAmount(oad, refundAmount, consumeAmount, goodsRealAmount, inProgressVO);
+
         }
 
         inProgressVO.setRefundOrderAmount(refundAmount);
@@ -177,6 +176,24 @@ public class OrderCalculateBiz {
         return inProgressVO;
     }
 
+    private BigDecimal handleConsumeAmount(OrderAccountDetail oad, BigDecimal refundAmount, BigDecimal consumeAmount, BigDecimal goodsRealAmount, InProgressVO inProgressVO) {
+        if (consumeAmount.compareTo(BigDecimal.ZERO) > 0) {
+            //消费金额 大于0 增加额外费用
+            OrderAccountDeduction consumeDeduction = orderAccountBiz.initDeduction(consumeAmount, "消费金额", DeductionTypeEnum.CONSUME, OrderAccountDeduction.ORIGIN_ORDER_DEPOSIT);
+            oad.getDeductions().add(consumeDeduction);
+        }
+
+        //消费金额 小于商品真实的金额 返回钱
+        if (consumeAmount.compareTo(goodsRealAmount) <= 0) {
+            //设置返回钱
+            refundAmount = refundAmount.add(goodsRealAmount.subtract(consumeAmount));
+        } else {
+            //设置额外扣减（押金里面扣）
+            inProgressVO.setExtraAmount(consumeAmount.subtract(goodsRealAmount));
+        }
+        return refundAmount;
+    }
+
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {
         OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
             setType(ItemTypeEnum.VEHICLE_MODEL.getCode());

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

@@ -144,15 +144,6 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-//                    List<OrderItem> otherOrderItems = orderItemBiz.selectByExample(new Example.Builder(OrderItem.class)
-//                        .where(WeekendSqls.<OrderItem>custom().andNotEqualTo(OrderItem::getType, ItemTypeEnum.VEHICLE_MODEL.getCode())).build()
-//                    );
-
-                    //原退还押金
-                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-//                    BigDecimal freeDayAmount = BigDecimal.ZERO;
-
-
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
@@ -205,9 +196,6 @@ public class OrderCancelBiz {
                     }else {
 //                        //没到出车时间
 //                        //判断是否使用免费天数，并且进行扣款
-//                        if(freeDays > 0) {
-//                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-//                        }
 
                         //违约金封顶 租车身份价 * 2天
                         BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));

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

@@ -386,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());
@@ -396,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());

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

@@ -143,6 +143,8 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
                         , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
                         , DictionaryKey.APP_ORDER+ "_"+ key
                         , refundDescBuilder);
+
+                totalDeductAmount = deductionAmount;
                 totalRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
                 refundDesc = refundDescBuilder.toString();
                 break;

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

@@ -217,7 +217,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal vehicleAmount = BigDecimal.ZERO;
         BigDecimal driverAmount = BigDecimal.ZERO;
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
-//        BigDecimal modelAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
         String couponDesc = "";
         Integer vehicleDayNum = 0;
@@ -356,6 +355,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-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -7,6 +7,15 @@ public class DictionaryKey {
      */
     public static final String APP_ORDER ="APP_ORDER";
 
+    /**
+     * IM类型
+     */
+    public static final String IM_TYPE ="IM_TYPE";
+
+    /**
+     * IM限制条数
+     */
+    public static final String MSG_LIMIT_NUMBER ="MSG_LIMIT_NUMBER";
     /**
      * 支付
      */