Skip to content

X
xinrenli
Commit f24e8652 by wanglei
Options

new

parent abd58c85
Showing with 214 additions and 29 deletions
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
...@@ -11,7 +11,7 @@ import org.springframework.context.annotation.ComponentScan; ...@@ -11,7 +11,7 @@ import org.springframework.context.annotation.ComponentScan;
* *
* @author ruoyi * @author ruoyi
*/ */
@MapperScan({ "com.ruoyi.*", "com.yongqi.*" })
@ComponentScan({ "com.ruoyi.*", "com.yongqi.*" }) @ComponentScan({ "com.ruoyi.*", "com.yongqi.*" })
@SpringBootApplication @SpringBootApplication
public class RuoYiApplication { public class RuoYiApplication {
......
xinrenli/src/main/java/com/yongqi/xinrenli/admin/controller/OrderController.java
package com.yongqi.xinrenli.admin.controller; package com.yongqi.xinrenli.admin.controller;
import org.springframework.web.bind.annotation.PostMapping; import com.ruoyi.common.core.domain.R;
import org.springframework.web.bind.annotation.RequestMapping; import com.yongqi.xinrenli.domain.Order;
import com.yongqi.xinrenli.service.IOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/** /**
* <p> * <p>
...@@ -18,9 +19,28 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,9 +19,28 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/order") @RequestMapping("/order")
public class OrderController { public class OrderController {
@PostMapping("/test")
@Autowired
IOrderService iOrderService;
/**
* 用户发布需求订单
* @param order
* @return
*/
@ResponseBody @ResponseBody
public String publishOrder(){ @PostMapping("/{order}")
return "test"; public R publishOrder(@PathVariable Order order){
if(iOrderService.isParamEmpty(order)){
return R.fail("信息未填完整");
}
if(iOrderService.isAllEmpty(order)){
return R.fail("图片，视频，语音必传一项");
}
boolean flag = iOrderService.save(order);
if (!flag) {
return R.fail("发布失败，请稍后重试");
}
return R.ok("发布成功");
} }
} }
xinrenli/src/main/java/com/yongqi/xinrenli/domain/Article.java
package com.yongqi.xinrenli.domain; package com.yongqi.xinrenli.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
...@@ -49,5 +47,25 @@ public class Article implements Serializable { ...@@ -49,5 +47,25 @@ public class Article implements Serializable {
@TableField("image_src") @TableField("image_src")
private String imageSrc; private String imageSrc;
@Schema(name = "创建人")
@TableField("create_user")
private String createUser;
@Schema(name = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@Schema(name = "修改人")
@TableField("update_user")
private String updateUser;
@Schema(name = "修改时间")
@TableField("update_time")
private LocalDateTime updateTime;
@Schema(name = "删除状态")
@TableField("delete_status")
@TableLogic(value = "0",delval = "1")
private Integer delStatus;
} }
xinrenli/src/main/java/com/yongqi/xinrenli/domain/Coupon.java
package com.yongqi.xinrenli.domain; package com.yongqi.xinrenli.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -57,5 +54,26 @@ public class Coupon implements Serializable { ...@@ -57,5 +54,26 @@ public class Coupon implements Serializable {
@TableField("failure_time") @TableField("failure_time")
private LocalDateTime failureTime; private LocalDateTime failureTime;
@Schema(name = "创建人")
@TableField("create_user")
private String createUser;
@Schema(name = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@Schema(name = "修改人")
@TableField("update_user")
private String updateUser;
@Schema(name = "修改时间")
@TableField("update_time")
private LocalDateTime updateTime;
@Schema(name = "删除状态")
@TableField("delete_status")
@TableLogic(value = "0",delval = "1")
private Integer delStatus;
} }
xinrenli/src/main/java/com/yongqi/xinrenli/domain/Order.java
package com.yongqi.xinrenli.domain; package com.yongqi.xinrenli.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.apache.ibatis.annotations.Delete;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -78,9 +76,30 @@ public class Order implements Serializable { ...@@ -78,9 +76,30 @@ public class Order implements Serializable {
@TableField("remark") @TableField("remark")
private String remark; private String remark;
@Schema(name = "订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 退款中；5 已退款") @Schema(name = "订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 已完成；5 退款中；6 已退款")
@TableField("status") @TableField("status")
private Integer status; private Integer status;
@Schema(name = "创建人")
@TableField("create_user")
private String createUser;
@Schema(name = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@Schema(name = "修改人")
@TableField("update_user")
private String updateUser;
@Schema(name = "修改时间")
@TableField("update_time")
private LocalDateTime updateTime;
@Schema(name = "删除状态")
@TableField("delete_status")
@TableLogic(value = "0",delval = "1")
private Integer delStatus;
} }
xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserComment.java
package com.yongqi.xinrenli.domain; package com.yongqi.xinrenli.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
...@@ -45,6 +43,27 @@ public class UserComment implements Serializable { ...@@ -45,6 +43,27 @@ public class UserComment implements Serializable {
@TableField("content") @TableField("content")
private String content; private String content;
@Schema(name = "创建人")
@TableField("create_user")
private String createUser;
@Schema(name = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@Schema(name = "修改人")
@TableField("update_user")
private String updateUser;
@Schema(name = "修改时间")
@TableField("update_time")
private LocalDateTime updateTime;
@Schema(name = "删除状态")
@TableField("delete_status")
@TableLogic(value = "0",delval = "1")
private Integer delStatus;
} }
xinrenli/src/main/java/com/yongqi/xinrenli/domain/UserFeedback.java
package com.yongqi.xinrenli.domain; package com.yongqi.xinrenli.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
...@@ -45,5 +43,26 @@ public class UserFeedback implements Serializable { ...@@ -45,5 +43,26 @@ public class UserFeedback implements Serializable {
@TableField("content") @TableField("content")
private String content; private String content;
@Schema(name = "创建人")
@TableField("create_user")
private String createUser;
@Schema(name = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@Schema(name = "修改人")
@TableField("update_user")
private String updateUser;
@Schema(name = "修改时间")
@TableField("update_time")
private LocalDateTime updateTime;
@Schema(name = "删除状态")
@TableField("delete_status")
@TableLogic(value = "0",delval = "1")
private Integer delStatus;
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/ArticleMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.Article; import com.yongqi.xinrenli.domain.Article;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface ArticleMapper extends BaseMapper<Article> { public interface ArticleMapper extends BaseMapper<Article> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/CouponMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.Coupon; import com.yongqi.xinrenli.domain.Coupon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface CouponMapper extends BaseMapper<Coupon> { public interface CouponMapper extends BaseMapper<Coupon> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/OrderMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.Order; import com.yongqi.xinrenli.domain.Order;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface OrderMapper extends BaseMapper<Order> { public interface OrderMapper extends BaseMapper<Order> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/UserCommentMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.UserComment; import com.yongqi.xinrenli.domain.UserComment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface UserCommentMapper extends BaseMapper<UserComment> { public interface UserCommentMapper extends BaseMapper<UserComment> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/UserFeedbackMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.UserFeedback; import com.yongqi.xinrenli.domain.UserFeedback;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface UserFeedbackMapper extends BaseMapper<UserFeedback> { public interface UserFeedbackMapper extends BaseMapper<UserFeedback> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/mapper/WxUserMapper.java
...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper; ...@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.mapper;
import com.yongqi.xinrenli.domain.WxUser; import com.yongqi.xinrenli.domain.WxUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* <p> * <p>
...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author wanglei * @author wanglei
* @since 2023-03-02 * @since 2023-03-02
*/ */
@Mapper
public interface WxUserMapper extends BaseMapper<WxUser> { public interface WxUserMapper extends BaseMapper<WxUser> {
} }
xinrenli/src/main/java/com/yongqi/xinrenli/service/IOrderService.java
...@@ -13,4 +13,25 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -13,4 +13,25 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IOrderService extends IService<Order> { public interface IOrderService extends IService<Order> {
/**
* 新增用户需求订单
* @param order
* @return
*/
boolean addOrder(Order order);
/**
* 判断返回参是否为空
* @param order
* @return
*/
boolean isAllEmpty(Order order);
/**
* 判断上传图片 视频 语音是否都为空
* @param order
* @return
*/
boolean isParamEmpty(Order order);
} }
xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/OrderServiceImpl.java
...@@ -4,6 +4,7 @@ import com.yongqi.xinrenli.domain.Order; ...@@ -4,6 +4,7 @@ import com.yongqi.xinrenli.domain.Order;
import com.yongqi.xinrenli.mapper.OrderMapper; import com.yongqi.xinrenli.mapper.OrderMapper;
import com.yongqi.xinrenli.service.IOrderService; import com.yongqi.xinrenli.service.IOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -17,4 +18,41 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +18,41 @@ import org.springframework.stereotype.Service;
@Service @Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService { public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
@Autowired
OrderMapper orderMapper;
@Override
public boolean addOrder(Order order) {
orderMapper.insert(order);
return false;
}
@Override
public boolean isParamEmpty(Order order) {
if (order.getTitle() != null || order.getLinkman() != null || order.getPhone() != null || order.getRepairTime() != null || order.getRepairAddress() != null || order.getBudget() != null) {
return false;
}
return true;
}
@Override
public boolean isAllEmpty(Order order) {
int flag = 0;
if (order.getImageSrc() != null) {
flag++;
}
if (order.getVideoSrc() != null) {
flag++;
}
if (order.getAudioSrc() != null) {
flag++;
}
if (flag > 0) {
return false;
}
return true;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment