添加特惠租车

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

@@ -239,4 +239,8 @@ public class SpecialRent implements Serializable {
 	@Column(name = "category_name")
 	@ApiModelProperty("型号名称")
 	private String categoryName;
+
+	@Column(name = "is_del")
+	private Integer isDel;
+
 }

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

@@ -138,6 +138,8 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
         }
 
         specialRent.setPublishUserId(userDTO.getId());
+        specialRent.setCrtUser(userDTO.getId().toString());
+        specialRent.setUpdUser(userDTO.getId().toString());
         specialRent.setStatus(STATUS_CRT);
 
         RentVehicleBO detail = new RentVehicleBO();

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

@@ -29,6 +29,8 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.order.entity.SpecialRent.STATUS_CRT;
 
 @RestController
@@ -95,6 +97,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         baseBiz.updateSelectiveById(new SpecialRent(){{
             setId(specialRentDB.getId());
             setStatus(SpecialRent.STATUS_CNL);
+            setUpdUser(userDTO.getId().toString());
         }});
 
         return ObjectRestResponse.succ();
@@ -109,7 +112,6 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         if (StrUtil.isBlank(getCurrentUserId())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
-        dto.setUserId(getCurrentUserIdInt());
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andEqualTo(SpecialRent::getStatus, STATUS_CRT);
@@ -119,7 +121,26 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         return ObjectRestResponse.succ(pages);
     }
 
-    @RequestMapping(value = "/appBusiness/specialOrder", method = RequestMethod.POST)
+    @RequestMapping(value = "/appBusiness/myList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "分页查询我发布的特惠租车")
+    public ObjectRestResponse<SpecialRentVO> myList(QueryDTO dto) {
+        //查询列表数据
+        if (StrUtil.isBlank(getCurrentUserId())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+        UserDTO userDTO = getBusinessUserByAppUser();
+        Query query = new Query(dto);
+        PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
+            w.andEqualTo(SpecialRent::getIsDel, SYS_FALSE);
+            w.andEqualTo(SpecialRent::getPublishUserId, userDTO.getId());
+            return w;
+        }, " crt_time desc "), SpecialRentVO.class);
+
+        return ObjectRestResponse.succ(pages);
+    }
+
+    @RequestMapping(value = "/app/specialOrder", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "特惠租车下单")
     public ObjectRestResponse specialOrder(@RequestBody SpecialOrderDTO dto) {