Merge branch 'holiday-price' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -197,8 +197,10 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 BigDecimal commission = sellingWater.getCommission();
                 log.info("订单完成计算用户拥金----finishOrderWater----id====" + id + "---commission==" + commission + "----orderType===" + orderType);
                 amount = amount.add(commission);
+
             }
-            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount);
+            BigDecimal unbooked=amount;
+            log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount+"---unbooked=="+unbooked);
             if(orderType==1){
                 List<OrderGoodsDTO> goodsDTOList =orderWaterDTO.getGoodsDTOList();
                 log.info("租车订单完成-----goodsDTOList==="+goodsDTOList);
@@ -247,7 +249,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 detail.setSource(1);
                 myWaterBiz.updMyWater(detail);
                 if (orderType == 1 || orderType == 2) {
-                    myWaterBiz.updMyWalletUnbooked(userId, amount, 2);
+                    myWaterBiz.updMyWalletUnbooked(userId, unbooked, 2);
                 }
 
             }

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

@@ -308,4 +308,17 @@ public class BaseOrder implements Serializable {
 	@Column(name = "remark")
 	private Integer remark;
 
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "上级id")
+	@Column(name = "parent_user_id")
+	private Integer parentUserId;
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	@Column(name = "parent_user_company_id")
+	private Integer parentUserCompanyId;
 }

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

@@ -33,12 +33,6 @@ public interface OrderDetail extends OrderItemInter {
 
     public void setAppUserDTO(AppUserDTO appUserDTO);
 
-//    public Integer getFacilitateId();
-//
-//    public void setFacilitateId(Integer facilitateId);
-
     public String getFacilitatePhone();
 
-    public void setFacilitatePhone(String facilitatePhone);
-
 }

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

@@ -105,17 +105,14 @@ public class VehicleItemDTO extends OrderItem {
 
     public BigDecimal getUsedAmount(Integer useDays) {
         List<VMCalendarPriceCostDTO> vmcpds = getVehicleDetail();
-        if(CollUtil.isEmpty(vmcpds)){
         if(useDays > getTotalNum()) {
             useDays = getTotalNum();
         }
+        if(CollUtil.isEmpty(vmcpds)){
             return getUnitPrice().multiply(new BigDecimal(useDays+ ""));
         }
 
         BigDecimal usedAmount = BigDecimal.ZERO;
-//        for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
-//            usedAmount.add(vmcpcd.getPrice());
-//        }
         for(int i = 0; i < useDays; i++) {
             usedAmount = usedAmount.add(vmcpds.get(i).getPrice());
         }

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

@@ -99,6 +99,9 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         baseOrder.setUserId(appUserDTO.getUserid());
         baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
 
+        //设置上级
+        baseOrder.setParentUserId(appUserDTO.getParentId());
+
         return baseOrder;
     }