Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -252,31 +252,31 @@ public class BaseOrder implements Serializable {
 	@Column(name = "member_level")
 	private Integer memberLevel;
 
-//	/**
-//	 * 违约金
-//	 */
-//	@ApiModelProperty(value = "违约金")
-//	@Column(name = "violate_amount")
-//	BigDecimal ViolateAmount;
-//
-//	/**
-//	 * 赔偿金
-//	 */
-//	@ApiModelProperty(value = "赔偿金")
-//	@Column(name = "damages_amount")
-//	BigDecimal damagesAmount;
-//
-//	/**
-//	 * 额外费用
-//	 */
-//	@ApiModelProperty(value = "额外费用")
-//	@Column(name = "extra_amount")
-//	BigDecimal extraAmount;
-//
-//	/**
-//	 * 返还的优惠券
-//	 */
-//	@ApiModelProperty(value = "返回的优惠券")
-//	@Column(name = "back_coupon")
-//	String backCoupon;
+	/**
+	 * 违约金
+	 */
+	@ApiModelProperty(value = "违约金")
+	@Column(name = "violate_amount")
+	BigDecimal ViolateAmount;
+
+	/**
+	 * 赔偿金
+	 */
+	@ApiModelProperty(value = "赔偿金")
+	@Column(name = "damages_amount")
+	BigDecimal damagesAmount;
+
+	/**
+	 * 额外费用
+	 */
+	@ApiModelProperty(value = "额外费用")
+	@Column(name = "extra_amount")
+	BigDecimal extraAmount;
+
+	/**
+	 * 返还的优惠券
+	 */
+	@ApiModelProperty(value = "返回的优惠券")
+	@Column(name = "back_coupon")
+	String backCoupon;
 }

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

@@ -342,10 +342,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             );
 
             //设置定损金额
-            csv.setDamagesAmount(crosstown.getDeductionCost());
-            if(crosstown.getDeductionCost().compareTo(BigDecimal.ZERO) > 0) {
+            String handleDedRefundDesc = "";
+            handleDedRefundDesc = handleDed(crosstown, handleDedRefundDesc, csv);
+            if(csv.getDamagesAmount().compareTo(BigDecimal.ZERO) > 0) {
                 oad.getDeductions().add(
-                        initDeduction(crosstown.getDeductionCost(), "定损赔偿金", DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
+                        initDeduction(crosstown.getDeductionCost(), handleDedRefundDesc, DeductionTypeEnum.DAMAGES, OrderAccountDeduction.ORIGIN_DEPOSIT)
                 );
             }
 
@@ -361,7 +362,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     //crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
 
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
-            refundDesc = handleDed(crosstown, refundDesc);
+            refundDesc += handleDedRefundDesc;
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), AccountTypeEnum.OUT_PART_DEPOSIT, oad);
 
@@ -397,12 +398,13 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
-    private String handleDed(OrderVehicleCrosstown crosstown, String refundDesc) {
+    private String handleDed(OrderVehicleCrosstown crosstown, String refundDesc, CancelStartedVO csv) {
         try{
             if(null != crosstown.getDedDetail()) {
                 List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(crosstown.getDedDetail()), DedDetailDTO.class);
                 for(DedDetailDTO ddd : dddList) {
                     refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+                    csv.setDamagesAmount(csv.getDamagesAmount().add(ddd.getCost()));
                 }
             }
         }catch (Exception e) {

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

@@ -157,9 +157,9 @@ public class OrderCalculateBiz {
             oad.getDeductions().add(violateDeduction);
         }else if(residueDays < 0 && !isCancel){
             //如果订单 出发中 或者 已完成 或者定损中
-            if(OrderStatusEnum.ORDER_WAIT.equals(baseOrder.getStatus()) ||
-                    OrderStatusEnum.ORDER_FINISH.equals(baseOrder.getStatus()) ||
-                    OrderStatusEnum.ORDER_FIXED_LOSS.equals(baseOrder.getStatus())) {
+            if(OrderStatusEnum.ORDER_WAIT.getCode().equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FINISH.getCode().equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FIXED_LOSS.getCode().equals(baseOrder.getStatus())) {
                 Integer overDays = 0 - residueDays;
                 String violateDesc = StrUtil.format("({}元/天 x200%) x{}天", orderItem.getUnitPrice().toString(), overDays);
 //                if(overDays > 2) {

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -191,6 +193,10 @@ public class OrderCancelBiz {
                             }
                         }
 
+                        //设置订单数据
+                        baseOrder.setViolateAmount(csv.getViolateAmount());
+                        baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+
                         csv.initParamJson();
                         //orderTemplateBiz.handleCostDetailExtend(csv);
                         orvd.handelCostDetailExtend(csv);
@@ -208,6 +214,11 @@ public class OrderCancelBiz {
                         //退款流程
                         orderAccountBiz.rentRefundProcessCancel(baseOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, oad, topAmount);
 
+                        //设置订单数据
+                        //baseOrder.setDamagesAmount(csv.getDamagesAmount());
+                        //baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+                        baseOrder.setBackCoupon(baseOrder.getCouponTickerNos());
+
                         //如果有扣款项，则生成额外的费用明细
                         if(oad.getDeductions().size() > 0) {
                             for(OrderAccountDeduction deduction : oad.getDeductions()) {
@@ -217,10 +228,14 @@ public class OrderCancelBiz {
                                         setViolateDesc(deduction.getName());
                                     }};
 
+                                    //设置订单数据
+                                    baseOrder.setViolateAmount(cnsv.getViolateAmount());
+
                                     cnsv.initParamJson();
                                     //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                     orvd.handelCostDetailExtend(cnsv);
                                     orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
+                                    break;
                                 }
                             }
                         }
@@ -273,7 +288,9 @@ public class OrderCancelBiz {
                                     setViolateDesc(deduction.getName());
                                 }};
 
-                                cnsv.initParamJson();
+                                //设置订单数据
+                                baseOrder.setViolateAmount(cnsv.getViolateAmount());
+
                                 //orderTemplateBiz.handleCostDetailExtend(cnsv);
                                 otd.handelCostDetailExtend(cnsv);
                                 orderTourDetailBiz.updateSelectiveByIdRe(otd);
@@ -311,13 +328,6 @@ public class OrderCancelBiz {
                     }
                 }
 
-                //返还优惠券
-                if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
-                    List<String> backCoupons = (null == inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
-                    for(String backCoupon : backCoupons) {
-                        activityFeign.cancelUse(backCoupon);
-                    }
-                }
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());
@@ -327,6 +337,20 @@ public class OrderCancelBiz {
                 tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
             }
 
+            //返还优惠券
+            if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                List<String> backCoupons = (null == inProgressVO)? Convert.convert(List.class, baseOrder.getCouponTickerNos().split(",")): inProgressVO.getBackCoupons();
+                //设置订单参数
+                baseOrder.setBackCoupon(ArrayUtil.join(backCoupons, ","));
+
+                for(String backCoupon : backCoupons) {
+                    activityFeign.cancelUse(backCoupon);
+                }
+            }
+
+            //更新baseOrder
+            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(baseOrder), baseOrder);
+
             //发送队列消息
             baseOrderBiz.sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_CANCEL);
         }else {

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

 package com.xxfc.platform.order.rest;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -78,13 +79,15 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         BigDecimal orderRefundAmount = BigDecimal.ZERO;
         StringBuilder refundDescBuilder = new StringBuilder("");
         String refundDesc = "";
+        InProgressVO inProgressVO = new InProgressVO();
 
         switch (orderTypeEnum) {
             case RENT_VEHICLE:
                 DateTime nowTime = DateTime.parse(DateTime.now().toString(CommonConstants.YMR_SLASH_FORMATTER_JODA), CommonConstants.YMR_SLASH_FORMATTER_JODA);
                 DateTime startTime = DateTime.parse(new DateTime(orderPageVO.getOrderRentVehicleDetail().getStartTime()).toString(CommonConstants.YMR_SLASH_FORMATTER_JODA), CommonConstants.YMR_SLASH_FORMATTER_JODA);
 
-                InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, baseOrderBiz.getDaysBetweenDateTime(startTime, nowTime));
+                inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, baseOrderBiz.getDaysBetweenDateTime(startTime, nowTime));
+                refundDesc = inProgressVO.getViolateDesc();
 //                orderRefundAmount = orderAccountBiz.calculateDeduction(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
 //                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
 //                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
@@ -105,9 +108,9 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
 //                }
 //                BigDecimal residueAmount = orderRefundBiz.calculateDeduction(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
                 //扣款 = 违约金 + 消费金额
-                BigDecimal residueAmount = BigDecimal.ZERO;
-                        //inProgressVO.get
-                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+//                BigDecimal residueAmount = BigDecimal.ZERO;
+//                        //inProgressVO.get
+//                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
 
                 //押金剩余款 ：押金 - (原扣除款 - 剩余款)
                 //退款金额 ：订单剩余款 + 押金剩余款
@@ -116,15 +119,31 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
                 break;
             case TOUR:
                 //判断是省内还是省外
-//                String key = TOUR_IN_REFUND;
-//                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-//                    key = TOUR_REFUND;
-//                }
-//                orderRefundAmount = orderRefundBiz.calculateDeduction(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-//                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-//                        , DictionaryKey.APP_ORDER+ "_"+ key
-//                        , refundDescBuilder);
-//                break;
+                String key = TOUR_IN_REFUND;
+                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+                    key = TOUR_REFUND;
+                }
+
+                OrderItem adultItem = orderItemBiz.selectOne(new OrderItem(){{
+                    setType(ItemTypeEnum.TOUR_ADULT.getCode());
+                    setOrderId(orderPageVO.getId());
+                }});
+
+                OrderItem childItem = orderItemBiz.selectOne(new OrderItem(){{
+                    setType(ItemTypeEnum.TOUR_CHILD.getCode());
+                    setOrderId(orderPageVO.getId());
+                }});
+
+                BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount();
+                BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount();
+
+                BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(adultItemAmount.add(childItemAmount)
+                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
+                        , DictionaryKey.APP_ORDER+ "_"+ key
+                        , refundDescBuilder);
+                orderRefundAmount = orderPageVO.getRealAmount().subtract(deductionAmount);
+                refundDesc = refundDescBuilder.toString();
+                break;
             default:
                 break;
         }
@@ -132,7 +151,7 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         OrderRefundPriceVO orpv = new OrderRefundPriceVO();
         orpv.setRealAmount(orderPageVO.getRealAmount());
         orpv.setRefundAmount(orderRefundAmount);
-        orpv.setRefundDesc("取消操作可能会产生额外费用，是否确定取消订单");
+        orpv.setRefundDesc(StrUtil.format("取消操作可能会产生额外费用{}，是否确定取消订单", refundDesc));
         return ObjectRestResponse.succ(orpv);
     }
 

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

@@ -83,7 +83,6 @@ public class VehicleActiveService {
         if (MileageLift == null || MileageLift1 >= MileageLift) {
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
-            vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
             // 修改车辆状态，确认是空闲状态
@@ -211,7 +210,6 @@ public class VehicleActiveService {
             if (vehicleBookRecord != null) {
                 vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
             }
-            vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
             // 出车记录
             VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());