Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ReferralCodeUtil.java

@@ -21,7 +21,7 @@ public class ReferralCodeUtil {
 	
 	static {
 		PERMUTATION = permutation(LEN);
-		MAX_COMBINATION = combination(_stuffs.length, LEN);
+		MAX_COMBINATION = combination(36, LEN);
 	}
 
 //	public static void resetStuffs() {

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

 package com.github.wxiaoqi.security.admin.biz;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
-import com.github.wxiaoqi.security.admin.entity.*;
-import com.github.wxiaoqi.security.admin.mapper.*;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
+import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import javafx.print.Collation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,10 +81,13 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                  map.put(sysRegion.getId(),sysRegion.getName());
             }
             for (AppUserManageVo appUserManageVo : pageInfo.getList()) {
+                if(appUserManageVo.getCityCode() != null) {
                     Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
                     String crtyName = map.get(cityCode);
                     appUserManageVo.setCityName(crtyName);
                 }
+
+            }
         }
         return pageInfo;
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -22,6 +22,7 @@ import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
+import com.github.wxiaoqi.security.common.util.ReferralCodeUtil;
 import com.github.wxiaoqi.security.common.util.UUIDUtils;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -306,7 +307,7 @@ public class AppPermissionService {
 
             }
             //生成邀请码 长度改为8 不然重复率太高
