commit

PddServer/src/main/java/org/ta/pddserver/entity/CollectOutMailDetailEntity.java

@@ -55,25 +55,25 @@ public class CollectOutMailDetailEntity {
      * 状态 长
      */
     @TableField(value = "length")
-    private Integer length;
+    private Long length;
 
     /**
      * 状态 宽
      */
     @TableField(value = "width")
-    private Integer width;
+    private Long width;
 
     /**
      * 状态 高
      */
     @TableField(value = "height")
-    private Integer height;
+    private Long height;
 
     /**
      * 状态 重
      */
     @TableField(value = "weight")
-    private Integer weight;
+    private Long weight;
 
 
 }

PddServer/src/main/java/org/ta/pddserver/entity/LogisticsTicketEntity.java

+package org.ta.pddserver.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("co_biz_action_notify")
+@Data
+public class LogisticsTicketEntity {
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+    @TableField(value = "state")
+    private Integer state;
+
+    @TableField(value = "remarks")
+    private String remarks;
+
+    @TableField(value = "status")
+    private Integer status;
+
+    @TableField(value = "providerCode")
+    private String providerCode;
+
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+    @TableField(value = "bizAction")
+    private String bizAction;
+
+    @TableField(value = "bizActionDesc")
+    private String bizActionDesc;
+
+    @TableField(value = "executeTime")
+    private String executeTime;
+
+    @TableField(value = "timeZone")
+    private String timeZone;
+
+    @TableField(value = "unpackRemark")
+    private String unpackRemark;
+
+    @TableField(value = "packageInfos")
+    private String packageInfos;
+
+    @TableField(value = "result")
+    private String result;
+}

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

@@ -2,8 +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.CollectOrderDetailEntity;
+import org.ta.pddserver.entity.CollectOutMailDetailEntity;
 
 @Mapper
 public interface CollectOrderDetailMapper extends BaseMapper<CollectOrderDetailEntity> {
+
+    @Select("SELECT * FROM `collect_out_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0")
+    CollectOutMailDetailEntity getInfoByMailNo(@Param("mailNo") String mailNo);
 }

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

@@ -2,8 +2,11 @@ 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.LogOrderMailDetailEntity;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
+import org.ta.pddserver.model.api.response.MailNoResponse;
 
 import java.util.List;
 
@@ -15,4 +18,10 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
 
     @Select("SELECT * FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0;")
     LogOrderMailDetailEntity findByMailNo(String mailNo);
+
+    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` , `mailNo`, `length` , `width` , `height`, `weight` FROM `log_order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `mailNo` = #{mailNo} AND `state` > 0;")
+    List<LogOrderMailDetailListResponse> getListByCodeNo(@Param("logisticsOrderCode") String logisticsOrderCode, @Param("mailNo") String mailNo);
+
+    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0;")
+    MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo, @Param("status") String status);
 }

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

