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

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

@@ -78,10 +78,10 @@ public class BaseOrder implements Serializable {
     private BigDecimal goodsAmount;
 
 	    /**
-     *  订单价格
+     *  订单总金额
      */
     @Column(name = "order_amount")
-	@ApiModelProperty(value = "订单价格")
+	@ApiModelProperty(value = "订单总金额")
     private BigDecimal orderAmount;
 
 	    /**

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/account/OrderAccountDetail.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class OrderAccountDetail {
     /**
-     * 实际返回订单款
+     * 实际返回订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
     BigDecimal orderAmount;
     /**
@@ -17,7 +17,7 @@ public class OrderAccountDetail {
      */
     BigDecimal depositAmount;
     /**
-     * 原来要返回的订单款
+     * 原来要返回的订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
     BigDecimal originOrderAmount;
     /**

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

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 @Data
 public class OrderPriceVO {
-    @ApiModelProperty(value = "订单价格")
+    @ApiModelProperty(value = "订单总金额")
     public BigDecimal orderAmount;
     @ApiModelProperty(value = "商品价格")
     public BigDecimal goodsAmount;

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

@@ -435,8 +435,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
 
             //订单账款类
             OrderAccountDetail oad = new OrderAccountDetail();
-            oad.setOriginOrderAmount(baseOrder.getRealAmount());
-            oad.setOrderAmount(baseOrder.getRealAmount());
+            oad.setOriginOrderAmount(baseOrder.getGoodsAmount());
+            //账单的的orderAmount 对应 的是商品金额
+            oad.setOrderAmount(baseOrder.getGoodsAmount());
 
             //如果是会员订单，则触发会员效益
             if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {

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

@@ -95,8 +95,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         BigDecimal refundMainGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder, oad);
         refundMainGoodsAmount = refundMainGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
-        //退款金额 = 主要商品退款 + （其他商品退款） 即--> 主要商品退款 + （订单总商品款 - 主要商品款）
-        oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getOrderAmount().subtract(mainItemRealAmount)));
+        //退款金额 = 主要商品退款 + （其他商品退款） 即--> 主要商品退款 + （总商品款 - 主要商品款）
+        oad.setOrderAmount(refundMainGoodsAmount.add(baseOrder.getGoodsAmount().subtract(mainItemRealAmount)));
         BigDecimal refundAmount = oad.getOrderAmount();
 
         // 押金

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

@@ -386,9 +386,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     private String handleChildren(RentVehicleBO detail, Integer vehicleDayNum) {
         StringBuffer childrenStr = new StringBuffer("");
-        if(vehicleDayNum > 0) {
+//        if(vehicleDayNum > 0) {
             childrenStr.append(",${tem_0101}");
-        }
+//        }
         if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
             childrenStr.append(",${tem_0102}");
         }