修改后台车型管理

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

@@ -226,7 +226,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         BeanUtilsBean.getInstance().copyProperties(baseUserMember, baseUserMemberVO);
 
         if (CollectionUtils.isEmpty(baseUserMembers)) {
-            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null) return;
+            if (baseUserMemberVO.getMemberLevel() == null || baseUserMember.getValidTime() == null||baseUserMember.getValidTime()<0) {
+                throw new BaseException("设置无效!无会员等级、会员有效期或会员有效期为负数!");
+            }
             baseUserMember.setCrtTime(System.currentTimeMillis());
             baseUserMember.setIsDel(0);
             baseUserMember.setPayCount(0);
@@ -236,14 +238,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
             baseUserMember.setBuyCount(buyCount + 1);
             insertSelective(baseUserMember);
             return;
-
         } else if (baseUserMembers.size() == 1) {
             baseUserMember.setUpdTime(System.currentTimeMillis());
             baseUserMember.setBuyCount(baseUserMembers.get(0).getBuyCount() + 1);
             baseUserMember.setId(baseUserMembers.get(0).getId());
             mapper.updateByPrimaryKeySelective(baseUserMember);
         } else {
-            throw new BaseException("Member purchase repeat!");
+            throw new BaseException("错误!该账号有多条会员信息!");
         }
 
 

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

@@ -148,4 +148,9 @@ public class VehicleModel implements Serializable {
 	@Column(name = "status")
 	@ApiModelProperty(value = "状态 0--下架；1--上架")
 	private  Integer status;
+
+
+	@Column(name = "cover_pic")
+	@ApiModelProperty(value = "封面图")
+	private String coverPic;
 }

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

@@ -168,4 +168,13 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+
+	@Column(name = "status")
+	@ApiModelProperty(value = "状态 0--下架；1--上架")
+	private String status;
+
+	@Column(name = "cover_pic")
+	@ApiModelProperty(value = "封面图")
+	private String coverPic;
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCataBiz.java

@@ -54,7 +54,7 @@ public class VehicleCataBiz extends BaseBiz<VehicleCataMapper, VehicleCata> {
     }
 
 
-    public void inserts(ArrayList<com.xxfc.platform.vehicle.entity.VehicleCata> vcs) {
+    public void inserts(ArrayList<VehicleCata> vcs) {
         mapper.addCataList(vcs);
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -475,7 +475,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param isMore
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse setIsore(Integer id, Integer isMore) {
         VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
         vehiclePlatCata.setId(id);

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

 package com.xxfc.platform.vehicle.rest;
 
 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;
@@ -9,38 +8,27 @@ 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;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
-import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import net.bytebuddy.implementation.bytecode.Throw;
 import org.apache.commons.lang.StringUtils;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.TransactionManagementConfigurationSelector;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
-import java.awt.print.Pageable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -48,6 +36,9 @@ import java.util.List;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
+/**
+ * @author Administrator
+ */
 @RestController
 @RequestMapping("vehicleModel")
 @Api(value = "车型controller", tags = {"车型操作接口"})
@@ -74,7 +65,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     private UserAuthConfig userAuthConfig;
 
 
-    //修改评分
+    /**
+     * 修改评分
+     */
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(
             @RequestParam(value = "id", defaultValue = "0") Integer id,
@@ -83,12 +76,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return RestResponse.suc();
     }
 
-    //订单
+    /**
+     * 订单
+     *
+     * @param id
+     * @return
+     */
     @ApiOperation("车型详情")
     @RequestMapping(value = "/app/unauth/detail/{id}", method = RequestMethod.GET)
     public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("id") @ApiParam("车型id") Integer id) {
         //查询车型信息，车型类型关系
-        //，公司信息，系统信息（购车须知，预定须知）
+        //公司信息，系统信息（购车须知，预定须知）
         VehicleModel vm = baseBiz.selectById(id);
         if (null == vm)
             throw new BaseException(ResultCode.NOTEXIST_CODE);
@@ -108,25 +106,20 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/unauth/findVehicleModelPage")
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(
-            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ,HttpServletRequest request) {
-
-        if (vmqc.getIsDel()==null) {
+            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc, HttpServletRequest request) {
+        if (vmqc.getIsDel() == null) {
             vmqc.setIsDel(0);
         }
-
-        if (vmqc.getStatus()==null) {
+        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();
         }
-
         //结合车型
         if (org.apache.commons.lang3.StringUtils.isNotBlank(vmqc.getCatasStr())) {
             vmqc.setCatas(vehiclePlatCataBiz.groupCatasByParent(vmqc.getCatasStr()));
         }
-
         return vehicleModelBiz.findVehicleModelPage(vmqc);
     }
 
@@ -145,18 +138,13 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (vm == null) {
             return ObjectRestResponse.createDefaultFail();
         }
-
         if (StringUtils.isBlank(vm.getName())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "无车名");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "车名不能为空");
         }
 
-        String token = request.getHeader("Authorization");
-        if (StringUtils.isBlank(token)) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "请登录");
-        }
         ObjectRestResponse<UserDTO> uorr = null;
         try {
-            uorr = userFeign.userinfoByToken(token);
+            uorr = userFeign.userinfoByToken(userAuthConfig.getToken(request));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -164,6 +152,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
         }