@@ -6,6 +6,9 @@ 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.model.api.response.LogOrderListResponse;
+
+import java.util.List;
 
 @Mapper
 public interface LogOrderMapper extends BaseMapper<LogOrderEntity> {
@@ -17,4 +20,7 @@ public interface LogOrderMapper extends BaseMapper<LogOrderEntity> {
 
     @Update("UPDATE `log_order` SET `status` = #{status} WHERE `uid` = #{uid};")
     int updateOrderStatusById(int status, String uid);
+
+    @Select("SELECT `uid`, `updated`, `logisticsOrderCode`, `bizType`, `buyerCode`, `consoType`, `dereRecogCode`, `packageQuantity`, `tags` FROM `log_order` WHERE  `logisticsOrderCode` = #{logisticsOrderCode}")
+    List<LogOrderListResponse> getListByRequest(@Param("logisticsOrderCode") String logisticsOrderCode);
 }

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class FinishUnpackRequest {
+
+    private String mailNo;
+
+    private String status;
+
+    private String action;
+
+    private Long length;
+
+    private Long width;
+
+    private Long height;
+
+    private Long weight;
+
+    private Long actualWeight;
+
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class InBoundRequest {
+
+    private String mailNo;
+
+    private String status;
+
+    private Long length;
+
+    private Long width;
+
+    private Long height;
+
+    private Long weight;
+
+    private Long actualWeight;
+
+    private String action;
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class LogOrderListRequest {
+
+    private String logisticsOrderCode;
+
+
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class LogOrderMailDetailListRequest {
+
+    private String logisticsOrderCode;
+
+    private String mailNo;
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class MailNoRequest {
+
+    private String mailNo;
+
+    private String status;
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class OutBoundRequest {
+
+    private String mailNo;
+
+    private String expressCode;
+
+    private String orderCode;
+
+    private String packageType;
+
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class ReceiveRequest {
+
+    private String action;
+
+    private String mailNo;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/CollectOutMailDetailResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectOutMailDetailResponse {
+
+    private String uid;
+    private String updated;
+    private String logisticsOrderCode;
+    private String bizType;
+    private String consoType;
+    private String dereRecogCode;
+    private int packageQuantity;
+    private String tags;
+    private String buyerCode;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/LogOrderListResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class LogOrderListResponse {
+
+    private String uid;
+    private String updated;
+    private String logisticsOrderCode;
+    private String bizType;
+    private String consoType;
+    private String dereRecogCode;
+    private int packageQuantity;
+    private String tags;
+    private String buyerCode;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/LogOrderMailDetailListResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class LogOrderMailDetailListResponse {
+
+    private String uid;
+    private String logisticsOrderCode;
+    private String expressCode;
+    private String mailNo;
+    private int length;
+    private int width;
+    private int height;
+    private int weight;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/MailNoResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class MailNoResponse {
+
+
+    private String logisticsOrderCode;
+    private String expressCode;
+    private String mailNo;
+    private String updated;
+}

PddServer/src/main/java/org/ta/pddserver/service/CollectOutMailDetailService.java

+package org.ta.pddserver.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.ta.pddserver.entity.CollectOrderDetailEntity;
+import org.ta.pddserver.entity.CollectOutMailDetailEntity;
+
+public interface CollectOutMailDetailService extends IService<CollectOutMailDetailEntity> {
+
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectcOutMailDetailImpl.java

+package org.ta.pddserver.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.ta.pddserver.entity.CollectOrderDetailEntity;
+import org.ta.pddserver.entity.CollectOutMailDetailEntity;
+import org.ta.pddserver.mapper.CollectOrderDetailMapper;
+import org.ta.pddserver.service.CollectOrderDetailService;
+
+@Service
+public class CollectcOutMailDetailImpl extends ServiceImpl<CollectOrderDetailMapper, CollectOrderDetailEntity> implements CollectOrderDetailService {
+
+
+    public CollectOutMailDetailEntity getInfoByMailNo(String mailNo) {
+        return baseMapper.getInfoByMailNo(mailNo);
+    }
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderImpl.java

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.LogOrderEntity;
 import org.ta.pddserver.mapper.LogOrderMapper;
+import org.ta.pddserver.model.api.request.LogOrderListRequest;
+import org.ta.pddserver.model.api.response.LogOrderListResponse;
 import org.ta.pddserver.service.LogOrderService;
 
+import java.util.List;
+
 @Service
 public class LogOrderImpl extends ServiceImpl<LogOrderMapper, LogOrderEntity> implements LogOrderService {
 
@@ -24,4 +28,10 @@ public class LogOrderImpl extends ServiceImpl<LogOrderMapper, LogOrderEntity> im
     public int updateOrderStatus(int status, String uid) {
         return baseMapper.updateOrderStatusById(status, uid);
     }
+
+
+    public List<LogOrderListResponse> getListByRequest(String logisticsOrderCode) {
+        List<LogOrderListResponse> list = baseMapper.getListByRequest(logisticsOrderCode);
+        return list;
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailImpl.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.LogOrderMailDetailEntity;
 import org.ta.pddserver.mapper.LogOrderMailDetailMapper;
+import org.ta.pddserver.model.api.request.LogOrderMailDetailListRequest;
+import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
+import org.ta.pddserver.model.api.response.MailNoResponse;
 import org.ta.pddserver.service.LogOrderMailDetailService;
 
 import java.util.List;
@@ -13,11 +16,18 @@ import java.util.List;
 public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper, LogOrderMailDetailEntity> implements LogOrderMailDetailService {
 
     public List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
-        List<LogOrderMailDetailEntity> list = baseMapper.getListByCode(logisticsOrderCode);
-        return list;
+        return baseMapper.getListByCode(logisticsOrderCode);
     }
 
     public LogOrderMailDetailEntity getByMailNo(String mailNo) {
         return baseMapper.findByMailNo(mailNo);
     }
+
+    public List<LogOrderMailDetailListResponse> getListByCodeNo(String logisticsOrderCode, String mailNo) {
+        return baseMapper.getListByCodeNo(logisticsOrderCode, mailNo);
+    }
+
+    public MailNoResponse getInfoByMailNo(String mailNo, String status) {
+        return baseMapper.getInfoByMailNo(mailNo, status);
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/utils/JsonResponse.java

@@ -37,4 +37,22 @@ public class JsonResponse {
         resp.put("message", message);
         return resp;
     }
+
+    public static JSONObject generateLocalCommonSuccessResponse(Object data) {
+        JSONObject resp = new JSONObject();
+        resp.put("success", true);
+        resp.put("reason_code", "0");
+        if (data != null) {
+            resp.put("data", data);
+        }
+        return resp;
+    }
+
+    public static JSONObject generateLocalCommonFailedResponse(String reason_code, String message) {
+        JSONObject resp = new JSONObject();
+        resp.put("success", false);
+        resp.put("reason_code", reason_code);
+        resp.put("message", message);
+        return resp;
+    }
 }

PddServer/src/main/java/org/ta/pddserver/utils/PddPriceTool.java

+package org.ta.pddserver.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PddPriceTool {
+
+    //首重重量
+    private static int initialWeight = 1000;
+    //上限重量
+    private static int maxWeight = 20000;
+
+    // 普货首重价格
+    private static int gInitalPrice = 1850;
+
+    //特货首重价格
+    private static int sInitalPrice = 2800;
+
+    //超重计费标准
+    private static int excessWeight = 500;
+
+    //超重价格
+    private static int excessPrice = 175;
+
+    //标椎三边长度
+    private static int standard = 100;
+
+    //标准三边之和
+    private static int maxStandard = 160;
+
+
+    /*
+    * 根据类型、重量（g） 计算运费
+    * */
+    public static  Map FreightCostCalculation(String type, int weight, int length, int width, int height)  {
+        Map map = new HashMap();
+
+        int price = 0;
+        boolean key = true;
+        int excess = 0;
+        int max = length + width + height;
+
+        //判断边长是否符合标准
+        if(length > standard || width > standard || height > standard || max > maxStandard) {
+            //三边各超100或者和超160
+            key = false;
+        }else {
+
+            // 判断重量是否超重
+            if (weight > maxWeight) {
+                //超重无法计算
+                key = false;
+            } else {
+                //分析重量
+                if (weight > initialWeight) {
+                    //计算超出重量
+                    weight = weight - initialWeight;
+                    excess = excessPrice * ((int) Math.ceil(weight / excessWeight));
+                }
+            }
+
+            if (key) {
+                //计算价格
+                if (type.equals("NORMAL")) {
+                    //普货
+                    price = gInitalPrice + excess;
+
+                } else {
+                    price = sInitalPrice + excess;
+                }
+            }
+        }
+        map.put("price", price);
+        map.put("key", key);
+        return map;
+    }
+}

PddServer/src/main/java/org/ta/pddserver/utils/TimeTool.java

+package org.ta.pddserver.utils;
+
+
+import org.springframework.stereotype.Component;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Component
+public class TimeTool {
+
+    public String getNowString() {
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(date);
+    }
+}
\ No newline at end of file