commit

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

@@ -10,8 +10,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.ta.pddserver.entity.GDAttachmentEntity;
+import org.ta.pddserver.entity.GDReplyAttachmentEntity;
+import org.ta.pddserver.entity.GDReplyEntity;
 import org.ta.pddserver.entity.GDTicketEntity;
 import org.ta.pddserver.model.api.request.LogOrderListRequest;
+import org.ta.pddserver.model.api.request.ReplyRequest;
 import org.ta.pddserver.model.api.request.TicketListRequest;
 import org.ta.pddserver.model.pddgd.request.GDTicketReplyRequest;
 import org.ta.pddserver.model.pddgd.request.GDUploadRequest;
@@ -19,6 +22,8 @@ import org.ta.pddserver.model.pddgd.response.GDTicketReplyRepsonse;
 import org.ta.pddserver.model.pddgd.response.GDTicketRepsonse;
 import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
 import org.ta.pddserver.service.impl.GDAttachmentImpl;
+import org.ta.pddserver.service.impl.GDReplyAttachmentImpl;
+import org.ta.pddserver.service.impl.GDReplyImpl;
 import org.ta.pddserver.service.impl.GDTicketImpl;
 import org.ta.pddserver.utils.ImageUtils;
 import org.ta.pddserver.utils.JsonResponse;
@@ -112,6 +117,12 @@ public class PddGDController {
     @Resource
     GDAttachmentImpl gdAttachmentImpl;
 
+    @Resource
+    GDReplyAttachmentImpl gdReplyAttachmentImpl;
+
+    @Resource
+    GDReplyImpl gdReplyImpl;
+
     /*工单列表*/
     @PostMapping("/ticketList")
     public JSONObject ticketList(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
@@ -159,4 +170,71 @@ public class PddGDController {
     }
 
 
+    /*工单回复*/
+    @PostMapping("/reply")
+    public JSONObject reply(HttpServletRequest request, @RequestBody GDTicketReplyRequest replyRequest) {
+       GDTicketEntity gdTicketEntity = gdTicketImpl.getByTicketId(replyRequest.getTicket_id());
+
+       if(gdTicketEntity == null){
+           return JsonResponse.generateLocalCommonFailedResponse("-1", "信息获取失败，请检查上传信息");
+       }
+
+        replyRequest.setTicket_id(replyRequest.getTicket_id());
+        replyRequest.setWaybill_no(gdTicketEntity.getWaybill_no());
+        replyRequest.setHandle_result(replyRequest.getReply_call_result());
+        replyRequest.setSign_state(replyRequest.getSign_state());
+        replyRequest.setCompensate_state(replyRequest.getCompensate_state());
+        replyRequest.setCompensate_amount(replyRequest.getCompensate_state());
+        replyRequest.setDuty(replyRequest.getReply_type());
+        replyRequest.setExpress_dealer(replyRequest.getExpress_dealer());
+        replyRequest.setExpress_dealer_contact(replyRequest.getExpress_dealer_contact());
+        replyRequest.setReply_type(replyRequest.getReply_type());
+        String attach_path_list = JSONArray.toJSONString(replyRequest.getAttach_path_list());
+        replyRequest.setAttach_path_list(attach_path_list);
+
+        replyRequest.setClient_id(CLIENT_ID);
+
+        replyRequest.setType("pdd.logistics.ticket.notify");
+        long time = new Date().getTime() / 1000;
+        replyRequest.setTimestamp(time);
+        replyRequest.setSign(PddSignTool.generateSign(replyRequest, CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPostGD(replyRequest);
+        log.info("resp = {}", resp);
+
+        JSONObject respObj = JSON.parseObject(resp);
+        JSONObject respObject = respObj.getJSONObject("logistics_ticket_notify_response");
+        if (respObject == null) {
+            return JsonResponse.generateLocalCommonFailedResponse("-1", "未收到回复");
+        }else{
+            GDTicketReplyRepsonse replyRepsonse = respObject.toJavaObject(GDTicketReplyRepsonse.class);
+            log.info("replyRepsonse is_success:{}", replyRepsonse.getIs_success());
+            GDReplyEntity gdReply = new GDReplyEntity();
+            gdReply.setTickId(replyRequest.getTicket_id());
+            gdReply.setDuty(replyRequest.getDuty());
+            gdReply.setHandle_result(replyRequest.getHandle_result());
+            gdReply.setSign_state(replyRequest.getSign_state());
+            gdReply.setCompensate_state(replyRequest.getCompensate_state());
+            gdReply.setCompensate_amount(replyRequest.getCompensate_state());
+            gdReply.setExpress_dealer(replyRequest.getExpress_dealer());
+            gdReply.setExpress_dealer_contact(replyRequest.getExpress_dealer_contact());
+            gdReply.setReply_type(replyRequest.getReply_type());
+            gdReply.setDuty(replyRequest.getDuty());
+            gdReply.setHandle_result(replyRequest.getHandle_result());
+
+            gdReplyImpl.save(gdReply);
+
+            for(String lists: replyRequest.getAttach_paths()){
+                GDReplyAttachmentEntity gdReplyAttachmentEntity = new GDReplyAttachmentEntity();
+                gdReplyAttachmentEntity.setTickId(replyRequest.getTicket_id());
+                gdReplyAttachmentEntity.setWaybill_no(replyRequest.getWaybill_no());
+                gdReplyAttachmentEntity.setUrl(lists);
+                gdReplyAttachmentImpl.save(gdReplyAttachmentEntity);
+            }
+
+            return JsonResponse.generateLocalCommonSuccessResponse(replyRepsonse.getIs_success());
+        }
+
+
+    }
+
 }

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+import java.util.List;
+
+@Data
+public class ReplyRequest {
+
+    private int ticketId;
+
+    private String handleResult;
+
+    private int signState;
+
+    private int compensateState;
+
+    private int compensateAmount;
+
+    private int duty;
+
+    private String expressDealer;
+
+    private String expressDealerContact;
+
+    private int replyType;
+
+    private String replyCallResult;
+
+    private List<String> url;
+}