feat(bagDelivery): 存取包归还测试

src/main/java/com/dlbridge/jadp/config/web/GlobalExceptionHandler.java

+package com.dlbridge.jadp.config.web;
+
+import com.dlbridge.jadp.common.web.Result;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.Objects;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Result<?> handleValidException(MethodArgumentNotValidException e) {
+        String msg = Objects.requireNonNull(e.getBindingResult()
+                        .getFieldError())
+                .getDefaultMessage();
+        return Result.fail(msg);
+    }
+}

src/main/java/com/dlbridge/jadp/plugins/partner/bean/BagDelivery.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.sql.Date;
 
 

src/main/java/com/dlbridge/jadp/plugins/partner/controller/BagDeliveryController.java

@@ -77,8 +77,7 @@ public class BagDeliveryController {
      * @param bagDelivery 赛包归还信息
      * @return 赛包归还结果
      */
-    @ResponseBody
-    @RequestMapping(value = "/bag-return", method = RequestMethod.POST)
+    @PostMapping("/bag-return")
     public Result<?> bagReturn(@RequestBody BagDelivery bagDelivery) {
         return bagDeliveryService.bagReturn(bagDelivery);
     }

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.java

@@ -50,4 +50,6 @@ public interface BagDeliveryMapper {
      * @return 存包数量
      */
     Integer selectBagCountByPId(Integer status, Integer id);
+
+    BagDelivery selectBagDelivery(String id);
 }

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.xml

@@ -209,5 +209,8 @@
           AND a.storage_point = #{id}
           AND a.service_type = 2
     </select>
+    <select id="selectBagDelivery" resultType="com.dlbridge.jadp.plugins.partner.bean.BagDelivery">
+        select * from bag_delivery a where a.del_flag=0 and a.id = #{id} limit 1
+    </select>
 
 </mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/partner/service/BagDeliveryService.java

@@ -166,28 +166,40 @@ public class BagDeliveryService {
      * @return
      */
     public Result bagReturn(BagDelivery bagDelivery) {
-        if(bagDelivery.getCmptId() == null){
-            Result.fail().setMsg("赛事ID不能为空");
-        }
-        if(StringUtils.isBlank(bagDelivery.getMarkNo())){
-            Result.fail().setMsg("参赛号不能为空");
-        }
-        int enrollCount = bagDeliveryMapper.enrollCheck(bagDelivery.getCmptId(), bagDelivery.getMarkNo());
-        if(enrollCount == 0){
-            return Result.fail().setMsg("未查询到参赛信息");
-        }
 
-        BagParam param = new BagParam();
-        param.setCmptId(bagDelivery.getCmptId());
-        param.setMarkNo(bagDelivery.getMarkNo());
-        List<BagDelivery> deliveries = bagDeliveryMapper.queryBagDelivery(param);
-        if(deliveries == null || deliveries.isEmpty()){
-            return Result.fail().setMsg("未查询到寄存信息");
+        // if(bagDelivery.getCmptId() == null){
+        //     Result.fail().setMsg("赛事ID不能为空");
+        // }
+        // if(StringUtils.isBlank(bagDelivery.getMarkNo())){
+        //     Result.fail().setMsg("参赛号不能为空");
+        // }
+        // if(StringUtils.isBlank(bagDelivery.getMarkNo())){
+        //     Result.fail().setMsg("参赛号不能为空");
+        // }
+        // int enrollCount = bagDeliveryMapper.enrollCheck(bagDelivery.getCmptId(), bagDelivery.getMarkNo());
+        // if(enrollCount == 0){
+        //     return Result.fail().setMsg("未查询到参赛信息");
+        // }
+
+        // BagParam param = new BagParam();
+        // param.setCmptId(bagDelivery.getCmptId());
+        // param.setMarkNo(bagDelivery.getMarkNo());
+        // List<BagDelivery> deliveries = bagDeliveryMapper.queryBagDelivery(param);
+        // if(deliveries == null || deliveries.isEmpty()){
+        //     return Result.fail().setMsg("未查询到寄存信息");
+        // }
+        // // 归还状态
+        // bagDelivery.setId(deliveries.get(0).getId());
+        // bagDelivery.setStatus(3);
+        if(bagDelivery.getId() == null){
+            Result.fail().setMsg("ID不能为空");
         }
-        // 归还状态
-        bagDelivery.setId(deliveries.get(0).getId());
-        bagDelivery.setStatus(3);
-        bagDeliveryMapper.updateBagDelivery(bagDelivery);
+        BagDelivery bag = bagDeliveryMapper.selectBagDelivery(bagDelivery.getId());
+        if(bag == null){
+           return Result.fail().setMsg("未查询到寄存信息");
+        }
+        bag.setStatus(3);
+        bagDeliveryMapper.updateBagDelivery(bag);
         return Result.success();
     }