项目完善

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

@@ -12,12 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.ta.pddserver.entity.CollectOrderSendEntity;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
 import org.ta.pddserver.entity.CollectReceiverDetailEntity;
-import org.ta.pddserver.entity.LogOrderEntity;
-import org.ta.pddserver.entity.LogOrderIoEntity;
-import org.ta.pddserver.entity.LogOrderMailDetailEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
 import org.ta.pddserver.model.api.request.*;
-import org.ta.pddserver.model.api.response.LogOrderListResponse;
-import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
 import org.ta.pddserver.model.api.response.MailNoResponse;
 import org.ta.pddserver.model.pddjy.request.*;
 import org.ta.pddserver.service.impl.*;
@@ -28,7 +24,6 @@ import org.ta.pddserver.utils.TimeTool;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 @Slf4j
 @RestController
@@ -51,7 +46,7 @@ public class PddLocalController {
     CollectOrderSendImpl  collectOrderSendImpl;
 
     @Resource
-    LogOrderIoImpl logOrderIoImpl;
+    LogOrderMailDetailIoImpl logOrderMailDetailIo;
 
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
@@ -86,7 +81,7 @@ public class PddLocalController {
     public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
         MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus());
 
-        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+        LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
         ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
         ioEntity.setExpressCode(mailNoResponse.getExpressCode());
         ioEntity.setMailNo(mailNoResponse.getMailNo());
@@ -137,7 +132,7 @@ public class PddLocalController {
 
         ioEntity.setReq(JSON.toJSONString(requestModel));
         ioEntity.setResp(resp);
-        logOrderIoImpl.save(ioEntity);
+        logOrderMailDetailIo.save(ioEntity);
     }
 
     /*入库*/
@@ -145,7 +140,7 @@ public class PddLocalController {
     public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
         MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus());
 
-        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+        LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
         ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
         ioEntity.setExpressCode(mailNoResponse.getExpressCode());
         ioEntity.setMailNo(mailNoResponse.getMailNo());
@@ -196,7 +191,7 @@ public class PddLocalController {
 
         ioEntity.setReq(JSON.toJSONString(requestModel));
         ioEntity.setResp(resp);
-        logOrderIoImpl.save(ioEntity);
+        logOrderMailDetailIo.save(ioEntity);
     }
 
     /*收到拆包通知后 完成拆包*/
@@ -204,7 +199,7 @@ public class PddLocalController {
     public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
         MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus());
 
-        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+        LogOrderMailDetailIoEntity ioEntity = new LogOrderMailDetailIoEntity();
         ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
         ioEntity.setExpressCode(mailNoResponse.getExpressCode());
         ioEntity.setMailNo(mailNoResponse.getMailNo());
@@ -260,7 +255,7 @@ public class PddLocalController {
 
         ioEntity.setReq(JSON.toJSONString(requestModel));
         ioEntity.setResp(resp);
-        logOrderIoImpl.save(ioEntity);
+        logOrderMailDetailIo.save(ioEntity);
     }
 
     /*拣货完成后出库*/
@@ -333,9 +328,9 @@ public class PddLocalController {
 
 
     /*流水查询*/
-    @PostMapping("/logOrderIoSelect")
-    public JSONObject logOrderIoSelect(HttpServletRequest request, @RequestBody LogOrderIoRequest param) {
-        return JsonResponse.generateLocalCommonSuccessResponse(logOrderIoImpl.getListByRequest(param));
+    @PostMapping("/logOrderMailDetailIoSelect")
+    public JSONObject logOrderMailDetailIoSelect(HttpServletRequest request, @RequestBody LogOrderMailDetailIoRequest param) {
+        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailIo.getListByRequest(param));
     }
 
 }

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderIoEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderMailDetailIoEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("log_order_io")
-public class LogOrderIoEntity {
+@TableName("log_order_mail_detail_io")
+public class LogOrderMailDetailIoEntity {
 
 
     @TableId(value = "uid")

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

-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.apache.ibatis.annotations.Update;
-import org.ta.pddserver.entity.LogOrderEntity;
-import org.ta.pddserver.entity.LogOrderIoEntity;
-import org.ta.pddserver.model.api.request.LogOrderIoRequest;
-import org.ta.pddserver.model.api.request.LogOrderListRequest;
-import org.ta.pddserver.model.api.response.LogOrderIoListResponse;
-import org.ta.pddserver.model.api.response.LogOrderListResponse;
-
-import java.util.List;
-
-@Mapper
-public interface LogOrderIoMapper extends BaseMapper<LogOrderIoEntity> {
-
-    @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `log_order_io` a WHERE  a.`logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ) t")
-    Integer countUsable(LogOrderIoRequest param);
-
-    @Select("SELECT `uid`, `created`,`status`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action`  FROM `log_order_io` WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
-    List<LogOrderIoListResponse> getListByRequest(LogOrderIoRequest param);
-
-}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
+import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailIoListResponse;
+
+import java.util.List;
+
+@Mapper
+public interface LogOrderMailDetailIoMapper extends BaseMapper<LogOrderMailDetailIoEntity> {
+
+    @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `log_order_mail_detail_io` a WHERE  a.`logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ) t")
+    Integer countUsable(LogOrderMailDetailIoRequest param);
+
+    @Select("SELECT `uid`, `created`,`status`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action`  FROM `log_order_mail_detail_io` WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%'  AND `status` = #{status} ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
+    List<LogOrderMailDetailIoListResponse> getListByRequest(LogOrderMailDetailIoRequest param);
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/LogOrderIoRequest.java → PddServer/src/main/java/org/ta/pddserver/model/api/request/LogOrderMailDetailIoRequest.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.ta.pddserver.model.common.PageTool;
 
 @Data
-public class LogOrderIoRequest extends PageTool {
+public class LogOrderMailDetailIoRequest extends PageTool {
     private String mailNo;
     private String logisticsOrderCode;
     private Integer status;

PddServer/src/main/java/org/ta/pddserver/model/api/response/LogOrderIoListResponse.java → PddServer/src/main/java/org/ta/pddserver/model/api/response/LogOrderMailDetailIoListResponse.java

@@ -3,7 +3,7 @@ package org.ta.pddserver.model.api.response;
 import lombok.Data;
 
 @Data
-public class LogOrderIoListResponse {
+public class LogOrderMailDetailIoListResponse {
 
     private String uid;
     private String created;

PddServer/src/main/java/org/ta/pddserver/service/LogOrderIoService.java → PddServer/src/main/java/org/ta/pddserver/service/LogOrderMailDetailIoService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.LogOrderIoEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
 
-public interface LogOrderIoService extends IService<LogOrderIoEntity> {
+public interface LogOrderMailDetailIoService extends IService<LogOrderMailDetailIoEntity> {
 
 
 }

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderIoImpl.java → PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailIoImpl.java

@@ -3,29 +3,24 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.LogOrderEntity;
-import org.ta.pddserver.entity.LogOrderIoEntity;
-import org.ta.pddserver.mapper.LogOrderIoMapper;
-import org.ta.pddserver.mapper.LogOrderMapper;
-import org.ta.pddserver.model.api.request.LogOrderIoRequest;
-import org.ta.pddserver.model.api.request.LogOrderListRequest;
-import org.ta.pddserver.model.api.response.LogOrderIoListResponse;
-import org.ta.pddserver.model.api.response.LogOrderListResponse;
-import org.ta.pddserver.service.LogOrderIoService;
-import org.ta.pddserver.service.LogOrderService;
+import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
+import org.ta.pddserver.mapper.LogOrderMailDetailIoMapper;
+import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailIoListResponse;
+import org.ta.pddserver.service.LogOrderMailDetailIoService;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Service
-public class LogOrderIoImpl extends ServiceImpl<LogOrderIoMapper, LogOrderIoEntity> implements LogOrderIoService {
+public class LogOrderMailDetailIoImpl extends ServiceImpl<LogOrderMailDetailIoMapper, LogOrderMailDetailIoEntity> implements LogOrderMailDetailIoService {
 
 
-    public Map<String, Object> getListByRequest(LogOrderIoRequest param) {
+    public Map<String, Object> getListByRequest(LogOrderMailDetailIoRequest param) {
         Integer count = baseMapper.countUsable(param);
         param.checkPage(count,20);
-        List<LogOrderIoListResponse> list = baseMapper.getListByRequest(param);
+        List<LogOrderMailDetailIoListResponse> list = baseMapper.getListByRequest(param);
         Map<String, Object> map = new HashMap<>();
         map.put("total", count);
         map.put("list", list);