覆盖文件

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

@@ -64,11 +64,7 @@ public class PddFZController {
         List<TraceObjectEntity> list = traceObjectImpl.selectByTrackingNumber(code);
         List<TraceObject> traceObjects = new ArrayList<>();
         for (TraceObjectEntity traceObjectEntity : list) {
-            TraceObject traceObject = new TraceObject();
-
-            traceObject = TraceObject.createFromTraceEntity(traceObjectEntity);
-
-            dataObjects.getTraces().add(traceObject);
+            dataObjects.getTraces().add(TraceObject.createFromTraceEntity(traceObjectEntity));
         }
 
         return dataObjects;

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

@@ -5,11 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.ta.pddserver.entity.*;
-import org.ta.pddserver.model.ConsignmentOrder;
 import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
 import org.ta.pddserver.model.pddjy.request.*;
 import org.ta.pddserver.model.pddlg.common.TraceObject;
@@ -57,15 +55,34 @@ public class PddOpenController {
     TraceObjectImpl traceObjectImpl;
 
     @Resource
-    private OrderImpl orderImpl;
+    private LogOrderImpl orderImpl;
     @Resource
-    private OrderBuyerDetailImpl orderBuyerDetailImpl;
+    private LogOrderBuyerDetailImpl orderBuyerDetailImpl;
     @Resource
-    private OrderItemImpl orderItemImpl;
-    @Autowired
-    private OrderMailDetailImpl orderMailDetailImpl;
-    @Autowired
-    private OrderPaymentDetailImpl orderPaymentDetailImpl;
+    private LogOrderItemImpl orderItemImpl;
+    @Resource
+    private LogOrderMailDetailImpl orderMailDetailImpl;
+    @Resource
+    private LogOrderPaymentDetailImpl orderPaymentDetailImpl;
+
+    @Resource
+    CollectOrderImpl collectOrderImpl;
+    @Resource
+    CollectOrderLogisticsOrderCodeImpl collectOrderLogisticsOrderCodeImpl;
+    @Resource
+    CollectOrderSnImpl collectOrderSnImpl;
+    @Resource
+    CollectOrderDetailImpl collectOrderDetailImpl;
+    @Resource
+    CollectMailDetailImpl collectMailDetailImpl;
+    @Resource
+    CollectReceiverDetailImpl collectReceiverDetailImpl;
+    @Resource
+    CollectFreightFeeDetailImpl collectFreightFeeDetailImpl;
+    @Resource
+    CollectFreightFeeDetailDiscountDetailImpl collectFreightFeeDetailDiscountDetailImpl;
+    @Resource
+    CollectFreightFeeDetailFeeDetailImpl collectFreightFeeDetailFeeDetailImpl;
 
     @PostMapping("/pdd-open")
     public JSONObject pddOpenAPI(HttpServletRequest request,
@@ -263,7 +280,7 @@ public class PddOpenController {
         orderCreateEntity.setTags(JSONObject.toJSONString(createParam.getTags()));
         orderCreateImpl.save(orderCreateEntity);
 
-        OrderEntity orderEntity = new OrderEntity();
+        LogOrderEntity orderEntity = new LogOrderEntity();
         orderEntity.setUid(orderCreateEntity.getUid());
         orderEntity.setCreated(orderCreateEntity.getCreated());
         orderEntity.setUpdated(orderCreateEntity.getUpdated());
@@ -279,7 +296,7 @@ public class PddOpenController {
         orderEntity.setPackageQuantity(orderCreateEntity.getPackageQuantity());
         orderImpl.save(orderEntity);
 
-        OrderBuyerDetailEntity orderBuyerDetailEntity = new OrderBuyerDetailEntity();
+        LogOrderBuyerDetailEntity orderBuyerDetailEntity = new LogOrderBuyerDetailEntity();
         orderBuyerDetailEntity.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
         orderBuyerDetailEntity.setName(createParam.getBuyerDetail().getName());
         orderBuyerDetailEntity.setTelePhone(createParam.getBuyerDetail().getTelePhone());
@@ -292,7 +309,7 @@ public class PddOpenController {
         orderBuyerDetailImpl.save(orderBuyerDetailEntity);
 
         for (PddServiceConsoOrderCreateRequest.Item item: createParam.getItems()) {
-            OrderItemEntity orderItemEntity = new OrderItemEntity();
+            LogOrderItemEntity orderItemEntity = new LogOrderItemEntity();
             orderItemEntity.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
             orderItemEntity.setItemId(item.getItemId());
             orderItemEntity.setItemName(item.getItemName());
@@ -311,13 +328,15 @@ public class PddOpenController {
         }
 
         for (PddServiceConsoOrderCreateRequest.MailDetail mailDetail: createParam.getMailDetails()) {
-            OrderMailDetailEntity orderMailDetail = new OrderMailDetailEntity();
+            LogOrderMailDetailEntity orderMailDetail = new LogOrderMailDetailEntity();
+            orderMailDetail.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
             orderMailDetail.setExpressCode(mailDetail.getExpressCode());
             orderMailDetail.setMailNo(mailDetail.getMailNo());
             orderMailDetailImpl.save(orderMailDetail);
         }
 
-        OrderPaymentDetailEntity orderPaymentDetailEntity = new OrderPaymentDetailEntity();
+        LogOrderPaymentDetailEntity orderPaymentDetailEntity = new LogOrderPaymentDetailEntity();
+        orderPaymentDetailEntity.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
         orderPaymentDetailEntity.setTradeOrderSn(createParam.getPaymentDetail().getTradeOrderSn());
         orderPaymentDetailEntity.setTradeOrderValue(createParam.getPaymentDetail().getTradeOrderValue());
         orderPaymentDetailEntity.setTradeOrderActualAmount(createParam.getPaymentDetail().getTradeOrderActualAmount());
@@ -345,8 +364,153 @@ public class PddOpenController {
         outboundNoticeEntity.setMailDetails(JSONObject.toJSONString(noticeParam.getMailDetails()));
         outboundNoticeEntity.setReceiverDetail(JSONObject.toJSONString(noticeParam.getReceiverDetail()));
         outboundNoticeEntity.setFreightFeeDetail(JSONObject.toJSONString(noticeParam.getFreightFeeDetail()));
-
         outboundNoticeImpl.save(outboundNoticeEntity);
+
+        // 合包单
+        CollectOrderEntity collectOrderEntity = generateCollectOrder(noticeParam, outboundNoticeEntity);
+        collectOrderImpl.save(collectOrderEntity);
+
+        // 合包单集运单
+        if (noticeParam.getLogisticsOrderCodes() != null && !noticeParam.getLogisticsOrderCodes().isEmpty()) {
+            for (PddServiceConsoOutboundNoticeRequest.LogisticsOrderCode logisticsOrderCode : noticeParam.getLogisticsOrderCodes()){
+                CollectOrderLogisticsOrderCodeEntity collectOrderLogisticsOrderCodeEntity = new CollectOrderLogisticsOrderCodeEntity();
+                collectOrderLogisticsOrderCodeEntity.setLogisticsOrderCode(logisticsOrderCode.getLogisticsOrderCode());
+                collectOrderLogisticsOrderCodeEntity.setOrderCode(collectOrderEntity.getOrderCode());
+                collectOrderLogisticsOrderCodeImpl.save(collectOrderLogisticsOrderCodeEntity);
+            }
+        }
+
+        // 合包单一段单号
+        if (noticeParam.getOrderSns() != null && !noticeParam.getOrderSns().isEmpty()) {
+            for (PddServiceConsoOutboundNoticeRequest.OrderSn orderSn : noticeParam.getOrderSns()){
+                CollectOrderSnEntity snEntity = new CollectOrderSnEntity();
+                snEntity.setOrderSn(orderSn.getOrderSn());
+                snEntity.setOrderCode(collectOrderEntity.getOrderCode());
+                collectOrderSnImpl.save(snEntity);
+            }
+        }
+
+        // 一段订单详情列表
+        if (noticeParam.getOrderDetails() != null && !noticeParam.getOrderDetails().isEmpty()) {
+            for (PddServiceConsoOutboundNoticeRequest.OrderDetail orderDetail : noticeParam.getOrderDetails()){
+                CollectOrderDetailEntity orderDetailEntity = new CollectOrderDetailEntity();
+                orderDetailEntity.setOrderCode(collectOrderEntity.getOrderCode());
+                orderDetailEntity.setOrderSn(orderDetail.getOrderSn());
+                orderDetailEntity.setLogisticsOrderCode(orderDetail.getLogisticsOrderCode());
+                orderDetailEntity.setItemId(orderDetail.getItemId());
+                orderDetailEntity.setItemName(orderDetail.getItemName());
+                orderDetailEntity.setCategoryId(orderDetail.getCategoryId());
+                orderDetailEntity.setCategoryName(orderDetail.getCategoryName());
+                orderDetailEntity.setItemQuantity(orderDetail.getItemQuantity());
+                orderDetailEntity.setWeightTotal(orderDetail.getWeightTotal());
+                orderDetailEntity.setActualAmount(orderDetail.getActualAmount());
+                orderDetailEntity.setProductName(orderDetail.getProductName());
+                orderDetailEntity.setExportDecAmount(orderDetail.getExportDecAmount());
+                collectOrderDetailImpl.save(orderDetailEntity);
+            }
+        }
+
+        // 生产销售企业
+
+        // 运单详情
+        if (noticeParam.getMailDetails() != null && !noticeParam.getMailDetails().isEmpty()) {
+            for (PddServiceConsoOutboundNoticeRequest.MailDetail mailDetail : noticeParam.getMailDetails()){
+                CollectMailDetailEntity mailDetailEntity = new CollectMailDetailEntity();
+                mailDetailEntity.setOrderCode(collectOrderEntity.getOrderCode());
+                mailDetailEntity.setExpressCode(mailDetail.getExpressCode());
+                mailDetailEntity.setMailNo(mailDetail.getMailNo());
+                mailDetailEntity.setConsoWarehouseCode(mailDetail.getConsoWarehouseCode());
+                collectMailDetailImpl.save(mailDetailEntity);
+            }
+        }
+
+        // 收货人
+        if (noticeParam.getReceiverDetail() != null) {
+            CollectReceiverDetailEntity collectReceiverDetailEntity = generateCollectReceiverDetailEntity(noticeParam, collectOrderEntity);
+            collectReceiverDetailImpl.save(collectReceiverDetailEntity);
+        }
+
+        // 运费详情
+        PddServiceConsoOutboundNoticeRequest.FreightFeeDetail freightFeeDetail = noticeParam.getFreightFeeDetail();
+        if (freightFeeDetail != null) {
+            CollectFreightFeeDetailEntity collectFreightFeeDetailEntity = generateCollectFreightFeeDetailEntity(collectOrderEntity, freightFeeDetail);
+            collectFreightFeeDetailImpl.save(collectFreightFeeDetailEntity);
+            // 优惠详情
+            if (freightFeeDetail.getDiscountDetails() != null && !freightFeeDetail.getDiscountDetails().isEmpty()) {} {
+                for (PddServiceConsoOutboundNoticeRequest.FreightFeeDetail.DiscountDetail discountDetail : freightFeeDetail.getDiscountDetails()) {
+                    CollectFreightFeeDetailDiscountDetailEntity detailDiscountDetailEntity = new CollectFreightFeeDetailDiscountDetailEntity();
+                    detailDiscountDetailEntity.setOrderCode(collectOrderEntity.getOrderCode());
+                    detailDiscountDetailEntity.setDiscountType(discountDetail.getDiscountType());
+                    detailDiscountDetailEntity.setDiscountFee(discountDetail.getDiscountFee());
+                    collectFreightFeeDetailDiscountDetailImpl.save(detailDiscountDetailEntity);
+                }
+            }
+            // 费用详情
+            if (freightFeeDetail.getFeeDetails() != null && !freightFeeDetail.getFeeDetails().isEmpty()) {} {
+                for (PddServiceConsoOutboundNoticeRequest.FreightFeeDetail.FeeDetail feeDetail : freightFeeDetail.getFeeDetails()) {
+                    CollectFreightFeeDetailFeeDetailEntity feeDetailFeeDetail = generateCollectFreightFeeDetailFeeDetailEntity(feeDetail, collectOrderEntity);
+                    collectFreightFeeDetailFeeDetailImpl.save(feeDetailFeeDetail);
+                }
+            }
+        }
+    }
+
+    private static CollectFreightFeeDetailFeeDetailEntity generateCollectFreightFeeDetailFeeDetailEntity(PddServiceConsoOutboundNoticeRequest.FreightFeeDetail.FeeDetail feeDetail, CollectOrderEntity collectOrderEntity) {
+        CollectFreightFeeDetailFeeDetailEntity feeDetailFeeDetail = new CollectFreightFeeDetailFeeDetailEntity();
+        feeDetailFeeDetail.setOrderCode(collectOrderEntity.getOrderCode());
+        feeDetailFeeDetail.setScene(feeDetail.getScene());
+        feeDetailFeeDetail.setType(feeDetail.getType());
+        feeDetailFeeDetail.setAmount(feeDetail.getAmount());
+        feeDetailFeeDetail.setCurrencyUnit(feeDetail.getCurrencyUnit());
+        feeDetailFeeDetail.setCurrency(feeDetail.getCurrency());
+        return feeDetailFeeDetail;
+    }
+
+    private static CollectFreightFeeDetailEntity generateCollectFreightFeeDetailEntity(CollectOrderEntity collectOrderEntity, PddServiceConsoOutboundNoticeRequest.FreightFeeDetail freightFeeDetail) {
+        CollectFreightFeeDetailEntity collectFreightFeeDetailEntity = new CollectFreightFeeDetailEntity();
+        collectFreightFeeDetailEntity.setOrderCode(collectOrderEntity.getOrderCode());
+        collectFreightFeeDetailEntity.setPayOrderId(freightFeeDetail.getPayOrderId());
+        collectFreightFeeDetailEntity.setPayTime(freightFeeDetail.getPayTime());
+        collectFreightFeeDetailEntity.setWeight(freightFeeDetail.getWeight());
+        collectFreightFeeDetailEntity.setFreightPrice(freightFeeDetail.getFreightPrice());
+        collectFreightFeeDetailEntity.setFreightPackageType(freightFeeDetail.getFreightPackageType());
+        collectFreightFeeDetailEntity.setGoodsType(freightFeeDetail.getGoodsType());
+        collectFreightFeeDetailEntity.setCurrencyUnit(freightFeeDetail.getCurrencyUnit());
+        collectFreightFeeDetailEntity.setCurrency(freightFeeDetail.getCurrency());
+        collectFreightFeeDetailEntity.setDeclareAmount(freightFeeDetail.getDeclareAmount());
+        collectFreightFeeDetailEntity.setDiscountFee(freightFeeDetail.getDiscountFee());
+        return collectFreightFeeDetailEntity;
+    }
+
+    private static CollectReceiverDetailEntity generateCollectReceiverDetailEntity(PddServiceConsoOutboundNoticeRequest noticeParam, CollectOrderEntity collectOrderEntity) {
+        CollectReceiverDetailEntity collectReceiverDetailEntity = new CollectReceiverDetailEntity();
+        collectReceiverDetailEntity.setOrderCode(collectOrderEntity.getOrderCode());
+        collectReceiverDetailEntity.setName(noticeParam.getReceiverDetail().getName());
+        collectReceiverDetailEntity.setIdNumber(noticeParam.getReceiverDetail().getIdNumber());
+        collectReceiverDetailEntity.setTelePhone(noticeParam.getReceiverDetail().getTelePhone());
+        collectReceiverDetailEntity.setCountry(noticeParam.getReceiverDetail().getCountry());
+        collectReceiverDetailEntity.setProvince(noticeParam.getReceiverDetail().getProvince());
+        collectReceiverDetailEntity.setCity(noticeParam.getReceiverDetail().getCity());
+        collectReceiverDetailEntity.setDistrict(noticeParam.getReceiverDetail().getDistrict());
+        collectReceiverDetailEntity.setDetailAddress(noticeParam.getReceiverDetail().getDetailAddress());
+        collectReceiverDetailEntity.setPostCode(noticeParam.getReceiverDetail().getPostCode());
+        return collectReceiverDetailEntity;
+    }
+
+    private static CollectOrderEntity generateCollectOrder(PddServiceConsoOutboundNoticeRequest noticeParam, OutboundNoticeEntity outboundNoticeEntity) {
+        CollectOrderEntity collectOrderEntity = new CollectOrderEntity();
+        collectOrderEntity.setUid(outboundNoticeEntity.getUid());
+        collectOrderEntity.setProviderCode(noticeParam.getProviderCode());
+        collectOrderEntity.setConsoWarehouseCode(noticeParam.getConsoWarehouseCode());
+        collectOrderEntity.setOrderCode(noticeParam.getOrderCode());
+        collectOrderEntity.setBuyerCode(noticeParam.getBuyerCode());
+        collectOrderEntity.setTradeOrderActualAmountTotal(noticeParam.getTradeOrderActualAmountTotal());
+        collectOrderEntity.setItemQuantityTotal(noticeParam.getItemQuantityTotal());
+        collectOrderEntity.setSegmentCode(noticeParam.getSegmentCode());
+        collectOrderEntity.setConsoType(noticeParam.getConsoType());
+        collectOrderEntity.setDeliveryType(noticeParam.getDeliveryType());
+        collectOrderEntity.setStationCode(noticeParam.getStationCode());
+        return collectOrderEntity;
     }
 
     public void OrderUpdate(PddServiceConsoOrderUpdateRequest updateRequest) {
@@ -366,8 +530,8 @@ public class PddOpenController {
         List<PddServiceConsoOrderUpdateRequest.MailDetail> listNew = updateRequest.getMailDetails();
 
         //根据集运单号获取运单详情列表
-        List<OrderMailDetailEntity> list = orderMailDetailImpl.getListByCode(orderUpdateEntity.getLogisticsOrderCode());
-        for(OrderMailDetailEntity orderMailDetailEntity : list){
+        List<LogOrderMailDetailEntity> list = orderMailDetailImpl.getListByCode(orderUpdateEntity.getLogisticsOrderCode());
+        for(LogOrderMailDetailEntity orderMailDetailEntity : list){
             for(PddServiceConsoOrderUpdateRequest.MailDetail  mailDetail : listNew){
                 if(orderMailDetailEntity.getMailNo().equals(mailDetail.getMailNo())){
                     //相同，删除
@@ -380,13 +544,13 @@ public class PddOpenController {
 
         //判断是否有剩余
         for(PddServiceConsoOrderUpdateRequest.MailDetail  mailDetail : listNew){
-            OrderMailDetailEntity orderMailDetailEntity = new OrderMailDetailEntity();
+            LogOrderMailDetailEntity orderMailDetailEntity = new LogOrderMailDetailEntity();
             orderMailDetailEntity.setExpressCode(mailDetail.getExpressCode());
             orderMailDetailEntity.setMailNo(mailDetail.getMailNo());
             orderMailDetailImpl.save(orderMailDetailEntity);
         }
 
-        for(OrderMailDetailEntity orderMailDetailEntity : list){
+        for(LogOrderMailDetailEntity orderMailDetailEntity : list){
             orderMailDetailImpl.removeById(orderMailDetailEntity.getUid());
         }
 

PddServer/src/main/java/org/ta/pddserver/entity/CollectFreightFeeDetailDiscountDetailEntity.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;
+import org.ta.pddserver.model.pddjy.request.PddServiceConsoOutboundNoticeRequest;
+
+import java.util.List;
+
+@Data
+@TableName("collect_freight_fee_detail_discount_detail")
+public class CollectFreightFeeDetailDiscountDetailEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+
+    /**
+     * 合包单号（必填）
+     */
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+
+    /**
+     * 优惠类型（非必填，如FIRST_WEIGHT_REDUCTION_SF2208-首重减免）
+     */
+    @TableField(value = "discountType")
+    private String discountType;
+
+    /**
+     * 优惠金额（非必填）
+     */
+    @TableField(value = "discountFee")
+    private String discountFee;
+
+
+}

PddServer/src/main/java/org/ta/pddserver/entity/CollectFreightFeeDetailEntity.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;
+import org.ta.pddserver.model.pddjy.request.PddServiceConsoOutboundNoticeRequest;
+
+import java.util.List;
+
+@Data
+@TableName("collect_freight_fee_detail")
+public class CollectFreightFeeDetailEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+
+    /**
+     * 合包单号（必填）
+     */
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+
+    /**
+     * 支付交易订单号（必填）
+     */
+    @TableField(value = "payOrderId")
+    private String payOrderId;
+
+    /**
+     * 支付时间（必填）
+     */
+    @TableField(value = "payTime")
+    private String payTime;
+
+    /**
+     * 计费重量（单位：克，必填）
+     */
+    @TableField(value = "weight")
+    private Long weight;
+
+    /**
+     * 运费金额（包含gst费用和仓租，必填）
+     */
+    @TableField(value = "freightPrice")
+    private String freightPrice;
+
+    /**
+     * 计费包裹类型（非必填，默认普通件不传，SMALL：小件，BIG：大件）
+     */
+    @TableField(value = "freightPackageType")
+    private String freightPackageType;
+
+    /**
+     * 渠道类型（非必填，NORMAL-普货；SPECIAL-特货）
+     */
+    @TableField(value = "goodsType")
+    private String goodsType;
+
+    /**
+     * 货币单位（非必填，CENT：分）
+     */
+    @TableField(value = "currencyUnit")
+    private String currencyUnit;
+
+    /**
+     * 币种（非必填，CNY：人民币）
+     */
+    @TableField(value = "currency")
+    private String currency;
+
+    /**
+     * 申报金额（非必填，segmentCode=SENDTORECEVER时赋值）
+     */
+    @TableField(value = "declareAmount")
+    private Long declareAmount;
+
+    /**
+     * 优惠总金额（非必填）
+     */
+    @TableField(value = "discountFee")
+    private String discountFee;
+
+}

PddServer/src/main/java/org/ta/pddserver/entity/CollectFreightFeeDetailFeeDetailEntity.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;
+import org.ta.pddserver.model.pddjy.request.PddServiceConsoOutboundNoticeRequest;
+
+import java.util.List;
+
+@Data
+@TableName("collect_freight_fee_detail_fee_detail")
+public class CollectFreightFeeDetailFeeDetailEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+
+    /**
+     * 合包单号（必填）
+     */
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+
+    /**
+     * 场景（必填，枚举值：freight_fee-运费；rent_fee-仓租；gst-商品和服务税；remote_surcharge-偏远附加费；free_shipping_fee-包邮补贴；big_freight_extra_fee-大件附加费）
+     */
+    @TableField(value = "scene")
+    private String scene;
+
+    /**
+     * 费用类型（必填，同scene枚举值）
+     */
+    @TableField(value = "type")
+    private String type;
+
+    /**
+     * 费用金额（必填）
+     */
+    @TableField(value = "amount")
+    private Long amount;
+
+    /**
+     * 货币单位（必填，CENT：分）
+     */
+    @TableField(value = "currencyUnit")
+    private String currencyUnit;
+
+    /**
+     * 币种（必填，CNY：人民币）
+     */
+    @TableField(value = "currency")
+    private String currency;
+
+
+}

PddServer/src/main/java/org/ta/pddserver/entity/CollectMailDetailEntity.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;
+
+@Data
+@TableName("collect_mail_detail")
+public class CollectMailDetailEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+
+    /**
+     * 合包单号（必填）
+     */
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+
+    /**
+     * 快递公司编号（必填）
+     */
+    @TableField(value = "expressCode")
+    private String expressCode;
+
+    /**
+     * 运单号（必填）
+     */
+    @TableField(value = "mailNo")
+    private String mailNo;
+
+    /**
+     * 包裹对应的仓库编码（非必填）
+     */
+    @TableField(value = "consoWarehouseCode")
+    private String consoWarehouseCode;
+
+
+}

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

@@ -19,82 +19,95 @@ public class CollectOrderDetailEntity {
     @TableField(value = "updated")
     private String updated;
 
-    @TableField(value = "orderCode")
+
     /**
      * 合包单号（必填）
      */
+    @TableField(value = "orderCode")
     private String orderCode;
 
-    @TableField(value = "orderSn")
+
     /**
      * 一段订单号（非必填）
      */
+    @TableField(value = "orderSn")
     private String orderSn;
 
-    @TableField(value = "logisticsOrderCode")
+
     /**
      * 集运订单号（非必填）
      */
+    @TableField(value = "logisticsOrderCode")
     private String logisticsOrderCode;
 
-    @TableField(value = "itemId")
+
     /**
      * 商品ID（非必填）
      */
+    @TableField(value = "itemId")
     private String itemId;
 
-    @TableField(value = "itemName")
+
     /**
      * 商品名称（非必填）
      */
+    @TableField(value = "itemName")
     private String itemName;
 
-    @TableField(value = "categoryId")
+
     /**
      * 类目id（非必填）
      */
+    @TableField(value = "categoryId")
     private Long categoryId;
 
-    @TableField(value = "categoryName")
+
     /**
      * 类目名称（非必填）
      */
+    @TableField(value = "categoryName")
     private String categoryName;
 
-    @TableField(value = "itemQuantity")
+
     /**
      * 商品数量（非必填）
      */
+    @TableField(value = "itemQuantity")
     private Integer itemQuantity;
 
-    @TableField(value = "weightTotal")
+
     /**
      * 该订单下参与本次合包的包裹总重量（计费重，单位：克，非必填）
      */
+    @TableField(value = "weightTotal")
     private Long weightTotal;
 
-    @TableField(value = "actualAmount")
+
     /**
      * 订单支付金额（默认人民币，单位：分，非必填）
      */
+    @TableField(value = "actualAmount")
     private Long actualAmount;
 
-    @TableField(value = "productName")
+
     /**
      * 品名（非必填）
      */
+    @TableField(value = "productName")
     private String productName;
 
-    @TableField(value = "exportDecAmount")
+
     /**
      * 出口申报金额（消费者实付金额+平台优惠金额，默认人民币，单位：分，非必填。二次合包为0）
      */
+    @TableField(value = "exportDecAmount")
     private Long exportDecAmount;
 
-    @TableField(value = "manufacturerId")
+
     /**
      * 生产销售主体ID
      */
+    @TableField(value = "manufacturerId")
     private String manufacturerId;
 
 }

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

@@ -53,7 +53,6 @@ public class CollectOrderEntity {
     private String buyerCode;
 
 
-
     /**
      * 订单支付总金额（默认人民币，单位：分，非必填）
      */
@@ -90,24 +89,4 @@ public class CollectOrderEntity {
     @TableField(value = "stationCode")
     private String stationCode;
 
-    /**
-     * 一段订单详情列表（非必填）
-     */
-    private List<OrderDetail> orderDetails;
-
-    /**
-     * 运单详情列表（必填）
-     */
-    private List<MailDetail> mailDetails;
-
-    /**
-     * 收货人详情（必填）
-     */
-    private ReceiverDetail receiverDetail;
-
-    /**
-     * 运费详情（必填）
-     */
-    private FreightFeeDetail freightFeeDetail;
-
 }

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

@@ -19,16 +19,17 @@ public class CollectOrderSnEntity {
     @TableField(value = "updated")
     private String updated;
 
-    @TableField(value = "orderCode")
     /**
      * 合包单号（必填）
      */
+    @TableField(value = "orderCode")
     private String orderCode;
 
-    @TableField(value = "orderSn")
+
     /**
      * 一段订单号（必填）
      */
+    @TableField(value = "orderSn")
     private String orderSn;
 
 

PddServer/src/main/java/org/ta/pddserver/entity/CollectReceiverDetailEntity.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;
+
+@Data
+@TableName("collect_order_receiver_detail")
+public class CollectReceiverDetailEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+
+    /**
+     * 合包单号（必填）
+     */
+    @TableField(value = "orderCode")
+    private String orderCode;
+
+
+    /**
+     * 收件人姓名（必填）
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
+     * 收件人证件号码（非必填）
+     */
+    @TableField(value = "idNumber")
+    private String idNumber;
+
+    /**
+     * 手机号/固定电话（必填）
+     */
+    @TableField(value = "telePhone")
+    private String telePhone;
+
+    /**
+     * 地区/国家（必填）
+     */
+    @TableField(value = "country")
+    private String country;
+
+    /**
+     * 省（必填）
+     */
+    @TableField(value = "province")
+    private String province;
+
+    /**
+     * 市（必填）
+     */
+    @TableField(value = "city")
+    private String city;
+
+    /**
+     * 区（必填）
+     */
+    @TableField(value = "district")
+    private String district;
+
+    /**
+     * 详细地址（必填）
+     */
+    @TableField(value = "detailAddress")
+    private String detailAddress;
+
+    /**
+     * 邮编（非必填）
+     */
+    @TableField(value = "postCode")
+    private String postCode;
+
+
+}

PddServer/src/main/java/org/ta/pddserver/entity/OrderBuyerDetailEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderBuyerDetailEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("order_buyer_detail")
-public class OrderBuyerDetailEntity {
+@TableName("log_order_buyer_detail")
+public class LogOrderBuyerDetailEntity {
 
 
     @TableId(value = "uid")

PddServer/src/main/java/org/ta/pddserver/entity/OrderEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("order")
-public class OrderEntity {
+@TableName("log_order")
+public class LogOrderEntity {
 
 
     @TableId(value = "uid")

PddServer/src/main/java/org/ta/pddserver/entity/OrderItemEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderItemEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("order_item")
-public class OrderItemEntity {
+@TableName("log_order_item")
+public class LogOrderItemEntity {
 
 
     @TableId(value = "uid")

PddServer/src/main/java/org/ta/pddserver/entity/OrderMailDetailEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderMailDetailEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("order_mail_detail")
-public class OrderMailDetailEntity {
+@TableName("log_order_mail_detail")
+public class LogOrderMailDetailEntity {
 
 
     @TableId(value = "uid")

PddServer/src/main/java/org/ta/pddserver/entity/OrderPaymentDetailEntity.java → PddServer/src/main/java/org/ta/pddserver/entity/LogOrderPaymentDetailEntity.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
-@TableName("order_payment_detail")
-public class OrderPaymentDetailEntity {
+@TableName("log_order_payment_detail")
+public class LogOrderPaymentDetailEntity {
 
 
     @TableId(value = "uid")

PddServer/src/main/java/org/ta/pddserver/entity/ManufacturerEntity.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;
+
+@Data
+@TableName("manufacturer")
+public class ManufacturerEntity {
+
+
+    @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 = "producerEnterpriseName")
+    private String producerEnterpriseName;
+
+    /**
+     * 主体类型（非必填，企业店/个人店）
+     */
+    @TableField(value = "producerType")
+    private String producerType;
+
+    /**
+     * 企业统一社会信用代码（非必填）
+     */
+    @TableField(value = "producerEnterpriseCode")
+    private String producerEnterpriseCode;
+
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectFreightFeeDetailDiscountDetailEntity;
+
+@Mapper
+public interface CollectFreightFeeDetailDiscountDetailMapper extends BaseMapper<CollectFreightFeeDetailDiscountDetailEntity> {
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectFreightFeeDetailFeeDetailEntity;
+
+@Mapper
+public interface CollectFreightFeeDetailFeeDetailMapper extends BaseMapper<CollectFreightFeeDetailFeeDetailEntity> {
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectFreightFeeDetailEntity;
+
+@Mapper
+public interface CollectFreightFeeDetailMapper extends BaseMapper<CollectFreightFeeDetailEntity> {
+}

PddServer/src/main/java/org/ta/pddserver/mapper/OrderPaymentDetailMapper.java → PddServer/src/main/java/org/ta/pddserver/mapper/CollectMailDetailMapper.java

@@ -2,9 +2,8 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.ta.pddserver.entity.OrderPaymentDetailEntity;
+import org.ta.pddserver.entity.CollectMailDetailEntity;
 
 @Mapper
-public interface OrderPaymentDetailMapper extends BaseMapper<OrderPaymentDetailEntity> {
-
+public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEntity> {
 }

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectOrderDetailEntity;
+
+@Mapper
+public interface CollectOrderDetailMapper extends BaseMapper<CollectOrderDetailEntity> {
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectOrderLogisticsOrderCodeEntity;
+
+@Mapper
+public interface CollectOrderLogisticsOrderCodeMapper extends BaseMapper<CollectOrderLogisticsOrderCodeEntity> {
+}

PddServer/src/main/java/org/ta/pddserver/mapper/OrderBuyerDetailMapper.java → PddServer/src/main/java/org/ta/pddserver/mapper/CollectOrderMapper.java

@@ -2,9 +2,8 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.ta.pddserver.entity.OrderBuyerDetailEntity;
+import org.ta.pddserver.entity.CollectOrderEntity;
 
 @Mapper
-public interface OrderBuyerDetailMapper extends BaseMapper<OrderBuyerDetailEntity> {
-
+public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 }

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectOrderSnEntity;
+
+@Mapper
+public interface CollectOrderSnMapper extends BaseMapper<CollectOrderSnEntity> {
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.CollectReceiverDetailEntity;
+
+@Mapper
+public interface CollectReceiverDetailMapper extends BaseMapper<CollectReceiverDetailEntity> {
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.LogOrderBuyerDetailEntity;
+
+@Mapper
+public interface LogOrderBuyerDetailMapper extends BaseMapper<LogOrderBuyerDetailEntity> {
+
+}

PddServer/src/main/java/org/ta/pddserver/mapper/OrderItemMapper.java → PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderItemMapper.java

@@ -2,9 +2,9 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.ta.pddserver.entity.OrderItemEntity;
+import org.ta.pddserver.entity.LogOrderItemEntity;
 
 @Mapper
-public interface OrderItemMapper extends BaseMapper<OrderItemEntity> {
+public interface LogOrderItemMapper extends BaseMapper<LogOrderItemEntity> {
 
 }

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

@@ -3,13 +3,13 @@ package org.ta.pddserver.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
-import org.ta.pddserver.entity.OrderMailDetailEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailEntity;
 
 import java.util.List;
 
 @Mapper
-public interface OrderMailDetailMapper extends BaseMapper<OrderMailDetailEntity> {
+public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailEntity> {
 
-    @Select("SELECT * FROM `order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `state` > 0;")
-    List<OrderMailDetailEntity> getListByCode(String logisticsOrderCode);
+    @Select("SELECT * FROM `log_order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `state` > 0;")
+    List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode);
 }

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

@@ -2,15 +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.Select;
 import org.apache.ibatis.annotations.Update;
-import org.ta.pddserver.entity.OrderCreateEntity;
-import org.ta.pddserver.entity.OrderEntity;
-
-import java.util.List;
+import org.ta.pddserver.entity.LogOrderEntity;
 
 @Mapper
-public interface OrderMapper extends BaseMapper<OrderEntity> {
-    @Update("UPDATE `order` SET `packageQuantity` = ${packageQuantity} WHERE `logisticsOrderCode` = #{logisticsOrderCode};")
+public interface LogOrderMapper extends BaseMapper<LogOrderEntity> {
+    @Update("UPDATE `log_order` SET `packageQuantity` = ${packageQuantity} WHERE `logisticsOrderCode` = #{logisticsOrderCode};")
     Boolean savePackageQuantity(String logisticsOrderCode, long packageQuantity);
 }

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.ta.pddserver.entity.LogOrderPaymentDetailEntity;
+
+@Mapper
+public interface LogOrderPaymentDetailMapper extends BaseMapper<LogOrderPaymentDetailEntity> {
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

PddServer/src/main/java/org/ta/pddserver/service/OrderMailDetailService.java → PddServer/src/main/java/org/ta/pddserver/service/CollectOrderService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.OrderMailDetailEntity;
-
-public interface OrderMailDetailService extends IService<OrderMailDetailEntity> {
+import org.ta.pddserver.entity.CollectOrderEntity;
 
+public interface CollectOrderService extends IService<CollectOrderEntity> {
 
 }

PddServer/src/main/java/org/ta/pddserver/service/OrderBuyerDetailService.java → PddServer/src/main/java/org/ta/pddserver/service/CollectOrderSnService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.OrderBuyerDetailEntity;
-
-public interface OrderBuyerDetailService extends IService<OrderBuyerDetailEntity> {
+import org.ta.pddserver.entity.CollectOrderSnEntity;
 
+public interface CollectOrderSnService extends IService<CollectOrderSnEntity> {
 
 }

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

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

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

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

PddServer/src/main/java/org/ta/pddserver/service/OrderItemService.java → PddServer/src/main/java/org/ta/pddserver/service/LogOrderItemService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.OrderItemEntity;
+import org.ta.pddserver.entity.LogOrderItemEntity;
 
-public interface OrderItemService extends IService<OrderItemEntity> {
+public interface LogOrderItemService extends IService<LogOrderItemEntity> {
 
 
 }

PddServer/src/main/java/org/ta/pddserver/service/OrderPaymentDetailService.java → PddServer/src/main/java/org/ta/pddserver/service/LogOrderMailDetailService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.OrderPaymentDetailEntity;
+import org.ta.pddserver.entity.LogOrderMailDetailEntity;
 
-public interface OrderPaymentDetailService extends IService<OrderPaymentDetailEntity> {
+public interface LogOrderMailDetailService extends IService<LogOrderMailDetailEntity> {
 
 
 }

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

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

PddServer/src/main/java/org/ta/pddserver/service/OrderService.java → PddServer/src/main/java/org/ta/pddserver/service/LogOrderService.java

 package org.ta.pddserver.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.ta.pddserver.entity.OrderEntity;
+import org.ta.pddserver.entity.LogOrderEntity;
 
-public interface OrderService extends IService<OrderEntity> {
+public interface LogOrderService extends IService<LogOrderEntity> {
 
 
 }

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectFreightFeeDetailDiscountDetailImpl.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.CollectFreightFeeDetailDiscountDetailEntity;
+import org.ta.pddserver.mapper.CollectFreightFeeDetailDiscountDetailMapper;
+import org.ta.pddserver.service.CollectFreightFeeDetailDiscountDetailService;
+
+@Service
+public class CollectFreightFeeDetailDiscountDetailImpl extends ServiceImpl<CollectFreightFeeDetailDiscountDetailMapper, CollectFreightFeeDetailDiscountDetailEntity> implements CollectFreightFeeDetailDiscountDetailService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectFreightFeeDetailFeeDetailImpl.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.CollectFreightFeeDetailFeeDetailEntity;
+import org.ta.pddserver.mapper.CollectFreightFeeDetailFeeDetailMapper;
+import org.ta.pddserver.service.CollectFreightFeeDetailFeeDetailService;
+
+@Service
+public class CollectFreightFeeDetailFeeDetailImpl extends ServiceImpl<CollectFreightFeeDetailFeeDetailMapper, CollectFreightFeeDetailFeeDetailEntity> implements CollectFreightFeeDetailFeeDetailService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectFreightFeeDetailImpl.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.CollectFreightFeeDetailEntity;
+import org.ta.pddserver.mapper.CollectFreightFeeDetailMapper;
+import org.ta.pddserver.service.CollectFreightFeeDetailService;
+
+@Service
+public class CollectFreightFeeDetailImpl extends ServiceImpl<CollectFreightFeeDetailMapper, CollectFreightFeeDetailEntity> implements CollectFreightFeeDetailService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/OrderPaymentDetailImpl.java → PddServer/src/main/java/org/ta/pddserver/service/impl/CollectMailDetailImpl.java

@@ -3,11 +3,12 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderPaymentDetailEntity;
-import org.ta.pddserver.mapper.OrderPaymentDetailMapper;
-import org.ta.pddserver.service.OrderPaymentDetailService;
+import org.ta.pddserver.entity.CollectMailDetailEntity;
+import org.ta.pddserver.mapper.CollectMailDetailMapper;
+import org.ta.pddserver.service.CollectMailDetailService;
 
 @Service
-public class OrderPaymentDetailImpl extends ServiceImpl<OrderPaymentDetailMapper, OrderPaymentDetailEntity> implements OrderPaymentDetailService {
+public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper, CollectMailDetailEntity> implements CollectMailDetailService {
+
 
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderDetailImpl.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.mapper.CollectOrderDetailMapper;
+import org.ta.pddserver.service.CollectOrderDetailService;
+
+@Service
+public class CollectOrderDetailImpl extends ServiceImpl<CollectOrderDetailMapper, CollectOrderDetailEntity> implements CollectOrderDetailService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/OrderBuyerDetailImpl.java → PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderImpl.java

@@ -3,11 +3,12 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderBuyerDetailEntity;
-import org.ta.pddserver.mapper.OrderBuyerDetailMapper;
-import org.ta.pddserver.service.OrderBuyerDetailService;
+import org.ta.pddserver.entity.CollectOrderEntity;
+import org.ta.pddserver.mapper.CollectOrderMapper;
+import org.ta.pddserver.service.CollectOrderService;
 
 @Service
-public class OrderBuyerDetailImpl extends ServiceImpl<OrderBuyerDetailMapper, OrderBuyerDetailEntity> implements OrderBuyerDetailService {
+public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrderEntity> implements CollectOrderService {
+
 
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderLogisticsOrderCodeImpl.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.CollectOrderLogisticsOrderCodeEntity;
+import org.ta.pddserver.mapper.CollectOrderLogisticsOrderCodeMapper;
+import org.ta.pddserver.service.CollectOrderLogisticsOrderCodeService;
+
+@Service
+public class CollectOrderLogisticsOrderCodeImpl extends ServiceImpl<CollectOrderLogisticsOrderCodeMapper, CollectOrderLogisticsOrderCodeEntity> implements CollectOrderLogisticsOrderCodeService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderSnImpl.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.CollectOrderSnEntity;
+import org.ta.pddserver.mapper.CollectOrderSnMapper;
+import org.ta.pddserver.service.CollectOrderSnService;
+
+@Service
+public class CollectOrderSnImpl extends ServiceImpl<CollectOrderSnMapper, CollectOrderSnEntity> implements CollectOrderSnService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectReceiverDetailImpl.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.CollectReceiverDetailEntity;
+import org.ta.pddserver.mapper.CollectReceiverDetailMapper;
+import org.ta.pddserver.service.CollectReceiverDetailService;
+
+@Service
+public class CollectReceiverDetailImpl extends ServiceImpl<CollectReceiverDetailMapper, CollectReceiverDetailEntity> implements CollectReceiverDetailService {
+
+
+}
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderBuyerDetailImpl.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.LogOrderBuyerDetailEntity;
+import org.ta.pddserver.mapper.LogOrderBuyerDetailMapper;
+import org.ta.pddserver.service.LogOrderBuyerDetailService;
+
+@Service
+public class LogOrderBuyerDetailImpl extends ServiceImpl<LogOrderBuyerDetailMapper, LogOrderBuyerDetailEntity> implements LogOrderBuyerDetailService {
+
+}
\ No newline at end of file

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

@@ -3,12 +3,12 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderEntity;
-import org.ta.pddserver.mapper.OrderMapper;
-import org.ta.pddserver.service.OrderService;
+import org.ta.pddserver.entity.LogOrderEntity;
+import org.ta.pddserver.mapper.LogOrderMapper;
+import org.ta.pddserver.service.LogOrderService;
 
 @Service
-public class OrderImpl extends ServiceImpl<OrderMapper, OrderEntity> implements OrderService {
+public class LogOrderImpl extends ServiceImpl<LogOrderMapper, LogOrderEntity> implements LogOrderService {
 
     public Boolean savePackageQuantity(String logisticsOrderCode, Long packageQuantity) {
 

PddServer/src/main/java/org/ta/pddserver/service/impl/OrderItemImpl.java → PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderItemImpl.java

@@ -3,11 +3,11 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderItemEntity;
-import org.ta.pddserver.mapper.OrderItemMapper;
-import org.ta.pddserver.service.OrderItemService;
+import org.ta.pddserver.entity.LogOrderItemEntity;
+import org.ta.pddserver.mapper.LogOrderItemMapper;
+import org.ta.pddserver.service.LogOrderItemService;
 
 @Service
-public class OrderItemImpl extends ServiceImpl<OrderItemMapper, OrderItemEntity> implements OrderItemService {
+public class LogOrderItemImpl extends ServiceImpl<LogOrderItemMapper, LogOrderItemEntity> implements LogOrderItemService {
 
 }
\ No newline at end of file

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

@@ -3,17 +3,17 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderMailDetailEntity;
-import org.ta.pddserver.mapper.OrderMailDetailMapper;
-import org.ta.pddserver.service.OrderMailDetailService;
+import org.ta.pddserver.entity.LogOrderMailDetailEntity;
+import org.ta.pddserver.mapper.LogOrderMailDetailMapper;
+import org.ta.pddserver.service.LogOrderMailDetailService;
 
 import java.util.List;
 
 @Service
-public class OrderMailDetailImpl extends ServiceImpl<OrderMailDetailMapper, OrderMailDetailEntity> implements OrderMailDetailService {
+public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper, LogOrderMailDetailEntity> implements LogOrderMailDetailService {
 
-    public List<OrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
-        List<OrderMailDetailEntity> list = baseMapper.getListByCode(logisticsOrderCode);
+    public List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
+        List<LogOrderMailDetailEntity> list = baseMapper.getListByCode(logisticsOrderCode);
         return list;
     }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderPaymentDetailImpl.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.LogOrderPaymentDetailEntity;
+import org.ta.pddserver.mapper.LogOrderPaymentDetailMapper;
+import org.ta.pddserver.service.LogOrderPaymentDetailService;
+
+@Service
+public class LogOrderPaymentDetailImpl extends ServiceImpl<LogOrderPaymentDetailMapper, LogOrderPaymentDetailEntity> implements LogOrderPaymentDetailService {
+
+}
\ No newline at end of file

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

@@ -3,11 +3,8 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderCreateEntity;
 import org.ta.pddserver.entity.OrderQueryEntity;
-import org.ta.pddserver.mapper.OrderCreateMapper;
 import org.ta.pddserver.mapper.OrderQueryMapper;
-import org.ta.pddserver.service.OrderCreateService;
 import org.ta.pddserver.service.OrderQueryService;
 
 @Service

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

@@ -3,11 +3,8 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.OrderCreateEntity;
 import org.ta.pddserver.entity.ReverseNotifyEntity;
-import org.ta.pddserver.mapper.OrderCreateMapper;
 import org.ta.pddserver.mapper.ReverseNotifyMapper;
-import org.ta.pddserver.service.OrderCreateService;
 import org.ta.pddserver.service.ReverseNotifyService;
 
 @Service