-            rsUserDetail.setCode(UUIDUtils.genCodes(8));
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.error("注册：新增用户详情： " + userid);
            /* //绑定上下线关系
@@ -933,7 +934,7 @@ public class AppPermissionService {
             rsUserDetail.setUpdatetime(now);
             rsUserDetail.setIsdel(0);
             //生成邀请码 长度改为8 不然重复率太高
-            rsUserDetail.setCode(UUIDUtils.genCodes(8));
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             //设置来源
             rsUserDetail.setChannel(UserSourceEnum.APPLET.getCode());
             rsUserDetail.setCrtHost(getIp());

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java

@@ -55,7 +55,7 @@ public class UserBiz {
         if(map.get("nickname") != null && !("").equals(map.get("nickname"))){
             str += "nickname="+map.get("nickname").toString();
         }
-        String result = this.doPost(imUrl + "/xxfcim/user/register",str) ;
+        String result = this.doPost(imUrl + "/user/register",str) ;
         JSONObject json = JSONObject.parseObject(result);
         //如果已经注册过，查询出手机号对应用户信息执行登录返回
         if(0 == json.getInteger("resultCode")){
@@ -105,7 +105,7 @@ public class UserBiz {
             str += "password="+map.get("password").toString();
         }
         str += "&areaCode=86";
-        String result = this.doPost(imUrl + "/xxfcim/user/login",str) ;
+        String result = this.doPost(imUrl + "/user/login",str) ;
         JSONObject json = JSONObject.parseObject(result);
         log.info("用户登录：result = {}, telephone = {}, password = {}, userId = {}", result, map.get("telephone"), map.get("password"), map.get("userId"));
         json.put("password",map.get("password").toString());

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

@@ -304,4 +304,8 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "handel_violation")
 	private Integer handelViolation;
 
+	@ApiModelProperty(value = "是否需要定损 0--不需要； 1--需要定损")
+	@Column(name = "fixed_loss_status")
+	private Integer fixedLossStatus;
+
 }

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

@@ -142,11 +142,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderPageVo.setUserCompanyStatus(true);
             }
             if (orderPageVo.getStatus() == 4) { //未交车
-                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-                if (!flag) {
-                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-                }
-
+//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+//                if (!flag) {
+//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+//                }
+                getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
@@ -232,10 +232,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         }
         if (orderPageVo.getOrderRentVehicleDetail() != null) {
             if (orderPageVo.getStatus() == 4) { //未交车
-                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-                if (!flag) {
-                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
-                }
+//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+//                if (!flag) {
+//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+//                }
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
                 getDriverInfo(orderPageVo);

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

@@ -71,9 +71,16 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
 
         //未退还， 进行挂起保留违章预备金 的退还
         if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {
+            Integer crosstownTypeEnum;
+            //判断是否定损过
+            if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
+                crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+            }else {
+                crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+            }
             OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
                 setOrderId(orderMQDTO.getId());
-                setType(CrosstownTypeEnum.ARRIVE.getCode());
+                setType(crosstownTypeEnum);
             }});
             //还车扣除款 剩余的 钱，再减去违章预备金
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);

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

@@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -149,6 +150,20 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+       if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
+           boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
+           if (!flag) {
+               return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+           }
+           if(userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
+               return ObjectRestResponse.createFailedResult(3501, "无交车权限");
+           }
+       } else {
+           if(userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
+               return ObjectRestResponse.createFailedResult(3501, "无收车权限");
+           }
+       }
+
         if(baseOrder.getStatus() != -1) {
             Vehicle vehicle = null;
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
@@ -265,6 +280,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(0);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
                 //添加定损记录
@@ -276,6 +293,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(1);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());
@@ -320,4 +339,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
         return illegalReserve;
     }
+
+    public boolean getTodayTime(Long time) {
+        long current = System.currentTimeMillis();
+        long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -139,7 +139,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     if (startResponse.getData() != null) {
                         orderPageVO.setStartCompanyName(startResponse.getData().getName());
                     }
-                    List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                    List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList());
                     ObjectRestResponse<List<AppUserVo>> users = userFeign.getByUserIds(tourUserIds);
                     if (users.getData() != null) {
                         orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : new ArrayList<>());

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

@@ -78,7 +78,7 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
                 }
                 orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
                         , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , DictionaryKey.APP_ORDER+ "_"+ key
                         , refundDescBuilder);
                 break;
             default:

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

@@ -72,6 +72,7 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
             orderViolation.setUpdTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
             getBaseBiz().updateOrderViolation(orderViolation);
         }
+        orderDepositRefundRecordBiz.saveViolationDeposit(orderViolation);
         return ObjectRestResponse.succ();
     }
 

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

@@ -363,7 +363,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }else {
             //会员固定价列表
             modelAmount = new BigDecimal(prices[(memberEnum.getCode() - 1)]);
-            rebate = modelAmount.divide(vehicleModel.getPrice()).multiply(hundred).setScale(0, BigDecimal.ROUND_UP).intValue();
+            rebate = modelAmount.divide(vehicleModel.getPrice(), 2, BigDecimal.ROUND_UP).multiply(hundred).intValue();
         }
         HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
         handleDiscountDTO.setRebate(rebate);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodController.java

@@ -33,7 +33,7 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
     @RequestMapping(value = "/app/unauth/getGoodList", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit,
+    public ObjectRestResponse<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit",defaultValue = "10") Integer limit,
                                           @RequestParam(value = "query", required = false) String query, @RequestParam(value = "latitude", required = false) Double latitude,
                                           @RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId,
                                           @RequestParam(value = "distance", defaultValue = "100.00") Double distance) {

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -56,7 +56,7 @@
         SELECT t.*  from tour_good t
             left  join (
             select good_id,
-            IFNULL(ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude}* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS( #{params.longitude} * PI() / 180.0)
+            IFNULL(ROUND(( (2 * ASIN( SQRT( POW( SIN((latitude * PI() / 180.0- #{params.latitude}* PI() / 180.0)/2), 2)+COS( latitude * PI() / 180.0)*COS( #{params.latitude} * PI() / 180.0)
             *POW(SIN((longitude * PI() / 180.0 - #{params.longitude}* PI() /180.0)/2),2))))*6378.137)*10000)/10000 ,0 ) AS distance
             FROM tour_good_site WHERE type=2 ) gs ON t.id=gs.good_id
         where  t.is_del=0 AND  t.status=1  and  gs.distance < #{params.distance}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -64,7 +64,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
     @Value("${universal.url}")
     String weixinHost;
 
-    String notifyUrl = weixinHost + "/service/payment/notify/alipay";
+
 
     public JSONObject preparepay(OrderPayVo orderPayVo) {
         if (null == orderPayVo) {
@@ -280,6 +280,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
                 SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
                 "UTF-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
+        String notifyUrl = weixinHost + "/service/payment/notify/alipay";
         orderPayVo.setNotifyUrl(notifyUrl);
         try {
             if (orderPayVo.getPayWay() == 2) { //支付宝APP支付
@@ -361,7 +362,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //选填字段，信用授权订单，针对信用全免订单，传入该值完结信用订单，形成芝麻履约记录
         // model.setExtraParam("{\"unfreezeBizInfo\":\"{\\\"bizComplete\\\":\\\"true\\\"}\"}");
         request.setBizModel(model);
-        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
+        request.setNotifyUrl("");//异步通知地址，必填，该接口只通过该参数进行异步通知
         AlipayFundAuthOrderUnfreezeResponse response = alipayClient.execute(request);
         log.info("response: {}" + response.getBody());
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -145,4 +145,7 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "购买价格")
 	private  BigDecimal buyPrice;
 
+	@Column(name = "status")
+	@ApiModelProperty(value = "状态 0--下架；1--上架")
+	private  Integer status;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -21,7 +21,7 @@ public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
 
-    @GetMapping(value = "/vehicleInfo/app/unauth/{id}")
+    @GetMapping(value = "/vehicleInfo/{id}")
     public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VModelDetailVO.java

 package com.xxfc.platform.vehicle.pojo;
 
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,4 +13,10 @@ import java.util.List;
 public class VModelDetailVO extends VehicleModel {
     @ApiModelProperty("类型列表")
     List<VehiclePlatCata> vehiclePlatCatas;
+
+    @ApiModelProperty("用户信息")
+    AppUserDTO appUserDTO;
+
+    @ApiModelProperty("会员列表")
+    List<BaseUserMemberLevel> userMemberLevel;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

@@ -26,6 +26,8 @@ public class VehicleModelQueryCondition {
     private String  takeALieTheNumber;
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
     @ApiModelProperty("分类逗号分割")
     String catasStr;
     @ApiModelProperty(value = "分类列表", hidden = true)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -83,7 +83,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     public static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
 
-    @RequestMapping(value = "/app/unauth/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -45,10 +46,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 @RestController
 @RequestMapping("vehicleModel")
 @Api(value = "车型controller", tags = {"车型操作接口"})
-public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> {
+public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> implements UserRestInterface {
 
     @Autowired
     private VehiclePlatCataBiz vehiclePlatCataBiz;
@@ -62,6 +65,11 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Autowired
     private UserFeign userFeign;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     @Autowired
     private UserAuthConfig userAuthConfig;
 
@@ -86,6 +94,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         VModelDetailVO vModelDetailVO = BeanUtil.toBean(vm, VModelDetailVO.class);
         vModelDetailVO.setVehiclePlatCatas(vehiclePlatCataBiz.getByModelId(vm.getId()));
+        vModelDetailVO.setAppUserDTO(getAppUser());
+        vModelDetailVO.setUserMemberLevel(userFeign.levels());
         return new ObjectRestResponse().data(vModelDetailVO);
     }
 
@@ -104,6 +114,10 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             vmqc.setIsDel(0);
         }
 
+        if (vmqc.getStatus()==null) {
+            vmqc.setStatus(SYS_TRUE);
+        }
+
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
@@ -117,7 +131,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
 
-
     /**
      * 添加车型
      *
@@ -265,7 +278,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         VehicleModel vm = new VehicleModel();
         vm.setId(id);
         vm.setIsdel(1);
-        vehicleModelBiz.updateById(vm);
+        vehicleModelBiz.updateSelectiveById(vm);
 
         //3.删除车型对应的标签
         VehicleCata vehicleCata = new VehicleCata();
@@ -299,27 +312,4 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return baseBiz.goodList(page,limit);
     }
 
-
-    /**
-     * 车型列表查
-     *
-     * @param vmqc 条件
-     * @return
-     */
-    @ApiOperation("车型列表")
-    @PostMapping(value = "/app/findVehicleModelPage")
-    public ObjectRestResponse<VehicleModelVo> findVehicleModelPage(
-            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ) {
-
-        if (vmqc.getIsDel()==null) {
-            vmqc.setIsDel(0);
-        }
-
-        if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
-            return ObjectRestResponse.createDefaultFail();
-        }
-        return vehicleModelBiz.findVehicleModelPage(vmqc);
-    }
-
-
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -382,6 +382,7 @@
 
         <include refid="searchUsableSql"/>
         and vm.id is not null
+        and vm.status = 1
         and bc.id is not null
         GROUP BY model_id, company_id
         <if test="lon != null and lat != null">, distance</if>
@@ -453,6 +454,7 @@
             <if test="zoneId !=null">
                 and bc2.zone_id = #{zoneId}
             </if>
+            and is_del != 1
         </where>
     </select>
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -17,6 +17,9 @@
       <if test="isDel !=null ">
           and isdel=#{isDel}
       </if>
+      <if test="status != null">
+          and status = #{status}
+      </if>
       <if test="vehicleName !=null and vehicleName !=''">
         AND  vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
       </if>