commit

PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java

@@ -1927,16 +1927,15 @@ public class PddLocalController {
 
     /* 出库包裹查询 */
     @PostMapping("/MailDetailIoSelect")
-    public JSONObject MailDetailIoSelect(HttpServletRequest request, @RequestBody MailDetailIoSelectRequest mailDetailIoSelectRequest) {
+    public JSONObject MailDetailIoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailDetailIoSelectRequest) {
 
         String action = "FINISHOUTBOUND";
 
-        MailDetailIoSelectResponse mailDetailIoSelectResponse = logOrderMailDetailIoImpl.findInfoByMailNoAction(mailDetailIoSelectRequest.getMailNo(), action);
 
+        MailDetailIoSelectResponse mailDetailIoSelectResponse = logOrderMailDetailIoImpl.findInfoByMailNoAction(mailDetailIoSelectRequest.getMailNo(), action);
         if(mailDetailIoSelectResponse == null){
             return JsonResponse.generateLocalCommonFailedResponse("-1", "集运单信息不存在");
         }
-
         List<PackageDetailEntity> packageDetailList = packageDetailImpl.getByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
         CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
         List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.getListByOrderCode(mailDetailIoSelectResponse.getLogisticsOrderCode());
@@ -1945,10 +1944,11 @@ public class PddLocalController {
 
         Map<String, Object> map = new HashMap<>();
         map.put("mailDetail", mailDetailIoSelectResponse);
+        map.put("collectMailDetail", collectMailDetailEntityList);
         map.put("packageDetail", packageDetailList);
         map.put("collectOrder", collectOrderEntity);
         map.put("logOrder", logOrderEntity);
-        map.put(" logOrderMailDetail", logOrderMailDetailEntityList);
+        map.put("logOrderMailDetail", logOrderMailDetailEntityList);
         return JsonResponse.generateLocalCommonSuccessResponse(map, "");
     }
 
@@ -1995,6 +1995,7 @@ public class PddLocalController {
         map.put("logOrderMailDetail", logOrderMailDetailEntity);
         map.put("logOrder", logOrderEntity);
         map.put("unpackNotice", unpackNoticeEntity);
+        map.put("unpackMailDetail", unpackMailDetailEntity);
         map.put("collectOrder", collectOrderEntity);
         map.put("collectMailDetail", collectMailDetail);
         return JsonResponse.generateLocalCommonSuccessResponse(map, "");
@@ -2022,9 +2023,17 @@ public class PddLocalController {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "密码错误");
         }
 
+        Map<String, Object> result = new HashMap<>();
+        result.put("user", userEntity);
+        OnlineUserData onlineUserData = new OnlineUserData();
+        onlineUserData.setUserId(userEntity.getUid());
+        onlineUserData.setAccount(userEntity.getAccount());
+        onlineUserData.setName(userEntity.getName());
+        request.getSession().setAttribute(OnlineUserData.ONLINE_CLIENT_DATA,onlineUserData);
+
         request.getSession().setAttribute(userEntity.getUid(),userEntity);
 
-        return JsonResponse.generateLocalCommonSuccessResponse(userEntity, "");
+        return JsonResponse.generateLocalCommonSuccessResponse(result, "");
     }
 
     /* 账号列表 */
@@ -2078,8 +2087,8 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(userEntity,"修改成功");
     }
 
-//    @RequestMapping(value = "checkUser", method = RequestMethod.POST)
-//    public JSONObject checkUser(HttpServletRequest request) {
-//        return userImpl.checkUser(request);
-//    }
+    @RequestMapping(value = "checkUser", method = RequestMethod.POST)
+    public JSONObject checkUser(HttpServletRequest request) {
+        return userImpl.checkUser(request);
+    }
 }

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailIoMapper.java

@@ -2,6 +2,7 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
 import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
@@ -25,6 +26,6 @@ public interface LogOrderMailDetailIoMapper extends BaseMapper<LogOrderMailDetai
     @Select("SELECT `uid`, `created`,`status`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action` FROM `log_order_mail_detail_io` WHERE `mailNo` = #{mailNo} AND `status` = 60 AND `action` = 'FINISHOUTBOUND';")
     LogOrderMailDetailIoEntity findOutboundByMailNo(String mailNo);
 
-    @Select("SELECT `uid`, `created`, `updated`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action` FROM `log_order_mail_detail_io` WHERE `mailNo` = #{mailNo} AND `action` = #{action}")
-    MailDetailIoSelectResponse findInfoByMailNoAction(String mailNo, String action);
+    @Select("SELECT `uid`, `created`, `updated`, `logisticsOrderCode`, `expressCode`, `action` FROM `log_order_mail_detail_io` WHERE `mailNo` = #{mailNo} AND `action` = #{action}")
+    MailDetailIoSelectResponse findInfoByMailNoAction(@Param("mailNo") String mailNo, @Param("action") String action);
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/MailDetailIoSelectRequest.java

@@ -2,12 +2,17 @@ package org.ta.pddserver.model.api.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.ta.pddserver.model.common.PageTool;
 
 @Data
 public class MailDetailIoSelectRequest {
 
+    @Schema(
+            description = "搜索运单号，模糊搜索",
+            example = "PC123456",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+
     private String mailNo;
 
-    private String action;
 }

PddServer/src/main/java/org/ta/pddserver/service/impl/UserImpl.java

@@ -13,6 +13,8 @@ import org.ta.pddserver.model.api.request.UserRequest;
 import org.ta.pddserver.model.api.response.LogOrderListResponse;
 import org.ta.pddserver.model.api.response.UserListResponse;
 import org.ta.pddserver.service.UserService;
+import org.ta.pddserver.utils.JsonResponse;
+import org.ta.pddserver.utils.OnlineUserData;
 
 import java.util.HashMap;
 import java.util.List;
@@ -38,7 +40,19 @@ public class UserImpl extends ServiceImpl<UserMapper, UserEntity> implements Use
         return map;
     }
 
-//    public JSONObject checkUser(HttpServletRequest request) {
-//        UserEntity userEntity=this.getOne(this.getUserIDFromOnlineData(request));
-//    }
+    public JSONObject checkUser(HttpServletRequest request) {
+        UserEntity userEntity=baseMapper.selectById(this.getUserIDFromOnlineData(request));
+        Map<String, Object> result = new HashMap<>();
+        result.put("user",userEntity);
+        return JsonResponse.generateLocalCommonSuccessResponse(result,"");
+    }
+
+
+    protected String getUserIDFromOnlineData(HttpServletRequest request) {
+        OnlineUserData onlineUserData = (OnlineUserData) request.getSession().getAttribute(OnlineUserData.ONLINE_CLIENT_DATA);
+        if (onlineUserData == null) {
+            return null;
+        }
+        return onlineUserData.getUserId();
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/utils/OnlineUserData.java

+package org.ta.pddserver.utils;
+
+import java.io.Serializable;
+
+public class OnlineUserData implements Serializable {
+    public static final String ONLINE_CLIENT_DATA = "REGISTER-COMPANY-DATA";
+
+    private String userId; // 操作用户父级id
+
+    private String account; // 操作用户父级id
+
+    private String name; // 操作用户父级id
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}