commit

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

@@ -16,6 +16,7 @@ import org.ta.pddserver.model.pddlg.request.PddLogisticsCoTrackQueryRequest;
 import org.ta.pddserver.model.pddlg.request.PddLogisticsCoTrackSubRequest;
 import org.ta.pddserver.service.impl.*;
 import org.ta.pddserver.utils.JsonResponse;
+import org.ta.pddserver.utils.PddJYPriceTool;
 import org.ta.pddserver.utils.PddSignTool;
 
 import java.io.BufferedReader;
@@ -130,11 +131,36 @@ public class PddOpenController {
                     PddServiceConsoFeeQueryRequest queryRequest = JSON.parseObject(body, PddServiceConsoFeeQueryRequest.class);
                     FeeQuery(queryRequest);
                     log.info("pdd.service.conso.fee.query 集运费用查询");
+                    List<PddServiceConsoFeeQueryRequest.MailDetail> list = queryRequest.getMailDetails();
+                    int freightFee = 0;
+                    int rentFee = 0;
+                    int weight = 0;
+                    for (PddServiceConsoFeeQueryRequest.MailDetail mailDetail : list) {
+                        LogOrderMailDetailEntity mailDetailEntity = orderMailDetailImpl.getByMailNo(mailDetail.getMailNo());
+                        PddJYPriceTool.FeeResult result = PddJYPriceTool.getTotalFee(queryRequest.getGoodsType(),
+                                mailDetailEntity.getLength(),
+                                mailDetailEntity.getWidth(),
+                                mailDetailEntity.getHeight(),
+                                mailDetailEntity.getWeight(),
+                                "SENDTORECEVER".equals(queryRequest.getSegmentCode())
+                        );
+                        if (result == null) {
+                            JSONObject jsonObject = new JSONObject();
+                            jsonObject.put("success", false);
+                            jsonObject.put("code", 11);
+                            jsonObject.put("message", "包裹" + mailDetail.getMailNo() + "费用查询失败");
+                            return jsonObject;
+                        }
+                        freightFee += result.getFreightFee();
+                        rentFee += result.getRentFee();
+                        weight += result.getWeight();
+                    }
+
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("success", true);
-                    jsonObject.put("freightFee", 1200);
-                    jsonObject.put("rentFee", 200);
-                    jsonObject.put("weight", 1200);
+                    jsonObject.put("freightFee", freightFee);
+                    jsonObject.put("rentFee", rentFee);
+                    jsonObject.put("weight", weight);
                     return jsonObject;
                 }
                 case "pdd.service.conso.order.query": {