下单流程

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java

@@ -6,7 +6,10 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.oms.entity.bo.OmsCheckParam;
+import com.qs.serve.modules.oms.entity.bo.OmsUrgentParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -16,6 +19,7 @@ import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.oms.service.OmsOrderService;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -32,7 +36,7 @@ public class OmsOrderController {
     private OmsOrderService omsOrderService;
 
     /**
-     * 翻页查询
+     * 翻页
      * @param param
      * @return
      */
@@ -46,7 +50,7 @@ public class OmsOrderController {
     }
 
     /**
-     * 根据ID查询
+     * ID查询
      * @param id
      * @return
      */
@@ -58,46 +62,64 @@ public class OmsOrderController {
         return R.ok(omsOrder);
     }
 
-
-
     /**
-     * 根据ID更新
+     * 审核
      * @param param
      * @return
      */
-    @PostMapping("/updateById")
+    @PostMapping("/check")
     @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.UPDATE)
     @PreAuthorize("hasRole('oms:order:update')")
-    public R<?> updateById(@RequestBody @Valid OmsOrder param){
+    public R<?> check(@RequestBody @Valid OmsCheckParam param){
-        boolean result = omsOrderService.updateById(param);
+        OmsOrder dbOmsOrder = omsOrderService.getById(param.getOrderId());
-        return R.isTrue(result);
+        if(dbOmsOrder.getStatus().equals(0)){
+            OmsOrder omsOrder = new OmsOrder();
+            omsOrder.setId(param.getOrderId());
+            omsOrder.setCheckState(param.getCheckSate().equals(1)?1:2);
+            omsOrder.setCheckTime(LocalDateTime.now());
+            omsOrder.setCheckUserId(AuthContextUtils.getSysUserId());
+            omsOrderService.updateById(omsOrder);
+            return R.ok();
+        }
+        return R.error("已完成的订单无法修改");
     }
 
     /**
-    * 新增订单
+     * 设置加急
      * @param param
      * @return
      */
-    @PostMapping("/save")
+    @PostMapping("/urgent")
-    @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.INSERT)
+    @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.UPDATE)
-    @PreAuthorize("hasRole('oms:order:insert')")
+    @PreAuthorize("hasRole('oms:order:update')")
-    public R<?> save(@RequestBody @Valid OmsOrder param){
+    public R<?> urgent(@RequestBody @Valid OmsUrgentParam param){
-        boolean result = omsOrderService.save(param);
+        OmsOrder dbOmsOrder = omsOrderService.getById(param.getOrderId());
-        return R.isTrue(result);
+        if(dbOmsOrder.getStatus().equals(0)){
+            OmsOrder omsOrder = new OmsOrder();
+            omsOrder.setId(param.getOrderId());
+            omsOrder.setUrgentFlag(param.getUrgentSate().equals(1)?1:0);
+            omsOrderService.updateById(omsOrder);
+            return R.ok();
+        }
+        return R.error("已完成的订单无法修改");
     }
 
     /**
-     * 删除订单
+     * 删除
      * @param id
      * @return
      */
     @DeleteMapping("/deleteById/{id}")
     @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.DELETE)
     @PreAuthorize("hasRole('oms:order:delete')")
-    public R<?> deleteById(@PathVariable("id") String id){
+    public R<?> deleteById(@PathVariable("id") Long id){
+        OmsOrder dbOmsOrder = omsOrderService.getById(id);
+        if(dbOmsOrder.getStatus().equals(0)&&dbOmsOrder.getCheckState().equals(0)){
             boolean result = omsOrderService.removeById(id);
             return R.isTrue(result);
         }
+        return R.error("当前状态无法删除");
+    }
 
 }
 

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -48,7 +48,7 @@ public class OmsOrderApi {
 
     /**
      * 创建订单
-     * @param createOrderBo
+     * @param omsOrderBo
      * @return
      */
     @PostMapping("/createOrder")

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsCheckParam.java

@@ -0,0 +1,26 @@
+package com.qs.serve.modules.oms.entity.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author YenHex
+ * @since 2022/10/27
+ */
+@Data
+public class OmsCheckParam {
+
+    /**
+     * 订单ID
+     */
+    @NotNull
+    private Long orderId;
+
+    /**
+     * 审核状态：1->通过；2->拒绝
+     */
+    @NotNull
+    private Integer checkSate;
+
+}

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsUrgentParam.java

@@ -0,0 +1,26 @@
+package com.qs.serve.modules.oms.entity.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author YenHex
+ * @since 2022/10/27
+ */
+@Data
+public class OmsUrgentParam {
+
+    /**
+     * 订单ID
+     */
+    @NotNull
+    private Long orderId;
+
+    /**
+     * 是否加急：1->是；2->否
+     */
+    @NotNull
+    private Integer urgentSate;
+
+}