+
         String host = request.getRemoteHost();
         if (StringUtils.isBlank(host)) {
             return ObjectRestResponse.createDefaultFail();
@@ -175,6 +164,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setCrtTime(new Date());
         vm.setCrtHost(host);
         vm.setIsdel(0);
+        vm.setStatus(0);
         vm.setVioDeposit(BigDecimal.valueOf(500));
         try {
             //插入数据到车型并返回id
@@ -206,7 +196,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
 
     }
 
-
     @ApiOperation("修改")
     @PutMapping(value = "/app/update")
     @Transactional
@@ -232,15 +221,15 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setUpdUser(uorr.getData().getId());
         vm.setUpdHost(host);
         vm.setUpdTime(new Date());
-
-
         try {
             //修改车型
             vehicleModelBiz.updateByPrimaryKeySelective(vm);
             VehicleCata vcDelete = new VehicleCata();
+            if (vm.getId() != null) {
                 vcDelete.setVehicleModelId(vm.getId());
                 // 删除车型对应的标签
                 vehicleCataBiz.delete(vcDelete);
+
                 ArrayList<VehicleCata> vcs = new ArrayList<>();
                 //从新插入车型对应的标签
 //            获取cataid
@@ -253,7 +242,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                     vcs.add(vc);
                 }
                 vehicleCataBiz.inserts(vcs);
-
+            }
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
             e.printStackTrace();
@@ -270,8 +259,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Transactional
     public ObjectRestResponse<VehicleModel> remove(@PathVariable int id) {
 
-        if (id==1||id==14) {
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"The label cannot be deleted");
+        if (id == 1 || id == 14) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "The label cannot be deleted");
         }
 
         //2.进行逻辑删除
@@ -292,9 +281,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
 
 
     @ApiOperation("查询所有")
-    @RequestMapping(value = "/findAll",method = RequestMethod.GET)
+    @RequestMapping(value = "/findAll", method = RequestMethod.GET)
     @ResponseBody
-    public ObjectRestResponse findAll(){
+    public ObjectRestResponse findAll() {
         VehicleModel vehicleModel = new VehicleModel();
         vehicleModel.setIsdel(0);
         return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
@@ -302,14 +291,15 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
 
     /**
      * 优质车型
+     *
      * @param page
      * @param limit
      * @return
      */
     @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
-    public List<GoodDataVO> goodList(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit){
-        return baseBiz.goodList(page,limit);
+    public List<GoodDataVO> goodList(@RequestParam("page") Integer page, @RequestParam("limit") Integer limit) {
+        return baseBiz.goodList(page, limit);
     }
 
 }
\ No newline at end of file