Skip to content

M
MultipleSourceSecurity
Commit 46296aae authored by Allen Chen's avatar Allen Chen
Browse files
Options

commit

parent 4bf8e9f6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 61 deletions
PddServer/src/main/java/org/ta/pddserver/mapper/CollectMailDetailMapper.java
View file @ 46296aae
......@@ -6,6 +6,12 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.ta.pddserver.entity.CollectMailDetailEntity;
import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
import org.ta.pddserver.model.api.request.LogOrderListRequest;
import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
import org.ta.pddserver.model.api.response.LogOrderListResponse;
import java.util.List;
@Mapper
public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEntity> {
......@@ -15,6 +21,14 @@ public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEnt
@Update("UPDATE `collect_mail_detail` SET `status` = #{status} WHERE `uid` = #{uid};")
int updateStatusByUid(int status, String uid);
@Update("UPDATE `collect_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo}")
Boolean updateByMailNo(@Param("mailNo") String mailNo, @Param("action") String action);
@Update("UPDATE `collect_mail_detail` SET `status` = #{status} WHERE `mailNo` = #{mailNo}")
Boolean updateByMailNo(@Param("mailNo") String mailNo, @Param("status") int status);
@Select("SELECT count(*) FROM `collect_mail_detail` WHERE `orderCode` LIKE '%${orderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%';")
Integer countUsable(CollectMailDetailListRequest collectMailDetailListRequest);
@Select("SELECT `uid`, `orderCode`, `expressCode`, `mailNo` FROM `collect_mail_detail` WHERE `orderCode` LIKE '%${orderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%' ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
List<CollectMailDetailListResponse> getListByRequest(CollectMailDetailListRequest collectMailDetailListRequest);
}
PddServer/src/main/java/org/ta/pddserver/mapper/CollectOrderMapper.java
View file @ 46296aae
......@@ -2,11 +2,15 @@ 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.CollectOrderEntity;
import org.ta.pddserver.model.api.response.CollectOrderListResponse;
import org.ta.pddserver.model.api.response.CollectOrderResponse;
import java.util.List;
@Mapper
public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
......@@ -15,4 +19,10 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
@Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
int updateOrderStatusById(int status, String uid);
@Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode} AND `status` = ${status}")
List<CollectOrderListResponse> getList(@Param("orderCode") String orderCode, @Param("status") int status);
@Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
CollectOrderResponse getInfoByOrderCode(@Param("orderCode") String orderCode);
}
PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailMapper.java
View file @ 46296aae
......@@ -24,19 +24,19 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
LogOrderMailDetailEntity findByMailNo(String mailNo);
@Select("SELECT count(t.uid) FROM ( SELECT a.uid FROM `log_order_mail_detail` a WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `state` > 0 ) t")
@Select("SELECT count(t.uid) FROM ( SELECT a.uid FROM `log_order_mail_detail` a WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%' AND `state` > 0 ) t")
Integer countUsable(LogOrderMailDetailListRequest param);
@Select("SELECT `uid`,`updated`,`status`,`logisticsOrderCode` , `expressCode` , `mailNo`, `length` , `width` , `height`, `weight` FROM `log_order_mail_detail` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `state` > 0 ORDER BY uid DESC LIMIT #{offset}, #{size};")
@Select("SELECT `uid`,`updated`,`status`,`logisticsOrderCode` , `expressCode` , `mailNo`, `length` , `width` , `height`, `weight` FROM `log_order_mail_detail` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%' AND `state` > 0 ORDER BY uid DESC LIMIT #{offset}, #{size};")
List<LogOrderMailDetailListResponse> getListByCodeNo(LogOrderMailDetailListRequest param);
@Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} AND `status` = #{status} AND `state` > 0;")
MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo, @Param("status") String status);
@Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo);
@Update("UPDATE `log_order_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo};")
Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("action") String action);
@Update("UPDATE `log_order_mail_detail` SET `status` = ${status} WHERE `mailNo` = #{mailNo};")
Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("status") int status);
@Select("SELECT COUNT(*) FROM `log_order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `status` = ${status};")
Long getSumByCodeStatus(@Param("logisticsOrderCode") String logisticsOrderCode, @Param("status") Long status);
......
PddServer/src/main/java/org/ta/pddserver/model/api/request/CollectMailDetailListRequest.java 0 → 100644
View file @ 46296aae
package org.ta.pddserver.model.api.request;
import lombok.Data;
import org.ta.pddserver.model.common.PageTool;
@Data
public class CollectMailDetailListRequest extends PageTool {
private String orderCode;
private String mailNo;
private int status;
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/CollectOrderScanRequest.java 0 → 100644
View file @ 46296aae
package org.ta.pddserver.model.api.request;
import lombok.Data;
@Data
public class CollectOrderScanRequest {
private String orderCode;
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/LogOrderMailDetailListRequest.java
View file @ 46296aae
......@@ -9,4 +9,6 @@ public class LogOrderMailDetailListRequest extends PageTool {
private String logisticsOrderCode;
private String mailNo;
private int status;
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/ReceiveRequest.java
View file @ 46296aae
......@@ -9,6 +9,6 @@ public class ReceiveRequest {
private String mailNo;
private String status;
private int status;
}
PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectMailDetailListResponse.java 0 → 100644
View file @ 46296aae
package org.ta.pddserver.model.api.response;
import lombok.Data;
@Data
public class CollectMailDetailListResponse {
private String uid;
private String orderCode;
private int status;
private String expressCode;
private String mailNo;
}
PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectOrderListResponse.java 0 → 100644
View file @ 46296aae
package org.ta.pddserver.model.api.response;
import lombok.Data;
@Data
public class CollectOrderListResponse {
private String uid;
private String orderCode;
private int itemQuantityTotal;
private String segmentCode;
private String consoType;
}
PddServer/src/main/java/org/ta/pddserver/service/impl/CollectMailDetailImpl.java
View file @ 46296aae
......@@ -5,8 +5,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.ta.pddserver.entity.CollectMailDetailEntity;
import org.ta.pddserver.mapper.CollectMailDetailMapper;
import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
import org.ta.pddserver.model.api.response.LogOrderListResponse;
import org.ta.pddserver.service.CollectMailDetailService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper, CollectMailDetailEntity> implements CollectMailDetailService {
......@@ -19,7 +26,19 @@ public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper,
return baseMapper.updateStatusByUid(status, uid);
}
public Boolean updateByMailNo(String mailNo, String action) {
return baseMapper.updateByMailNo(mailNo, action);
public Boolean updateByMailNo(String mailNo, int status) {
return baseMapper.updateByMailNo(mailNo, status);
}
public Object getList(CollectMailDetailListRequest param) {
Integer count = baseMapper.countUsable(param);
param.checkPage(count,20);
List<CollectMailDetailListResponse> list = baseMapper.getListByRequest(param);
Map<String, Object> map = new HashMap<>();
map.put("total", count);
map.put("list", list);
map.put("page", param.getPage());
return map;
}
}
\ No newline at end of file
PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderImpl.java
View file @ 46296aae
......@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.ta.pddserver.entity.CollectOrderEntity;
import org.ta.pddserver.mapper.CollectOrderMapper;
import org.ta.pddserver.model.api.response.CollectOrderListResponse;
import org.ta.pddserver.model.api.response.CollectOrderResponse;
import org.ta.pddserver.service.CollectOrderService;
import java.util.List;
@Service
public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrderEntity> implements CollectOrderService {
......@@ -19,4 +22,12 @@ public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrd
public int updateOrderStatus(int status, String uid) {
return this.baseMapper.updateOrderStatusById(status, uid);
}
public List<CollectOrderListResponse> getList(String orderCode, int status) {
return baseMapper.getList(orderCode, status);
}
public CollectOrderResponse getInfoByOrderCode(String orderCode) {
return baseMapper.getInfoByOrderCode(orderCode);
}
}
\ No newline at end of file
PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailImpl.java
View file @ 46296aae
......@@ -19,8 +19,8 @@ import java.util.Map;
@Service
public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper, LogOrderMailDetailEntity> implements LogOrderMailDetailService {
public Boolean updateByMailNo(String mailNo, String action) {
return baseMapper.updateByMailNo(mailNo, action);
public Boolean updateByMailNo(String mailNo, int status) {
return baseMapper.updateByMailNo(mailNo, status);
}
public List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
......@@ -47,8 +47,8 @@ public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper
}
public MailNoResponse getInfoByMailNo(String mailNo, String status) {
return baseMapper.getInfoByMailNo(mailNo, status);
public MailNoResponse getInfoByMailNo(String mailNo) {
return baseMapper.getInfoByMailNo(mailNo);
}
......
PddServer/src/main/java/org/ta/pddserver/utils/StatusEnum.java 0 → 100644
View file @ 46296aae
//package org.ta.pddserver.utils;
//
//import org.springframework.stereotype.Component;
//
//@Component
//public enum StatusEnum {
// ORDERCREATE(1, "创建订单"),
// SIGNED(10, "签收"),
// REJECTED(11, "拒签"),
// DESTROY(12, "销毁"),
// UNINBOUND(19, "未入库"),
// INBOUND(20, "入库"),
// PARTINBOUND(21, "部分入库"),
// FULLINBOUND(22, "全部入库"),
// UNPACK(30, "通知拆包"),
// FINISHUNPACK(39, "拆包完成"),
// OUTBOUND(40, "通知出库"),
// BEGINPICK(50, "开始拣货"),
// FINISHPICK(59, "拣货完成"),
// FINISHOUTBOUND(60, "出库"),
// UNKNOWN(-1, "未知");
//
// private final int code;
// private final String desc;
//
// // 枚举构造方法默认私有，无需 Spring 注入
// StatusEnum(int code, String desc) {
// this.code = code;
// this.desc = desc;
// }
//
// // 仅保留 Getter，无 Setter
// public int getCode() {
// return code;
// }
//
// public String getDesc() {
// return desc;
// }
//
// // 根据状态码查询枚举（核心业务方法）
// public static StatusEnum getByCode(int code) {
// for (StatusEnum status : StatusEnum.values()) {
// if (status.getCode() == code) {
// return status;
// }
// }
// return UNKNOWN;
// }
//
//}
PddServer/src/main/resources/application.yaml
View file @ 46296aae
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://192.168.2.222:3306/Test01?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
# username: root
# password: root
url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
username: pdd
password: pdd123
url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
username: root
password: root
# url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
# username: pdd
# password: pdd123
hikari:
minimum-idle: 5 # 最小空闲连接数
maximum-pool-size: 10 # 最大活跃连接数
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment