订单新增到付的功能。

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -32,6 +32,7 @@ public class SalesOrder implements Serializable {
     private Date salesSalesTime;            //订购时间
     private String salesPostNum;            //快递单号
     private String salesPostFirm;           //快递公司
+    private Integer salesPostPayType;       // 快递的支付方式：1-现付，2-到付，3-月结，4-第三方支付
     private String salesAddressInfo;        //详细地址
     private String salesAddressProvinceName;//省
     private String salesAddressCityName;    //市
@@ -60,143 +61,106 @@ public class SalesOrder implements Serializable {
     private Integer salesType;              //订单类型  1：购买2：租赁
     private String salesDealCode;           //交易号
     private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 -- 改为 ProcTypeId
-    private String salesOrderStatusProcTypeName;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 --  改为 ProcTypeName
+    private String salesOrderStatusProcTypeName;//订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发 --  改为 ProcTypeName
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
-    private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
-    private Integer salesOldDeliver;            //过去的状态 - 出库状态  1：未出库   2：已出库
-    private Date salesDeliverTime;            //出库时间
+    private Integer salesDeliver;           //出库状态  1：未出库   2：已出库
+    private Integer salesOldDeliver;        //过去的状态 - 出库状态  1：未出库   2：已出库
+    private Date salesDeliverTime;          //出库时间
     private Integer salesPayStatus;         //付款状态 0(未付款)2(已付款)
     private Integer salesProcessStatus;     //单据状态  0(正常单)1(问题单)
     private Integer salesIsSend;            //是否通知配货    0：否1：是
     private Integer salesIsLocked;          //是否锁定  0：否1：是
     private Integer salesIsSeparate;        //是否缺货  0：否1：是
     private Integer salesIsDownload;        //是否下载过     1 未下载 2 已下载
-    private Integer salesIsShip;        //是否同步物流到第三方平台  0：未同步 1：已同步
-    private Integer salesProcessRefund;        //初始状态为0，只有当第三方平台订单出现退款后，重复确认才能变为处理0：未处理 1:已处理
-    private Integer salesWarrantyStatus;        //订单售后状态 同步第三方平台售后状态:0 没有售后 1 退款中
+    private Integer salesIsShip;            //是否同步物流到第三方平台  0：未同步 1：已同步
+    private Integer salesProcessRefund;     //初始状态为0，只有当第三方平台订单出现退款后，重复确认才能变为处理0：未处理 1:已处理
+    private Integer salesWarrantyStatus;    //订单售后状态 同步第三方平台售后状态:0 没有售后 1 退款中
     private Integer salesMainOrderId;       //主订单id(拆单用)
-
-    private String salesExOrderId;       //第三方平台订单号
-
+    private String salesExOrderId;          //第三方平台订单号
     private String companyName;             //销售公司名称
     private String storeName;               //店铺名称
-
     private String orderNoteRemark;         //订单备注，推送到efast
-
-    private String storeEfast;               //Efast 的店铺id
-
-    private Integer orderDateType;   //时间类型  1：创建时间   2：打单时间  3：出库时间
-    private Integer isSelectCustomer;   //是否查询客诉订单 1是 2否  订单关联客诉
-
+    private String storeEfast;              //Efast 的店铺id
+    private Integer orderDateType;          //时间类型  1：创建时间   2：打单时间  3：出库时间
+    private Integer isSelectCustomer;       //是否查询客诉订单 1是 2否  订单关联客诉
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;                 //开始时间
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date endDate;                   //结束时间
-
-    private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
-
-    //添加订单项属性，用于导出订单
-    private String itemProductName;         //产品名称
-    private String itemProductColor;        //产品颜色
-    private Integer itemNum;                //产品数量
-    private String itemColorBar;            //产品69码
-    private Integer colorId;            //颜色id
-    private Integer itemTotal;//小结
-    private Integer itemCostTotal;//成本小结
+    private String itemProductName;         //产品名称(添加订单项属性，用于导出订单)
+    private String itemProductColor;        //产品颜色(添加订单项属性，用于导出订单)
+    private Integer itemNum;                //产品数量(添加订单项属性，用于导出订单)
+    private String itemColorBar;            //产品69码(添加订单项属性，用于导出订单)
+    private Integer colorId;                //颜色id(添加订单项属性，用于导出订单)
+    private Integer itemTotal;              //小结(添加订单项属性，用于导出订单)
+    private Integer itemCostTotal;          //成本小结(添加订单项属性，用于导出订单)
     private List<String> listColorBar;      //产品69码集合
-
     private String[] salesIds;              //传入mybatis的订单编号
     private String ids;                     //前台传过来的订单编号
-    private Integer[] storeIds;              //控制可以获得哪些店铺的订单
-
-    //Efast升级新增字段 2018-6-6
-    private String styleColor;              //上传订单结果颜色
-
+    private Integer[] storeIds;             //控制可以获得哪些店铺的订单
+    private String styleColor;              //上传订单结果颜色(Efast升级新增字段 2018-6-6)
     private String salesBatchId;            //批次编号
     private Date batchCreateTime;           //批次创建时间
-
     private Integer salesAddType;           //增加订单方式 1：手动增加 2：Excel导入 3：客诉增加订单 4.小亚通拉取订单
     private Integer salesAdminId;           //录入人id
-    private String salesAdminName;           //录入人名称
-
-    private Integer isSalesCustomerId;           //是否绑定客诉（是否为售后订单）  1：不是  2：是
-    private Integer salesCustomerId;           //客诉id
-    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-    private Integer customerIsSolve;
-
-    // 分页数据
-    private Integer startOrderNO;
-
-    private Integer endOrderNO;
-
-    private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉添加的订单
-
+    private String salesAdminName;          //录入人名称
+    private Integer isSalesCustomerId;      //是否绑定客诉（是否为售后订单）  1：不是  2：是
+    private Integer salesCustomerId;        //客诉id
+    private Integer customerIsSolve;        //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
+    private Integer startOrderNO;           // 分页数据:开始的页数
+    private Integer endOrderNO;             // 分页数据:结束的页数
+    private Integer isCustmerAddOrder;      //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉添加的订单
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
-    private Date salesDistributionTime;//通知配货时间
-
-    private String procTypeName;//
-    private String procTypeId;//
-
-    //处理方式id
-    private Integer procMethodId;
-    //处理方式名称
-    private String procMethodName;
-
-   private Integer salesWarehouseId;//所属仓库id
-
-   private Integer isDevelop;//产品项是否包含有水机 1是 2否
-
-    private Integer salesReturnStatus;//退货状态 1未退货、2已退货、3部分退货
-    private Integer itemReturnNum;   //退货数量
-    private Integer salesOldOrderStatus;
-
-    private Integer beConfirmedNum;//待确认数量
+    private Date salesDistributionTime;     //通知配货时间
+    private String procTypeName;            // 客诉处理方式
+    private String procTypeId;              // 客诉处理方式id
+    private Integer procMethodId;           //处理方式id
+    private String procMethodName;          //处理方式名称
+    private Integer salesWarehouseId;       //所属仓库id
+    private Integer isDevelop;              //产品项是否包含有水机 1是 2否
+    private Integer salesReturnStatus;      //退货状态 1未退货、2已退货、3部分退货
+    private Integer itemReturnNum;          //退货数量
+    private Integer salesOldOrderStatus;    //老的订单状态，修改时为了保证幂等
+    private Integer beConfirmedNum;         //待确认数量
     private Integer distributionLogisticsNum;//待分配物流数量
-    private Integer sendTheGoods;//待发货数量
-    private Integer playSingle;//待打单数量
-    private Integer outbound;//待出库数量
-    private Integer takeToBe;//待揽件数量
-    private Integer tookTimeout;//揽件超时数量
-    private Integer tookAbnormal;//揽件异常数量
-    private Integer haveOutbound;//已出库数量
-
-
-    private String salesPostFirmName;//快递公司名称
-
-    private Integer dealerId;//客户id
-    private Integer dealerAdminId;//客户业务员
-    //客户名称
-    private String dealerName;
-    //渠道名称
-    private String dealChannelName;
-    //订单总成本 单个成本请用 itemCostTotal
-    private Integer costTotal;
-    //是否认领   1：已认领 2：未认领
-    private Integer orderIscostTotal;
-
-    private List<ComplaintDetectInfo> complaintDetectInfoList;
-
-    private Integer salesPostageCost;//邮费成本
+    private Integer sendTheGoods;           //待发货数量
+    private Integer playSingle;             //待打单数量
+    private Integer outbound;               //待出库数量
+    private Integer takeToBe;               //待揽件数量
+    private Integer tookTimeout;            //揽件超时数量
+    private Integer tookAbnormal;           //揽件异常数量
+    private Integer haveOutbound;           //已出库数量
+    private String salesPostFirmName;       //快递公司名称
+    private Integer dealerId;               //客户id
+    private Integer dealerAdminId;          //客户业务员
+    private String dealerName;              //客户名称
+    private String dealChannelName;         //渠道名称
+    private Integer costTotal;              //订单总成本 单个成本请用 itemCostTotal
+    private Integer orderIscostTotal;       //是否认领   1：已认领 2：未认领
+    private Integer salesPostageCost;       //邮费成本
+    private Integer salesIsSublist;         //是否属于子单 1否 2是
+    private Integer salesBelongOrderId;     //所属订单
+    private Integer salesReturnGoods;       //该字段控制订单项是否有退货的产品   1：没有  2：有
+    private Date orderCaseDate;             //揽件时间
+    private Integer orderHasCaseDate;       //是否已经有揽件时间  1：有  2：没有
+    private Integer statisticalType;        //导航栏搜索条件 1待确认 2待分配物流 3待发货 4待打单 5待出库 6待揽件 7揽件超时
+    private Integer trackingAdminId;        //跟踪信息 操作人id
+    private Integer feeCharges;             //维修收费
 
-    private Integer salesIsSublist;//是否属于子单 1否 2是
-    private Integer salesBelongOrderId;//所属订单
+    private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<SalesOrderItem> suSalesOrderItemList = new ArrayList<SalesOrderItem>();
+    private List<ComplaintDetectInfo> complaintDetectInfoList;
 
-    private Integer salesReturnGoods;//该字段控制订单项是否有退货的产品   1：没有  2：有
-
-    private Date orderCaseDate;//揽件时间
-    private Integer orderHasCaseDate;//是否已经有揽件时间  1：有  2：没有
-
-
-    private Integer statisticalType;//导航栏搜索条件 1待确认 2待分配物流 3待发货 4待打单 5待出库 6待揽件 7揽件超时
-
-    private Integer trackingAdminId;//跟踪信息 操作人id
+    public Integer getSalesPostPayType() {
+        return salesPostPayType;
+    }
 
-    // 维修收费
-    private Integer feeCharges;
+    public void setSalesPostPayType(Integer salesPostPayType) {
+        this.salesPostPayType = salesPostPayType;
+    }
 
     public Integer getFeeCharges() {
         return feeCharges;

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1218,6 +1218,9 @@
     update
     tb_rst_sales_order_info
     <set >
+      <if test="salesPostPayType != null ">
+        sales_post_pay_type = #{salesPostPayType},
+      </if >
       <if test="salesOrderId != null and salesOrderId != ''">
         sales_orderId = #{salesOrderId},
       </if >
@@ -1826,24 +1829,38 @@
 
     <!-- 根据批次批量分配快递方式 -->
     <update id="listSalesPostFirm" parameterType="SalesOrder" >
-        update tb_rst_sales_order_info
+        UPDATE
+                tb_rst_sales_order_info
         SET
-        sales_post_firm = #{salesPostFirm}
+                <if test="salesPostPayType != null ">
+                    sales_post_pay_type = #{salesPostPayType},
+                </if >
+                <if test="salesPostFirm != null ">
+                    sales_post_firm = #{salesPostFirm},
+                </if >
+                sales_is_sublist = 1
         WHERE
-        sales_batch_id = #{salesBatchId}
+                sales_batch_id = #{salesBatchId}
     </update>
     <!-- 根据订单id批量分配快递方式 -->
     <update id="listSalesPostFirmByIds" parameterType="SalesOrder" >
-        update tb_rst_sales_order_info
+        UPDATE
+          tb_rst_sales_order_info
         SET
-        sales_post_firm = #{salesPostFirm},
-        sales_is_sublist = 1,
-        sales_belong_orderId = null
-        where
-         sales_id IN
-         <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
-             #{node}
-         </foreach >
+            <if test="salesPostPayType != null ">
+                sales_post_pay_type = #{salesPostPayType},
+            </if >
+            <if test="salesPostFirm != null ">
+                sales_post_firm = #{salesPostFirm},
+            </if >
+            <!-- 主/子订单都只在通知配货时产生，在通知配货的前一个步骤（即分配快递方式的本步骤），重置数据 -->
+            sales_is_sublist = 1,
+            sales_belong_orderId = null
+        WHERE
+             sales_id IN
+             <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                 #{node}
+             </foreach >
     </update>
 
     <select id="getSalesOrderByPostNum" resultType="SalesOrder" parameterType="String" >

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -809,6 +809,7 @@ public class AdminOrderController {
         titles.add("出库日期");
         titles.add("通知配货日期");
         titles.add("处理类型");
+        titles.add("邮费支付方式");
         titles.add("邮费成本");
         titles.add("发货仓库");
         model.put("titles", titles);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -373,8 +373,10 @@ public class AwaitSendController {
             dir.mkdir();
         }
         File file = new File(dir.getAbsolutePath() + File.separator + orderId + ".txt");
-        if (!file.createNewFile()) {
-            throw new RuntimeException("创建文件失败");
+        if (!file.exists()) {
+            if (!file.createNewFile()) {
+                throw new RuntimeException("创建文件失败");
+            }
         }
         FileChannel foChannel = null;
         try {
@@ -424,7 +426,6 @@ public class AwaitSendController {
             LOGGER.error("{} 获取电子面单失败，原因:{}", orderId, "该订单没有绑定店铺或店铺没有发货人信息");
             return ResponseJson.getFAILURE().addResponseKeyValue("error","该订单没有绑定店铺或店铺没有发货人信息");
         }
-
         // 获取物流公司的设置数据
         LogisticsInfo logisticsInfo = new LogisticsInfo();
         logisticsInfo.setLogisticsRstCode(salesOrderInfo.getSalesPostFirm());
@@ -437,7 +438,6 @@ public class AwaitSendController {
         if (eOrderRequestData == null) {
             return ResponseJson.getFAILURE().addResponseKeyValue("error","物流公司未设置对应的数据" + salesOrderInfo.getSalesPostFirm());
         }
-
         // 判断是否是京东订单  订单来源 2020年3月30日新增
         if("jd".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())){
             StoreInfo storeInfo = storeInfoService.getStoreInfoById(salesOrderInfo.getSalesStoreId());
@@ -452,12 +452,11 @@ public class AwaitSendController {
                 eOrderRequestData.ExpType = "6";
             }
         }
-
         /* 组装通用数据 */
         eOrderRequestData.OrderCode = salesOrderInfo.getSalesOrderId();
-        eOrderRequestData.PayType = (3);
         eOrderRequestData.Cost = (0.00);
         eOrderRequestData.OtherCost = (0.0);
+        eOrderRequestData.PayType = salesOrderInfo.getSalesPostPayType();
         eOrderRequestData.Remark = salesId.toString();
         eOrderRequestData.IsReturnPrintTemplate = 1;
         /* 收件人信息 */
@@ -490,7 +489,6 @@ public class AwaitSendController {
         double colorIsWeight = henderProduct(salesOrderInfo, commodity, ctrOrderUUID(salesOrderInfo.getSalesOrderId()));
         eOrderRequestData.Commodity = (commodity);
         eOrderRequestData.Weight = (colorIsWeight/1000);
-
         /* 当前快递是否支持子母件，如果支持，需要将子母件的内容传递到系统 */
         List<SalesOrder> orders = salesOrderService.listSublistCount(salesId);
         if(logisticsInfo.getLogisticsIsLashSingle() == 1 && orders.size() >= 1){
@@ -498,7 +496,6 @@ public class AwaitSendController {
         }else{
             eOrderRequestData.Quantity = 1;
         }
-
         JSONObject jsonObject = null;
         try {
             // 向第三方系统【快递鸟】提交订单数据，第三方系统会检测订单是否重复
@@ -509,16 +506,14 @@ public class AwaitSendController {
                 LOGGER.error("{} 获取电子面单失败，原因:{}", orderId, reason);
                 throw new RuntimeException(reason);
             }
-
             // 批量向Service提交变更的信息
-            List<SalesOrder> changeOrderList = new ArrayList<>(eOrderRequestData.Quantity + 1);
+            List<SalesOrder> changeOrderList = new ArrayList<>(eOrderRequestData.Quantity);
             // 主订单发货 ： 仅针对已经通知通知配货的订单（如果已发货，此处不修改对应的订单数据）
             SalesOrder salesOrder = new SalesOrder();
             salesOrder.setSalesPostNum(jsonObject.getJSONObject("Order").getString("LogisticCode"));
             salesOrder.setSalesDealCode(salesOrderInfo.getSalesDealCode());
             salesOrder.setSalesId(salesId);
             changeOrderList.add(salesOrder);
-
             /*子母单 ： 获取子单打印模板集合*/
             JSONArray subPrintTemplates = jsonObject.getJSONArray("SubPrintTemplates");
             if(eOrderRequestData.Quantity > 1){
@@ -555,7 +550,6 @@ public class AwaitSendController {
             }
             /*子母单设置 end*/
 
-
             // 替换母订单产品名称
             String goodName = ctrOrderProduct(salesOrderInfo);
             if("jd".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())){
@@ -565,12 +559,10 @@ public class AwaitSendController {
             }else{
                 jsonObject.put("PrintTemplate",jsonObject.get("PrintTemplate").toString().replace(ctrOrderUUID(salesOrderInfo.getSalesOrderId()), goodName));
             }
-
             // 提交数据库
             if (salesOrderService.printOrder(changeOrderList, AdminUtils.getLoginAdminId()) <= 0) {
                 throw new RuntimeException("订单发货失败，请核查");
             }
-
             // 保存HTML
             savePostFile(request.getServletContext().getRealPath("/common/"), jsonObject.toJSONString(), salesOrderInfo.getSalesOrderId());
         } catch (Exception e) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/DownOrderRunnable.java

@@ -99,6 +99,7 @@ public class DownOrderRunnable implements Runnable {
                     row.add(cal.get(Calendar.YEAR) + "年" + (cal.get(Calendar.MONTH) + 1) + "月" + cal.get(Calendar.DAY_OF_MONTH) + "日");
                 }
                 row.add(salesOrder.getProcMethodName());
+                row.add(salesOrder.getSalesPostPayType() == 1 ? "现付" : (salesOrder.getSalesPostPayType() == 2 ? "到付" : (salesOrder.getSalesPostPayType() == 3 ? "月结" : "第三方支付")));
                 row.add(salesOrder.getSalesPostageCost() == null ? null : salesOrder.getSalesPostageCost()/100);
                 String temp = "京东仓";
                 if (salesOrder.getSalesSendType() != 3) {

watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/distribution_postFirm.ftl

@@ -6,7 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <title>分配快递方式</title>
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
@@ -31,14 +33,24 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box"  >
-            <span class="input-dic spanhidth" style="margin-top: 12px;margin-left: 120px;">快递方式：</span>
-            <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 36px;width: 200px">
+            <span class="input-dic spanhidth" style="width: 20%;margin-top: 12px;margin-left: 120px;">快递方式：</span>
+            <select class="select" name="salesPostFirm" id="salesPostFirm" style="height: 36px;width: 200px">
                 <#list logisticsInfoList as logisticsInfo>
                     <option  value="${logisticsInfo.logisticsRstCode}">${logisticsInfo.logisticsName}</option>
                 </#list>
             </select>
         </div>
 
+        <div class="input-box"  >
+            <span class="input-dic spanhidth" style="width: 20%;margin-top: 12px;margin-left: 120px;">快递支付方式：</span>
+            <select class="select" name="salesPostPayType" id="salesPostPayType" style="height: 36px;width: 200px">
+                <option value="1">现付</option>
+                <option value="2">到付</option>
+                <option selected value="3">月结</option>
+                <option value="4">第三方支付</option>
+            </select>
+        </div>
+
         <#if batchId??>
             <input type="hidden" value="${batchId!''}" id="batchId" name="batchId">
         </#if>
@@ -46,8 +58,8 @@
             <input type="hidden" value="${salesIds!''}" id="salesIds" name="salesIds">
         </#if>
 
-        <div style="text-align:center;" >
-            <button type="button" class="my-btn-submit" onclick="listSalesPostFirm();">确认分配</button>
+        <div style="text-align:center;margin-left: 5%;" >
+            <button type="button" class="btn" onclick="listSalesPostFirm();">确认分配</button>
         </div>
 
     </form>
@@ -62,11 +74,13 @@
         var batchId = cufte($("#batchId").val());
         var salesIds = cufte($("#salesIds").val());
         var salesPostFirm = $("#salesPostFirm").val();
+        var salesPostPayType = $("#salesPostPayType").val();
         $.ajax('${path}/admin/order_batch/list_SalesPostFirm?dates=' + new Date().getTime(), {
             data: {
                 "salesIds":salesIds,
                 "salesBatchId":batchId,
-                "salesPostFirm" : salesPostFirm
+                "salesPostFirm" : salesPostFirm,
+                "salesPostPayType" : salesPostPayType
             },
             dataType: 'json',
             type: 'post',

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -222,11 +222,24 @@
             <thead>
             <tr>
                 <th width="10">发货仓库：</th>
-                <td width="10" colspan="4">
+                <td width="10">
                     <#if order.salesSendType==3>京东仓库
                     <#else>爱贝源仓库
                     </#if>
                 </td>
+                <td width="10"></td>
+                <th width="10">快递支付方式：</th>
+                <td width="10" style="font-weight: normal;">
+                    <#if order.salesPostPayType == 1>
+                        现付
+                    <#elseif order.salesPostPayType == 2>
+                        到付
+                    <#elseif order.salesPostPayType == 3>
+                        月结
+                    <#elseif order.salesPostPayType == 4>
+                        第三方支付
+                    </#if>
+                </td>
             </tr>
 
             <tr>