Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -316,20 +316,20 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         //计算退款金额
             // 1、押金 + 租金(规则扣除)
         //BigDecimal refundGoodsAmount = baseOrder.getGoodsAmount();
-        String refundDesc = "取消订单退款:";
+        StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
         if(null == depositAmount) {
             depositAmount = BigDecimal.ZERO;
         }
         //商品价格 - 优惠券减免的价格
-        BigDecimal refundGoodsAmount = calculateRefund(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()), timeLag, dicParentKey, refundDesc);
+        BigDecimal refundGoodsAmount = calculateRefund(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()), timeLag, dicParentKey, refundDescBuilder);
 
         //退款金额
         BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
         //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDesc, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
     }
 
-    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, String refundDesc) {
+    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
         BigDecimal refundGoodsAmount = goodsAmount;
 
         //根据时间处理goodsAmount
@@ -354,7 +354,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     //ga : goodsAmount
                     set("ga", goodsAmount);
                 }})).toString());
-                refundDesc = names[1]+ ","+ refundDesc;
+                refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
                 break;
             }
         }

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

@@ -24,6 +24,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.math.BigDecimal;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_IN_REFUND;
+import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_REFUND;
 
 @Controller
 @RequestMapping("orderRefund")
@@ -40,10 +43,10 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         return userFeign;
     }
 
-    @RequestMapping(value = "/price/calculate/{type}/{no}", method = RequestMethod.GET)
+    @RequestMapping(value = "/price/calculate/{no}", method = RequestMethod.GET)
     @ResponseBody
     @IgnoreClientToken
-    public ObjectRestResponse getPriceCalculate(@PathVariable(value = "type") String type, @PathVariable(value = "no") String no) {
+    public ObjectRestResponse<BigDecimal> getPriceCalculate(@PathVariable(value = "no") String no) {
         checkAppUser();
         //根据no 查订单
         OrderPageVO orderPageVO = baseOrderBiz.pageByParm(new Query(new PageParam(){{
@@ -51,36 +54,38 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
             setPage(1);
         }}){{put("no", no); }}.getSuper()).get(0);
 
-        OrderRefundPriceVO orp = new OrderRefundPriceVO(){{
-            setRealAmount(orderPageVO.getRealAmount());
-        }};
-
         OrderTypeEnum orderTypeEnum = OrderTypeEnum.get(orderPageVO.getType());
 
+        BigDecimal orderRefundAmount = BigDecimal.ZERO;
+        StringBuilder refundDescBuilder = new StringBuilder("");
+
         switch (orderTypeEnum) {
             case RENT_VEHICLE:
-                baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount()
-                        , System.currentTimeMillis() - orderPageVO.getOrderRentVehicleDetail().getStartTime()
+                orderRefundAmount = baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
                         , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
-                        , "取消订单退款:");
+                        , refundDescBuilder);
                 break;
             case TOUR:
-//                String dicParentKey = DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.TOUR_REFUND;
-//                //不是省外，
-//                if(SYS_FALSE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-//                    dicParentKey = DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.TOUR_IN_REFUND;
-//                }
-//                orp.setRefundAmount(baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-//                        , System.currentTimeMillis() - orderPageVO.getOrderRentVehicleDetail().getStartTime()
-//                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
-//                        , "取消订单退款:"));
+                //判断是省内还是省外
+                String key = TOUR_IN_REFUND;
+                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+                    key = TOUR_REFUND;
+                }
+                orderRefundAmount = baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
+                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , refundDescBuilder);
                 break;
             default:
-//                orp.setRefundAmount(orderPageVO);
                 break;
         }
 
-        return null;
+        OrderRefundPriceVO orpv = new OrderRefundPriceVO();
+        orpv.setRealAmount(orderPageVO.getRealAmount());
+        orpv.setRefundAmount(orderRefundAmount);
+        orpv.setRefundDesc(refundDescBuilder.toString());
+        return ObjectRestResponse.succ(orpv);
     }
 
     @Data
@@ -88,10 +93,11 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         BigDecimal refundAmount;
         BigDecimal realAmount;
         BigDecimal cutAmount;
+        String refundDesc;
 
         public void setRefundAmount(BigDecimal refundAmount) {
             this.refundAmount = refundAmount;
-            this.cutAmount = realAmount.multiply(refundAmount);
+            this.cutAmount = realAmount.subtract(refundAmount);
         }
     }
 }
\ No newline at end of file