Skip to content

M
MultipleSourceSecurity
Commit 1044b603 authored by Allen Chen's avatar Allen Chen
Browse files
Options

commit

parent 6d65758e
Show whitespace changes
Inline Side-by-side
Showing with 288 additions and 52 deletions
PddServer/src/main/java/org/ta/pddserver/controller/PddGDController.java
View file @ 1044b603
......@@ -14,6 +14,7 @@ import org.ta.pddserver.entity.GDTicketEntity;
import org.ta.pddserver.model.api.request.LogOrderListRequest;
import org.ta.pddserver.model.api.request.TicketListRequest;
import org.ta.pddserver.model.pddgd.request.GDTicketReplyRequest;
import org.ta.pddserver.model.pddgd.request.GDUploadRequest;
import org.ta.pddserver.model.pddgd.response.GDTicketReplyRepsonse;
import org.ta.pddserver.model.pddgd.response.GDTicketRepsonse;
import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
......@@ -114,12 +115,12 @@ public class PddGDController {
/*工单列表*/
@PostMapping("/ticketList")
public JSONObject ticketList(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
return JsonResponse.generateLocalCommonSuccessResponse( gdTicketImpl.getListByRequest(ticketListRequest));
return JsonResponse.generateLocalCommonSuccessResponse(gdTicketImpl.getListByRequest(ticketListRequest));
}
/*工单详情*/
@PostMapping("/ticketInfo")
public Map<String, Object> ticketInfo(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
public JSONObject ticketInfo(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
Map<String, Object> map = new HashMap<>();
GDTicketEntity gdTicketEntity = gdTicketImpl.getByTicketId((long) ticketListRequest.getTicket_id());
......@@ -135,4 +136,27 @@ public class PddGDController {
return JsonResponse.generateLocalCommonSuccessResponse(map);
}
/*工单列表*/
@PostMapping("/uploadImage")
public JSONObject uploadImage(HttpServletRequest request, @RequestBody GDUploadRequest gdUploadRequest) throws IOException {
gdUploadRequest.setClient_id(CLIENT_ID);
gdUploadRequest.setType("pdd.logistics.ticket.image.upload");
long time = new Date().getTime() / 1000;
gdUploadRequest.setTimestamp(time);
gdUploadRequest.setImage(new ImageUtils().downloadCompressToBase64(gdUploadRequest.getImage()));
gdUploadRequest.setSign(PddSignTool.generateSign(gdUploadRequest, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPostGD(gdUploadRequest);
JSONObject jsonObject = JSONObject.parseObject(resp);
String image = jsonObject.getJSONObject("logistics_ticket_image_upload_response")
.getString("image_url");
Map<String, Object> map = new HashMap<>();
map.put("image", image);
return JsonResponse.generateLocalCommonSuccessResponse(map);
}
}
PddServer/src/main/java/org/ta/pddserver/controller/PddLocalController.java
View file @ 1044b603
......@@ -46,6 +46,9 @@ public class PddLocalController {
@Resource
LogOrderPackageImpl logOrderPackageImpl;
@Resource
PackageNoticeImpl packageNoticeImpl;
private static final String PROVIDER_CODE = "HAIJI_KR";
private static final String WAREHOUSE_CODE = "HJJY001";
private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
......@@ -77,6 +80,13 @@ public class PddLocalController {
return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
}
/*待拆包列表*/
@PostMapping("/packageNoticeList")
public JSONObject packageNoticeList(HttpServletRequest request, @RequestBody PackageNoticeRequest packageNoticeRequest) {
return JsonResponse.generateLocalCommonSuccessResponse(packageNoticeImpl.getList(packageNoticeRequest));
}
/*待拆包查询*/
@PostMapping("/packageScan")
public Map<String, Object> packageScan(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
......@@ -88,7 +98,7 @@ public class PddLocalController {
LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(list.get(0).getLogisticsOrderCode());
Map<String,Object> map = new HashMap<>();
map.put("logisticsOrderCode",logOrderEntity);
map.put("logOrder",logOrderEntity);
map.put("list",list);
return JsonResponse.generateLocalCommonSuccessResponse(map);
......@@ -318,6 +328,8 @@ public class PddLocalController {
logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
//更新入库包裹状态
mailNoResponse.setStatus(logOrderMailDetailIoEntity.getStatus());
mailNoResponse.setEnterTime(timeTool.getNowDate());
logOrderMailDetailImpl.updateById(mailNoResponse);
logOrderEntity.setNum(notifyRequest.getPackageQuantity().intValue());
......@@ -423,11 +435,7 @@ public class PddLocalController {
@PostMapping("/unpackError")
public JSONObject beginPickError(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
CollectOrderEntity collectOrderEntity = new CollectOrderEntity();
PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
notifyRequest.setProviderCode(PROVIDER_CODE);
......@@ -439,17 +447,45 @@ public class PddLocalController {
LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
if (("begin_pick").equals(finishUnpackRequest.getAction())) {
collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
logOrderMailDetailIoEntity.setStatus(StatusEnum.BEGINPICKERROR.getCode());
notifyRequest.setBizActionDesc("开始拣货");
} else if (("finish_pick").equals(finishUnpackRequest.getAction())) {
collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHPICKERROR.getCode());
notifyRequest.setBizActionDesc("拣货完成");
}else if (("finish_unpack").equals(finishUnpackRequest.getAction())) {
PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
if(packageNoticeEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","未查到拆包信息，请检查参数");
}
LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
if(logOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","未查到集运单信息，请检查参数");
}
notifyRequest.setBizActionDesc("拆包完成");
logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHUNPACKERROR.getCode());
......@@ -463,10 +499,28 @@ public class PddLocalController {
packageInfo.setHeight(lists.getHeight());
packageInfo.setLength(lists.getLength());
packageInfo.setActualWeight((long) PddJYPriceTool.calculateWeight(lists.getLength().intValue(), lists.getWidth().intValue(), lists.getHeight().intValue(), lists.getWeight().intValue(), true));
packageInfo.setConsoType(collectOrderEntity.getConsoType());
packageInfo.setConsoType(logOrderEntity.getConsoType());
packageInfo.setGoodsType(finishUnpackRequest.getGoodsType());
notifyRequest.getPackageInfos().add(packageInfo);
LogOrderPackageEntity logOrderPackageEntity = new LogOrderPackageEntity();
logOrderPackageEntity.setStatus("" + StatusEnum.FINISHUNPACK.getCode());
logOrderPackageEntity.setLogisticsOrderCode(finishUnpackRequest.getOrderCode());
logOrderPackageEntity.setPackageType(finishUnpackRequest.getGoodsType());
logOrderPackageEntity.setLength(lists.getLength().intValue());
logOrderPackageEntity.setWidth(lists.getWidth().intValue());
logOrderPackageEntity.setHeight(lists.getHeight().intValue());
logOrderPackageEntity.setWeight(lists.getWeight().intValue());
logOrderPackageImpl.save(logOrderPackageEntity);
logOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
logOrderImpl.updateById(logOrderEntity);
packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
packageNoticeImpl.updateById(packageNoticeEntity);
}
}
notifyRequest.setResult(new PddServiceConsoCoBizActionNotifyRequest.Result());
......@@ -497,8 +551,11 @@ public class PddLocalController {
logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
if (("begin_pick").equals(finishUnpackRequest.getAction()) || ("finish_pick").equals(finishUnpackRequest.getAction())) {
//更新collect_mail_detail
List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.findListByOrderCode(finishUnpackRequest.getOrderCode());
for(CollectMailDetailEntity lists:collectMailDetailEntityList){
for (CollectMailDetailEntity lists : collectMailDetailEntityList) {
lists.setStatus(logOrderMailDetailIoEntity.getStatus());
collectMailDetailImpl.updateById(lists);
}
......@@ -506,6 +563,7 @@ public class PddLocalController {
collectOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
collectOrderImpl.updateById(collectOrderEntity);
}
return JsonResponse.generateLocalCommonSuccessResponse(true);
}
......@@ -514,12 +572,6 @@ public class PddLocalController {
@PostMapping("/finishUnpack")
public JSONObject finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
CollectOrderEntity collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
String action = finishUnpackRequest.getAction();
PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
......@@ -532,17 +584,48 @@ public class PddLocalController {
LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
CollectOrderEntity collectOrderEntity = new CollectOrderEntity();
if (action.equals("begin_pick")) {
collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
logOrderMailDetailIoEntity.setStatus(StatusEnum.BEGINPICK.getCode());
notifyRequest.setBizActionDesc("开始拣货");
notifyResult.setCode(0);
} else if (action.equals("finish_pick")) {
collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
if(collectOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","信息获取失败，请检查参数");
}
logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHPICK.getCode());
notifyRequest.setBizActionDesc("拣货完成");
notifyResult.setCode(0);
} else if (action.equals("finish_unpack")) {
PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
if(packageNoticeEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","未查到拆包信息，请检查参数");
}
LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
if(logOrderEntity == null){
return JsonResponse.generateLocalCommonFailedResponse("-1","未查到集运单信息，请检查参数");
}
logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHUNPACK.getCode());
notifyRequest.setBizActionDesc("拆包完成");
......@@ -550,6 +633,7 @@ public class PddLocalController {
notifyResult.setCode(0);
notifyRequest.setPackageInfos(new ArrayList<>());
List<LogOrderPackageEntity> list = new ArrayList<>();
for(FinishUnpackRequest.PackageInfo lists: finishUnpackRequest.getPackageInfo()){
......@@ -559,12 +643,29 @@ public class PddLocalController {
packageInfo.setHeight(lists.getHeight());
packageInfo.setLength(lists.getLength());
packageInfo.setActualWeight((long) PddJYPriceTool.calculateWeight(lists.getLength().intValue(), lists.getWidth().intValue(), lists.getHeight().intValue(), lists.getWeight().intValue(), true));
packageInfo.setConsoType(collectOrderEntity.getConsoType());
packageInfo.setConsoType(logOrderEntity.getConsoType());
packageInfo.setGoodsType(finishUnpackRequest.getGoodsType());
notifyRequest.getPackageInfos().add(packageInfo);
}
LogOrderPackageEntity logOrderPackageEntity = new LogOrderPackageEntity();
logOrderPackageEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
logOrderPackageEntity.setLogisticsOrderCode(finishUnpackRequest.getOrderCode());
logOrderPackageEntity.setPackageType(finishUnpackRequest.getGoodsType());
logOrderPackageEntity.setLength(lists.getLength().intValue());
logOrderPackageEntity.setWidth(lists.getWidth().intValue());
logOrderPackageEntity.setHeight(lists.getHeight().intValue());
logOrderPackageEntity.setWeight(lists.getWeight().intValue());
logOrderPackageImpl.save(logOrderPackageEntity);
logOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
logOrderImpl.updateById(logOrderEntity);
packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
packageNoticeImpl.updateById(packageNoticeEntity);
}
}
notifyRequest.setResult(notifyResult);
......@@ -581,7 +682,6 @@ public class PddLocalController {
String resp = PddHttpTool.sendJsonPost(requestModel);
logOrderMailDetailIoEntity.setMailNo(finishUnpackRequest.getMailNo());
logOrderMailDetailIoEntity.setLogisticsOrderCode(finishUnpackRequest.getOrderCode());
logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
......@@ -589,9 +689,11 @@ public class PddLocalController {
logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
if (action.equals("begin_pick") || action.equals("finish_pick")) {
//更新collect_mail_detail
List<CollectMailDetailEntity> collectMailDetailEntityList = collectMailDetailImpl.findListByOrderCode(finishUnpackRequest.getOrderCode());
for(CollectMailDetailEntity lists:collectMailDetailEntityList){
for (CollectMailDetailEntity lists : collectMailDetailEntityList) {
lists.setStatus(logOrderMailDetailIoEntity.getStatus());
collectMailDetailImpl.updateById(lists);
}
......@@ -599,9 +701,9 @@ public class PddLocalController {
collectOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
collectOrderImpl.updateById(collectOrderEntity);
}
return JsonResponse.generateLocalCommonSuccessResponse(true);
}
......
PddServer/src/main/java/org/ta/pddserver/mapper/GDAttachmentMapper.java
View file @ 1044b603
......@@ -11,6 +11,6 @@ import java.util.List;
@Mapper
public interface GDAttachmentMapper extends BaseMapper<GDAttachmentEntity> {
@Select("SELECT * FROM `gd_attachment` WHERE `ticketId` = ${ticketId}")
@Select("SELECT * FROM `gd_attachment` WHERE `ticket_id` = ${ticketId}")
List<GDAttachmentEntity> getListByTicketId(@Param("ticketId") int ticketId);
}
PddServer/src/main/java/org/ta/pddserver/mapper/GDTicketMapper.java
View file @ 1044b603
......@@ -17,10 +17,9 @@ public interface GDTicketMapper extends BaseMapper<GDTicketEntity> {
@Select("SELECT * FROM `gd_ticket` WHERE `ticket_id` = #{ticketId};")
GDTicketEntity findByTicketId(Long ticketId);
@Select("SELECT count(t.uid) FROM ( SELECT `uid` FROM `gd_ticket` WHERE `source` LIKE '%${source}%' AND `title` LIKE '%${title}%' AND `create_type` LIKE '%${create_type}%' AND `compensate_state` LIKE '%${compensate_state}%' AND `type_id` LIKE '%${type_id}%' AND `sign_state` LIKE '%${sign_state}%' AND `urgent_type` LIKE '%${urgent_type}%' AND `state` LIKE '%${state}%' AND `area_name` LIKE '%${area_name}%') t")
@Select("SELECT COUNT(*) FROM (SELECT `uid` FROM `gd_ticket` WHERE ( #{source} IS NULL OR #{source} = '' OR `source` LIKE CONCAT('%', #{source}, '%')) AND ( #{title} IS NULL OR #{title} = '' OR `title` LIKE CONCAT('%', #{title}, '%') ) AND ( #{create_type} IS NULL OR #{create_type} = '' OR `create_type` LIKE CONCAT('%', #{create_type}, '%') ) AND ( #{compensate_state} IS NULL OR #{compensate_state} = '' OR `compensate_state` LIKE CONCAT('%', #{compensate_state}, '%') ) AND ( #{type_id} IS NULL OR #{type_id} = '' OR `type_id` LIKE CONCAT('%', #{type_id}, '%') ) AND ( #{sign_state} IS NULL OR #{sign_state} = '' OR `sign_state` LIKE CONCAT('%', #{sign_state}, '%') ) AND ( #{urgent_type} IS NULL OR #{urgent_type} = '' OR `urgent_type` LIKE CONCAT('%', #{urgent_type}, '%')) ) t")
Integer countUsable(TicketListRequest param);
@Select("SELECT `source`, `title`, `create_type`,`compensate_state`, `type_id`, `sign_state`, `urgent_type`, `state`, `area_name` , `pre_delivery_id`, `ticket_id`, `create_at` FROM `gd_ticket` WHERE `source` LIKE '%${source}%' AND `title` LIKE '%${title}%' AND `create_type` LIKE '%${create_type}%' AND `compensate_state` LIKE '%${compensate_state}%' AND `type_id` LIKE '%${type_id}%' AND `sign_state` LIKE '%${sign_state}%' AND `urgent_type` LIKE '%${urgent_type}%' AND `state` LIKE '%${state}%' AND `area_name` LIKE '%${area_name}%' ORDER BY `ticket_id` DESC LIMIT #{offset}, #{size}; ")
List<TicketListResponse> getListByRequest(TicketListRequest param);
@Select("SELECT * FROM `gd_ticket` WHERE ( #{source} IS NULL OR #{source} = '' OR `source` LIKE CONCAT('%', #{source}, '%')) AND ( #{title} IS NULL OR #{title} = '' OR `title` LIKE CONCAT('%', #{title}, '%') ) AND ( #{create_type} IS NULL OR #{create_type} = '' OR `create_type` LIKE CONCAT('%', #{create_type}, '%') ) AND ( #{compensate_state} IS NULL OR #{compensate_state} = '' OR `compensate_state` LIKE CONCAT('%', #{compensate_state}, '%') ) AND ( #{type_id} IS NULL OR #{type_id} = '' OR `type_id` LIKE CONCAT('%', #{type_id}, '%') ) AND ( #{sign_state} IS NULL OR #{sign_state} = '' OR `sign_state` LIKE CONCAT('%', #{sign_state}, '%') ) AND ( #{urgent_type} IS NULL OR #{urgent_type} = '' OR `urgent_type` LIKE CONCAT('%', #{urgent_type}, '%') )")
List<GDTicketEntity> getListByRequest(TicketListRequest param);
}
PddServer/src/main/java/org/ta/pddserver/mapper/PackageNoticeMapper.java
View file @ 1044b603
......@@ -2,9 +2,14 @@ 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.PackageNoticeEntity;
import org.ta.pddserver.entity.PackageQueryEntity;
import org.ta.pddserver.model.api.request.LogOrderListRequest;
import org.ta.pddserver.model.api.request.PackageNoticeRequest;
import org.ta.pddserver.model.api.response.LogOrderListResponse;
import org.ta.pddserver.model.api.response.PackageNoticeResponse;
import java.util.List;
......@@ -13,4 +18,13 @@ public interface PackageNoticeMapper extends BaseMapper<PackageNoticeEntity> {
// 根据用户名查找用户
@Select("SELECT * FROM `package_notice` WHERE `username` = #{username};")
List<PackageNoticeEntity> selectByUsername(String username);
@Select("SELECT count(a.`uid`) FROM `package_notice` a, `log_order_mail_detail` b WHERE a.`orderCode` = b.`logisticsOrderCode` AND a.`orderCode` LIKE '%${orderCode}%' ; ")
Integer countUsable(PackageNoticeRequest param);
@Select("SELECT a.`orderCode`, b.`expressCode`, b.`mailNo`, a.`status` FROM `package_notice` a, `log_order_mail_detail` b WHERE a.`orderCode` = b.`logisticsOrderCode` AND a.`orderCode` LIKE '%${orderCode}%' ORDER BY a.`updated` DESC LIMIT #{offset}, #{size}; ")
List<PackageNoticeResponse> getListByRequest(PackageNoticeRequest param);
@Select("SELECT * FROM `package_notice` WHERE `orderCode` = #{orderCode}")
PackageNoticeEntity getByOrderCode(@Param("orderCode") String orderCode);
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/FinishUnpackRequest.java
View file @ 1044b603
......@@ -28,7 +28,6 @@ public class FinishUnpackRequest {
*/
@Data
public static class PackageInfo {
private String orderCode;
private Long length;
......
PddServer/src/main/java/org/ta/pddserver/model/api/request/PackageNoticeRequest.java 0 → 100644
View file @ 1044b603
package org.ta.pddserver.model.api.request;
import lombok.Data;
import org.ta.pddserver.model.common.PageTool;
@Data
public class PackageNoticeRequest extends PageTool {
private String orderCode;
private int status;
}
PddServer/src/main/java/org/ta/pddserver/model/api/request/TicketListRequest.java
View file @ 1044b603
......@@ -20,8 +20,6 @@ public class TicketListRequest extends PageTool {
private int urgent_type;
private int state;
private String area_name;
private int ticket_id;
......
PddServer/src/main/java/org/ta/pddserver/model/api/request/UploadImageRequest.java 0 → 100644
View file @ 1044b603
package org.ta.pddserver.model.api.request;
import lombok.Data;
@Data
public class UploadImageRequest {
private String image;
}
PddServer/src/main/java/org/ta/pddserver/model/api/response/PackageNoticeResponse.java 0 → 100644
View file @ 1044b603
package org.ta.pddserver.model.api.response;
import lombok.Data;
@Data
public class PackageNoticeResponse {
private String orderCode;
private String expressCode;
private String mailNo;
private int status;
}
PddServer/src/main/java/org/ta/pddserver/model/api/response/TicketListResponse.java
View file @ 1044b603
......@@ -9,24 +9,30 @@ public class TicketListResponse {
private String title;
private int create_type;
private Integer create_type;
private int compensate_state;
private Integer compensate_state;
private int type_id;
private Integer type_id;
private int sign_state;
private Integer sign_state;
private int urgent_type;
private Integer urgent_type;
private int state;
private Integer state;
private String area_name;
private String pre_delivery_id;
private int ticket_id;
private Integer ticket_id;
private int create_at;
private Integer create_at;
private Integer update_at;
private String waybill_no;
private String description;
}
PddServer/src/main/java/org/ta/pddserver/service/impl/GDTicketImpl.java
View file @ 1044b603
......@@ -22,10 +22,10 @@ public class GDTicketImpl extends ServiceImpl<GDTicketMapper, GDTicketEntity> im
return this.baseMapper.findByTicketId(ticketId);
}
public Object getListByRequest(TicketListRequest param) {
public Map<String, Object> getListByRequest(TicketListRequest param) {
Integer count = baseMapper.countUsable(param);
param.checkPage(count,20);
List<TicketListResponse> list = baseMapper.getListByRequest(param);
List<GDTicketEntity> list = baseMapper.getListByRequest(param);
Map<String, Object> map = new HashMap<>();
map.put("total", count);
map.put("list", list);
......
PddServer/src/main/java/org/ta/pddserver/service/impl/PackageNoticeImpl.java
View file @ 1044b603
......@@ -7,11 +7,33 @@ import org.ta.pddserver.entity.FeeQueryEntity;
import org.ta.pddserver.entity.PackageNoticeEntity;
import org.ta.pddserver.mapper.FeeQueryMapper;
import org.ta.pddserver.mapper.PackageNoticeMapper;
import org.ta.pddserver.model.api.request.PackageNoticeRequest;
import org.ta.pddserver.model.api.response.LogOrderListResponse;
import org.ta.pddserver.model.api.response.PackageNoticeResponse;
import org.ta.pddserver.service.FeeQueryService;
import org.ta.pddserver.service.PackageNoticeService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class PackageNoticeImpl extends ServiceImpl<PackageNoticeMapper, PackageNoticeEntity> implements PackageNoticeService {
public Map<String, Object> getList(PackageNoticeRequest param) {
Integer count = baseMapper.countUsable(param);
param.checkPage(count,20);
List<PackageNoticeResponse> 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;
}
public PackageNoticeEntity getByOrderCode(String orderCode) {
return baseMapper.getByOrderCode(orderCode);
}
}
\ No newline at end of file
PddServer/src/test/java/org/ta/pddserver/GDTest3.java
View file @ 1044b603
......@@ -104,6 +104,10 @@ public class GDTest3 {
request.setImage(new ImageUtils().downloadCompressToBase64("https://images.v2.tradeany.com/files/20251030/5eaac48c24c5427fa9e055d0976d5e89.jpg"));
request.setSign(PddSignTool.generateSign(request, CLIENT_SECRET));
String resp = PddHttpTool.sendJsonPostGD(request);
JSONObject jsonObject = JSONObject.parseObject(resp);
log.info("resp = {}", resp);
log.info("image_url = {}", jsonObject.getJSONObject("logistics_ticket_image_upload_response")
.getString("image_url"));
}
}
logback.xml 0 → 100644
View file @ 1044b603
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 控制台输出 -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<!-- 关键：开启 UserMapper 所在包的 DEBUG 日志（打印 SQL） -->
<logger name="com.yourpackage.mapper" level="DEBUG" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<!-- 开启业务代码包的 INFO 日志（打印自定义 log.info） -->
<logger name="com.yourpackage.service" level="INFO" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<!-- 全局日志级别 -->
<root level="INFO">
<appender-ref ref="CONSOLE"/>
</root>
</configuration>
\ No newline at end of file
pom.xml
View file @ 1044b603
......@@ -35,6 +35,12 @@
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.10</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
......
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