会员分成记录信息

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

@@ -6,9 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSONArray;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -285,16 +283,15 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
 			}
-			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+			if (orderPageVo.getStatus() == 4) { //未交车
+				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
 					orderPageVo.setUserCompanyStatus(true);
 				}
-			if (orderPageVo.getStatus() == 4) { //未交车
-//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-//                if (!flag) {
-//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-//                }
 				getDriverInfo(orderPageVo);
 			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+					orderPageVo.setUserCompanyStatus(true);
+				}
 				//设置违约金金额
 				getDriverInfo(orderPageVo);
 				getUserLicense(orderPageVo);
@@ -754,6 +751,15 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 				ObjectRestResponse orr = userFeign.buyMember(userMemberDTO);
 				log.info("orr.getStatus() : " + orr.getStatus());
+
+				//查询当前会员等级的所有订单，
+
+				//查询会员等级信息
+
+				//计算每人平均分成金额
+
+
+
 			} else if (OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
 				updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
 				orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{