订单新增修改

1ec97a76 · 郑云飞 · 3f38e33f · 1ec97a76 · 1ec97a76 · 1ec97a76
Commit 1ec97a76 authored Mar 15, 2023 by 郑云飞
9 changed files
--- a/yongqi-xinrenli/pom.xml
+++ b/yongqi-xinrenli/pom.xml
@@ -9,7 +9,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
-    <artifactId>xinrenli</artifactId>
+    <artifactId>yongqi-xinrenli</artifactId>
    <description>
        新人力

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
@@ -64,7 +64,9 @@ public class DbOrderController extends BaseController {
    @SaCheckPermission("xinrenli:order:MyNeeds")
    @GetMapping("/MyNeeds")
    public TableDataInfo<DbOrderVo> MyNeeds(DbOrderBo bo, PageQuery pageQuery) {
-        LoginUser loginUser = getLoginUser();
+//        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = new LoginUser();
+        loginUser.setUserId(1L);
        return iDbOrderService.myNeeds(bo, pageQuery, loginUser);
    }
@@ -87,7 +89,7 @@ public class DbOrderController extends BaseController {
    @SaCheckPermission("xinrenli:order:query")
    @GetMapping("/")
    public R<DbOrderVo> getInfo(@NotNull(message = "主键不能为空")
-                                @RequestParam Long id) {
+                                @RequestParam("id") Long id) {
        return R.ok(iDbOrderService.queryById(id));
    }
@@ -99,7 +101,10 @@ public class DbOrderController extends BaseController {
    @RepeatSubmit()
    @PostMapping()
    public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
-        return toAjax(iDbOrderService.insertByBo(bo));
+        //        LoginUser loginUser = getLoginUser();
+        LoginUser user = new LoginUser();
+        user.setUserId(1L);
+        return toAjax(iDbOrderService.insertByBo(bo,user));
    }
    /**
@@ -110,17 +115,20 @@ public class DbOrderController extends BaseController {
    @RepeatSubmit()
    @PutMapping()
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbOrderBo bo) {
-        return toAjax(iDbOrderService.updateByBo(bo));
+//        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = new LoginUser();
+        loginUser.setUserId(1L);
+        return toAjax(iDbOrderService.updateByBo(bo,loginUser));
    }
    /**
-     * 删除订单
+     * 取消订单
     *
     * @param ids 主键串
     */
    @SaCheckPermission("xinrenli:order:remove")
    @Log(title = "订单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/")
+    @DeleteMapping("/remove")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @RequestParam Long[] ids) {
        return toAjax(iDbOrderService.deleteWithValidByIds(Arrays.asList(ids), true));

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java
@@ -71,7 +71,7 @@ public class DbOrder {
    /**
     * 创建时间
     */
-    private String createTime;
+    private Date createTime;
    /**
     * 修改人
     */

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbFileBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbFileBo.java
@@ -25,13 +25,13 @@ public class DbFileBo extends BaseEntity {
    /**
     * 主键id
     */
-    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
+//    @NotNull(message = "主键id不能为空", groups = {EditGroup.class})
    private Long id;
    /**
     * 业务类型
     */
-    @NotBlank(message = "业务类型不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotBlank(message = "业务类型不能为空", groups = {AddGroup.class, EditGroup.class})
    private String serviceType;
    /**

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
@@ -91,6 +91,11 @@ public class DbOrderBo extends BaseEntity {
    private Integer status;
    /**
+     * 驳回理由
+     */
+    private String reasonsForRejection;
+    /**
     * 创建人
     */
    private String createUser;
@@ -106,11 +111,14 @@ public class DbOrderBo extends BaseEntity {
    private Date modifyTime;
    /**
-     * 删除状态  0：未删除 1：删除
+     * 删除状态  0：未取消  1:已取消
     */
    private Integer deleteStatus;
-//    @NotNull(message = "删除状态  0：未删除 1：删除不能为空", groups = {AddGroup.class, EditGroup.class})
+    /**
+     * 文件列表
+     */
+    @NotBlank(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
    private List<DbFileBo> fileBoList;

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/enums/DeleteStatusEnum.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/enums/DeleteStatusEnum.java
@@ -8,17 +8,17 @@ import lombok.Getter;
 * @date 2023/3/14
 */
 public enum DeleteStatusEnum {
-    OK("0", "正常"), DELETED("1", "删除");
+    OK(0, "正常"), DELETED(1, "删除");
-    private final String code;
+    private final Integer code;
    private final String info;
-    DeleteStatusEnum(String code, String info) {
+    DeleteStatusEnum(Integer code, String info) {
        this.code = code;
        this.info = info;
    }
-    public String getCode() {
+    public Integer getCode() {
        return code;
    }

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/enums/FileEnumServiceType.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/enums/FileEnumServiceType.java
@@ -12,7 +12,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum FileEnumServiceType {
-    ORDER("order"), DISABLE("停用"), DELETED("删除");
+    ORDER("order"), ARTICLE("wenzhang"), DELETED("删除");
    private final String serviceTyp;

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java
@@ -35,12 +35,12 @@ public interface IDbOrderService {
    /**
     * 新增订单
     */
-    Boolean insertByBo(DbOrderBo bo);
+    Boolean insertByBo(DbOrderBo bo, LoginUser user);
    /**
     * 修改订单
     */
-    Boolean updateByBo(DbOrderBo bo);
+    Boolean updateByBo(DbOrderBo bo, LoginUser loginUser);
    /**
     * 校验并批量删除订单信息

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
@@ -10,10 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yongqi.xinrenli.domain.DbFile;
+import com.yongqi.xinrenli.domain.bo.DbFileBo;
 import com.yongqi.xinrenli.domain.vo.DbFileVo;
 import com.yongqi.xinrenli.enums.DeleteStatusEnum;
 import com.yongqi.xinrenli.enums.FileEnumServiceType;
 import com.yongqi.xinrenli.mapper.DbFileMapper;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.yongqi.xinrenli.domain.bo.DbOrderBo;
@@ -21,12 +23,10 @@ import com.yongqi.xinrenli.domain.vo.DbOrderVo;
 import com.yongqi.xinrenli.domain.DbOrder;
 import com.yongqi.xinrenli.mapper.DbOrderMapper;
 import com.yongqi.xinrenli.service.IDbOrderService;
+import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
 /**
 * 订单Service业务层处理
@@ -96,12 +96,23 @@ public class DbOrderServiceImpl implements IDbOrderService {
     * 新增订单
     */
    @Override
-    public Boolean insertByBo(DbOrderBo bo) {
+    @Transactional
+    public Boolean insertByBo(DbOrderBo bo, LoginUser user) {
        DbOrder add = BeanUtil.toBean(bo, DbOrder.class);
-        validEntityBeforeSave(add);
+        validEntityBeforeSave(add, user);
+        add.setUserId(user.getUserId());
+        add.setCreateTime(new Date());
+        add.setCreateUser(user.getUserId().toString());
        boolean flag = baseMapper.insert(add) > 0;
        if (flag) {
            bo.setId(add.getId());
+            List<DbFile> files = BeanUtil.copyToList(bo.getFileBoList(), DbFile.class);
+            files.forEach(file->{
+                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+                file.setServiceId(add.getId());
+                file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
+            });
+            fileMapper.insertBatch(files);
        }
        return flag;
    }
@@ -110,17 +121,37 @@ public class DbOrderServiceImpl implements IDbOrderService {
     * 修改订单
     */
    @Override
-    public Boolean updateByBo(DbOrderBo bo) {
+    @Transactional
+    public Boolean updateByBo(DbOrderBo bo, LoginUser user) {
        DbOrder update = BeanUtil.toBean(bo, DbOrder.class);
-        validEntityBeforeSave(update);
+        validEntityBeforeSave(update, user);
-        return baseMapper.updateById(update) > 0;
+        update.setModifyTime(new Date());
+        update.setModifyTime(new Date());
+        update.setModifyUser(user.getUserId().toString());
+        boolean modify = baseMapper.updateById(update) > 0;
+        if (modify) {
+            fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
+                .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
+                .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
+                .eq(DbFile::getServiceId, update.getId())
+            );
+            List<DbFile> files = BeanUtil.copyToList(bo.getFileBoList(), DbFile.class);
+            files.forEach(file -> {
+                file.setServiceId(update.getId());
+                file.setServiceType(FileEnumServiceType.ORDER.getServiceTyp());
+                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+            });
+            fileMapper.insertBatch(files);
+        }
+        return false;
    }
    /**
     * 保存前的数据校验
     */
-    private void validEntityBeforeSave(DbOrder entity) {
+    private void validEntityBeforeSave(DbOrder entity, LoginUser user) {
-        //TODO 做一些数据校验,如唯一约束
    }
    /**