修改代码

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);
     }