清关信息逻辑修改

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -10,11 +10,8 @@ import com.kmall.admin.service.OrderProcessRecordService;
 import com.kmall.admin.service.OrderService;
 import com.kmall.api.contants.Dict;
 import com.kmall.common.entity.SysUserEntity;
-import com.kmall.common.utils.ShiroUtils;
+import com.kmall.common.utils.*;
 import com.kmall.common.utils.print.ticket.item.Ticket;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -22,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -189,6 +187,50 @@ public class OrderController {
     @RequiresPermissions("order:getProcess")
     public R getProcess(@PathVariable("orderSn") String orderSn) {
         OrderProcessRecordEntity orderProcessRecordEntity = orderProcessRecordService.queryObjectByOrderSn(orderSn);
+        if(orderProcessRecordEntity != null){
+            if(orderProcessRecordEntity.getShipmentStartTime()!=null){
+                orderProcessRecordEntity.setShipmentStartTimeStr(DateUtils.format(orderProcessRecordEntity.getShipmentStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getShipmentSuccTime()!=null){
+                orderProcessRecordEntity.setShipmentSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getShipmentSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getCustomsStartTime()!=null){
+                orderProcessRecordEntity.setCustomsStartTimeStr(DateUtils.format(orderProcessRecordEntity.getCustomsStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getCustomsSuccTime()!=null){
+                orderProcessRecordEntity.setCustomsSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getCustomsSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getWaybillStartTime()!=null){
+                orderProcessRecordEntity.setWaybillStartTimeStr(DateUtils.format(orderProcessRecordEntity.getWaybillStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getWaybillSuccTime()!=null){
+                orderProcessRecordEntity.setWaybillSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getWaybillSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getEleOrderStartTime()!=null){
+                orderProcessRecordEntity.setEleOrderStartTimeStr(DateUtils.format(orderProcessRecordEntity.getEleOrderStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getEleOrderSuccTime()!=null){
+                orderProcessRecordEntity.setEleOrderSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getEleOrderSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getAddOrderStartTime()!=null){
+                orderProcessRecordEntity.setAddOrderStartTimeStr(DateUtils.format(orderProcessRecordEntity.getAddOrderStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getAddOrderSuccTime()!=null){
+                orderProcessRecordEntity.setAddOrderSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getAddOrderSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getPaySuccTime()!=null){
+                orderProcessRecordEntity.setPaySuccTimeStr(DateUtils.format(orderProcessRecordEntity.getPaySuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getPayStartTime()!=null){
+                orderProcessRecordEntity.setPayStartTimeStr(DateUtils.format(orderProcessRecordEntity.getPayStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getPaymentStartTime()!=null){
+                orderProcessRecordEntity.setPaymentStartTimeStr(DateUtils.format(orderProcessRecordEntity.getPaymentStartTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+            if(orderProcessRecordEntity.getPaymentSuccTime()!=null){
+                orderProcessRecordEntity.setPaymentSuccTimeStr(DateUtils.format(orderProcessRecordEntity.getPaymentSuccTime(),DateUtils.DATE_TIME_PATTERN));
+            }
+        }
         return R.ok().put("orderProcessRecordEntity", orderProcessRecordEntity);
     }
 

kmall-admin/src/main/java/com/kmall/admin/entity/OrderProcessRecordEntity.java

@@ -121,6 +121,63 @@ public class OrderProcessRecordEntity implements Serializable {
 
     private String payTransactionId;
 
+    /**
+     * 下单开始时间
+     */
+    private String addOrderStartTimeStr;
+    /**
+     * 下单成功时间
+     */
+    private String addOrderSuccTimeStr;
+    /**
+     * 支付开始时间
+     */
+    private String payStartTimeStr;
+    /**
+     * 支付成功时间
+     */
+    private String paySuccTimeStr;
+    /**
+     * 支付单开始时间
+     */
+    private String paymentStartTimeStr;
+    /**
+     * 支付单成功时间
+     */
+    private String paymentSuccTimeStr;
+    /**
+     * 电子订单开始时间
+     */
+    private String eleOrderStartTimeStr;
+    /**
+     * 电子订单成功时间
+     */
+    private String eleOrderSuccTimeStr;
+    /**
+     * 运单开始时间
+     */
+    private String waybillStartTimeStr;
+    /**
+     * 运单成功时间
+     */
+    private String waybillSuccTimeStr;
+    /**
+     * 清单开始时间
+     */
+    private String customsStartTimeStr;
+    /**
+     * 清单成功时间
+     */
+    private String customsSuccTimeStr;
+    /**
+     * 出货开始时间
+     */
+    private String shipmentStartTimeStr;
+    /**
+     * 出货成功时间
+     */
+    private String shipmentSuccTimeStr;
+
     public String getPayTransactionId() {
         return payTransactionId;
     }
@@ -129,6 +186,118 @@ public class OrderProcessRecordEntity implements Serializable {
         this.payTransactionId = payTransactionId;
     }
 
+    public String getAddOrderStartTimeStr() {
+        return addOrderStartTimeStr;
+    }
+
+    public void setAddOrderStartTimeStr(String addOrderStartTimeStr) {
+        this.addOrderStartTimeStr = addOrderStartTimeStr;
+    }
+
+    public String getAddOrderSuccTimeStr() {
+        return addOrderSuccTimeStr;
+    }
+
+    public void setAddOrderSuccTimeStr(String addOrderSuccTimeStr) {
+        this.addOrderSuccTimeStr = addOrderSuccTimeStr;
+    }
+
+    public String getPayStartTimeStr() {
+        return payStartTimeStr;
+    }
+
+    public void setPayStartTimeStr(String payStartTimeStr) {
+        this.payStartTimeStr = payStartTimeStr;
+    }
+
+    public String getPaySuccTimeStr() {
+        return paySuccTimeStr;
+    }
+
+    public void setPaySuccTimeStr(String paySuccTimeStr) {
+        this.paySuccTimeStr = paySuccTimeStr;
+    }
+
+    public String getPaymentStartTimeStr() {
+        return paymentStartTimeStr;
+    }
+
+    public void setPaymentStartTimeStr(String paymentStartTimeStr) {
+        this.paymentStartTimeStr = paymentStartTimeStr;
+    }
+
+    public String getPaymentSuccTimeStr() {
+        return paymentSuccTimeStr;
+    }
+
+    public void setPaymentSuccTimeStr(String paymentSuccTimeStr) {
+        this.paymentSuccTimeStr = paymentSuccTimeStr;
+    }
+
+    public String getEleOrderStartTimeStr() {
+        return eleOrderStartTimeStr;
+    }
+
+    public void setEleOrderStartTimeStr(String eleOrderStartTimeStr) {
+        this.eleOrderStartTimeStr = eleOrderStartTimeStr;
+    }
+
+    public String getEleOrderSuccTimeStr() {
+        return eleOrderSuccTimeStr;
+    }
+
+    public void setEleOrderSuccTimeStr(String eleOrderSuccTimeStr) {
+        this.eleOrderSuccTimeStr = eleOrderSuccTimeStr;
+    }
+
+    public String getWaybillStartTimeStr() {
+        return waybillStartTimeStr;
+    }
+
+    public void setWaybillStartTimeStr(String waybillStartTimeStr) {
+        this.waybillStartTimeStr = waybillStartTimeStr;
+    }
+
+    public String getWaybillSuccTimeStr() {
+        return waybillSuccTimeStr;
+    }
+
+    public void setWaybillSuccTimeStr(String waybillSuccTimeStr) {
+        this.waybillSuccTimeStr = waybillSuccTimeStr;
+    }
+
+    public String getCustomsStartTimeStr() {
+        return customsStartTimeStr;
+    }
+
+    public void setCustomsStartTimeStr(String customsStartTimeStr) {
+        this.customsStartTimeStr = customsStartTimeStr;
+    }
+
+    public String getCustomsSuccTimeStr() {
+        return customsSuccTimeStr;
+    }
+
+    public void setCustomsSuccTimeStr(String customsSuccTimeStr) {
+        this.customsSuccTimeStr = customsSuccTimeStr;
+    }
+
+    public String getShipmentStartTimeStr() {
+        return shipmentStartTimeStr;
+    }
+
+    public void setShipmentStartTimeStr(String shipmentStartTimeStr) {
+        this.shipmentStartTimeStr = shipmentStartTimeStr;
+    }
+
+    public String getShipmentSuccTimeStr() {
+        return shipmentSuccTimeStr;
+    }
+
+    public void setShipmentSuccTimeStr(String shipmentSuccTimeStr) {
+        this.shipmentSuccTimeStr = shipmentSuccTimeStr;
+    }
+
     /**
      * 设置：
      */

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -386,17 +386,17 @@ public class OrderServiceImpl implements OrderService {
 
         Map logisticsInfo = new HashMap();
         List<WuliuEntity> wuliuEntityList = new ArrayList<>();
-        if(orderEntity.getOrderBizType().equals(Dict.orderBizType.item_10.getItem())
-                || orderEntity.getOrderBizType().equals(Dict.orderBizType.item_02.getItem())) {
-            WuliuEntity wuliuEntity = new WuliuEntity();
-            wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderEntity.getAddTime()));
-            wuliuEntity.setAcceptStation(PrintTicketPropertiesBuilder.instance().getAddress()
-                    + "送达" + storeDao.queryObject(orderEntity.getStoreId()).getStoreAddress()
-                    + ";交易完成，用户已提走");
-            wuliuEntityList.add(wuliuEntity);
-        }
         OrderProcessRecordEntity orderProcessRecordEntity = orderProcessRecordDao.queryObjectByOrderSn(orderEntity.getOrderSn());
         if (orderProcessRecordEntity != null) {
+            if(orderEntity.getOrderBizType().equals(Dict.orderBizType.item_10.getItem())
+                    || orderEntity.getOrderBizType().equals(Dict.orderBizType.item_02.getItem())) {
+                WuliuEntity wuliuEntity = new WuliuEntity();
+                wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderProcessRecordEntity.getCustomsSuccTime()));
+                wuliuEntity.setAcceptStation(PrintTicketPropertiesBuilder.instance().getAddress()
+                        + "送达" + storeDao.queryObject(orderEntity.getStoreId()).getStoreAddress()
+                        + ";交易完成，用户已提走");
+                wuliuEntityList.add(wuliuEntity);
+            }
             if (StringUtils.isNotEmpty(orderEntity.getShippingCode())
                     && StringUtils.isNotEmpty(orderEntity.getShippingNo()) &&orderProcessRecordEntity.getShipmentStartTime()!=null) {
                 JSONObject traces = KdniaoUtil.getOrderTracesByJson(orderEntity.getShippingCode(), orderEntity.getShippingNo());
@@ -429,15 +429,27 @@ public class OrderServiceImpl implements OrderService {
                 wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderProcessRecordEntity.getCustomsSuccTime()));
                 wuliuEntityList.add(wuliuEntity);
             }
+
+            if (Dict.isSend.item_0.getItem().equalsIgnoreCase(orderProcessRecordEntity.getIsCustomsSend())) {
+                WuliuEntity wuliuEntity = new WuliuEntity();
+                wuliuEntity.setAcceptStation("订单清关失败");
+                wuliuEntityList.add(wuliuEntity);
+            }
+            if (Dict.isSend.item_1.getItem().equalsIgnoreCase(orderProcessRecordEntity.getIsEleOrderSend()) && orderProcessRecordEntity.getWaybillSuccTime()!=null) {
+                WuliuEntity wuliuEntity = new WuliuEntity();
+                wuliuEntity.setAcceptStation("海关三单发送成功");
+                wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderProcessRecordEntity.getWaybillSuccTime()));
+                wuliuEntityList.add(wuliuEntity);
+            }
             if(Dict.isSend.item_1.getItem().equals(orderProcessRecordEntity.getIsPaymentSend())){
                 WuliuEntity wuliuEntity = new WuliuEntity();
-                wuliuEntity.setAcceptStation("订单支付成功，等待海关清关");
+                wuliuEntity.setAcceptStation("订单支付成功");
                 wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderProcessRecordEntity.getPaySuccTime()));
                 wuliuEntityList.add(wuliuEntity);
             }
             if(Dict.isSend.item_1.getItem().equalsIgnoreCase(orderProcessRecordEntity.getIsAddOrderSend())){
                 WuliuEntity wuliuEntity = new WuliuEntity();
-                wuliuEntity.setAcceptStation("订单提交成功");
+                wuliuEntity.setAcceptStation("订单下单成功");
                 wuliuEntity.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(orderProcessRecordEntity.getAddOrderSuccTime()));
                 wuliuEntityList.add(wuliuEntity);
             }

kmall-admin/src/main/webapp/WEB-INF/page/shop/order.html

@@ -53,13 +53,38 @@
     <Card v-show="showDiv == 7">
         <p slot="title">清关信息</p>
         <i-form :label-width="150">
-            <Form-item label="下单开始时间" prop="addOrderStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.addOrderStartTime" placeholder="下单开始时间" readonly style="width: 240px;"/>
+            <!--<Timeline style="margin-left: 100px;">-->
+                <!--<Timeline-item>-->
+                    <!--<p class="time">订单编号: {{orderProcessRecordEntity.orderSn}}</p>-->
+                    <!--<p class="content">下单开始时间:{{orderProcessRecordEntity.addOrderStartTimeStr}}</p>-->
+                    <!--<p class="content">下单成功时间:{{orderProcessRecordEntity.addOrderSuccTimeStr}}</p>-->
+                    <!--<p class="content">下单状态:{{orderProcessRecordEntity.isAddOrderSend==1?"成功":""}}-->
+                        <!--{{orderProcessRecordEntity.isAddOrderSend==0?"失败":""}}-->
+                        <!--{{orderProcessRecordEntity.isAddOrderSend==2?"下单中":""}}</p>-->
+                <!--</Timeline-item>-->
+                <!--<Timeline-item>-->
+                    <!--<p class="time">支付单号: {{orderProcessRecordEntity.payTransactionId}}</p>-->
+                    <!--<p class="content">支付开始时间:{{orderProcessRecordEntity.payStartTimeStr}}</p>-->
+                    <!--<p class="content">支付成功时间:{{orderProcessRecordEntity.paySuccTimeStr}}</p>-->
+                <!--</Timeline-item>-->
+                <!--<Timeline-item>-->
+                    <!--<p class="time">支付单开始时间:{{orderProcessRecordEntity.paymentStartTimeStr}}</p>-->
+                    <!--<p class="time">支付单成功时间:{{orderProcessRecordEntity.paymentSuccTimeStr}}</p>-->
+                    <!--<p class="content">支付单状态:{{orderProcessRecordEntity.isPaymentSend==1?"成功":""}}-->
+                        <!--{{orderProcessRecordEntity.isPaymentSend==0?"失败":""}}-->
+                        <!--{{orderProcessRecordEntity.isPaymentSend==2?"下单中":""}}</p>-->
+                <!--</Timeline-item>-->
+            <!--</Timeline>-->
+            <Form-item label="订单编号：" prop="orderSn" style="height: 14px">
+                {{orderProcessRecordEntity.orderSn}}
             </Form-item>
-            <Form-item label="下单成功时间" prop="addOrderSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.addOrderSuccTime" placeholder="下单成功时间" readonly style="width: 240px;"/>
+            <Form-item label="下单开始时间：" prop="addOrderStartTime" style="height: 14px">
+                {{orderProcessRecordEntity.addOrderStartTimeStr}}
             </Form-item>
-            <Form-item label="下单状态" prop="isAddOrderSend">
+            <Form-item label="下单成功时间：" prop="addOrderSuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.addOrderSuccTimeStr}}
+            </Form-item>
+            <Form-item label="下单状态：" prop="isAddOrderSend" style="height: 14px">
                 <Radio-group v-model="orderProcessRecordEntity.isAddOrderSend">
                     <Radio label="0">
                         <span>失败</span>
@@ -72,22 +97,26 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="支付开始时间" prop="payStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.payStartTime" placeholder="支付开始时间" readonly style="width: 240px;"/>
+            <div style="padding-top:10px;">
+            <Form-item label="支付单号：" prop="payTransactionId" style="margin-top:10px;height: 14px">
+                {{orderProcessRecordEntity.payTransactionId}}
             </Form-item>
-            <Form-item label="支付成功时间" prop="paySuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.paySuccTime" placeholder="支付成功时间" readonly style="width: 240px;"/>
+            <Form-item label="支付开始时间：" prop="payStartTime" style="height: 14px">
+                {{orderProcessRecordEntity.payStartTimeStr}}
             </Form-item>
-            <Form-item label="支付单号" prop="payTransactionId">
-                <i-input v-model="order.payTransactionId" readonly placeholder="推单支付单号" style="width: 240px;"/>
+            <Form-item label="支付成功时间：" prop="paySuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.paySuccTimeStr}}
             </Form-item>
-            <Form-item label="支付单开始时间" prop="paymentStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.paymentStartTime" placeholder="支付单开始时间" readonly style="width: 240px;"/>
+            </div>
+
+            <div style="padding-top:10px;">
+            <Form-item label="海关支付单开始时间：" prop="paymentStartTime" style="margin-top:10px;height: 14px">
+                {{orderProcessRecordEntity.paymentStartTimeStr}}
             </Form-item>
-            <Form-item label="支付单成功时间" prop="paymentSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.paymentSuccTime" placeholder="支付单成功时间" readonly style="width: 240px;"/>
+            <Form-item label="海关支付单成功时间：" prop="paymentSuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.paymentSuccTimeStr}}
             </Form-item>
-            <Form-item label="支付单状态" prop="isPaymentSend">
+            <Form-item label="海关支付单状态：" prop="isPaymentSend" style="height: 14px">
                 <Radio-group v-model="orderProcessRecordEntity.isPaymentSend">
                     <Radio label="0">
                         <span>失败</span>
@@ -100,13 +129,16 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="电子订单开始时间" prop="eleOrderStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.eleOrderStartTime" placeholder="电子订单开始时间" readonly style="width: 240px;"/>
+            </div>
+
+            <div style="padding-top:10px;">
+            <Form-item label="电子订单开始时间：" prop="eleOrderStartTime" style="margin-top:10px;height: 14px">
+                {{orderProcessRecordEntity.eleOrderStartTimeStr}}
             </Form-item>
-            <Form-item label="电子订单成功时间" prop="eleOrderSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.eleOrderSuccTime" placeholder="电子订单成功时间" readonly style="width: 240px;"/>
+            <Form-item label="电子订单成功时间：" prop="eleOrderSuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.eleOrderSuccTimeStr}}
             </Form-item>
-            <Form-item label="电子订单状态" prop="isEleOrderSend">
+            <Form-item label="电子订单状态：" prop="isEleOrderSend" style="height: 14px">
                 <Radio-group v-model="orderProcessRecordEntity.isEleOrderSend">
                     <Radio label="0">
                         <span>失败</span>
@@ -119,25 +151,31 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="运单开始时间" prop="waybillStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.waybillStartTime" placeholder="运单开始时间" readonly style="width: 240px;"/>
+            </div>
+
+            <div style="padding-top:10px;">
+            <Form-item label="运单编号：" prop="logisticsNo" style="margin-top:10px;height: 14px">
+                {{orderProcessRecordEntity.logisticsNo}}
             </Form-item>
-            <Form-item label="运单成功时间" prop="waybillSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.waybillSuccTime" placeholder="运单成功时间" readonly style="width: 240px;"/>
+            <Form-item label="运单开始时间：" prop="waybillStartTime" style="height: 14px">
+                {{orderProcessRecordEntity.waybillStartTimeStr}}
             </Form-item>
-            <Form-item label="运单编号" prop="logisticsNo">
-                <i-input v-model="orderProcessRecordEntity.logisticsNo" readonly placeholder="运单编号" style="width: 240px;"/>
+            <Form-item label="运单成功时间：" prop="waybillSuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.waybillSuccTimeStr}}
             </Form-item>
-            <Form-item label="清单开始时间" prop="customsStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.customsStartTime" placeholder="清单开始时间" readonly style="width: 240px;"/>
+            </div>
+
+            <div style="padding-top:10px;">
+            <Form-item label="清单编号：" prop="invtNo" style="margin-top:10px;height: 14px">
+                {{orderProcessRecordEntity.invtNo}}
             </Form-item>
-            <Form-item label="清单成功时间" prop="customsSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.customsSuccTime" placeholder="清单成功时间" readonly style="width: 240px;"/>
+            <Form-item label="清单开始时间：" prop="customsStartTime" style="height: 14px">
+                {{orderProcessRecordEntity.customsStartTimeStr}}
             </Form-item>
-            <Form-item label="清单编号" prop="invtNo">
-                <i-input v-model="orderProcessRecordEntity.invtNo" readonly placeholder="清单编号" style="width: 240px;"/>
+            <Form-item label="清单成功时间：" prop="customsSuccTime" style="height: 14px">
+                {{orderProcessRecordEntity.customsSuccTimeStr}}
             </Form-item>
-            <Form-item label="清关状态" prop="isCustomsSend">
+            <Form-item label="清关状态：" prop="isCustomsSend" style="height: 14px">
                 <Radio-group v-model="orderProcessRecordEntity.isCustomsSend">
                     <Radio label="0">
                         <span>失败</span>
@@ -150,13 +188,16 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="出货开始时间" prop="shipmentStartTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.shipmentStartTime" placeholder="出货开始时间" readonly style="width: 240px;"/>
-            </Form-item>
-            <Form-item label="出货成功时间" prop="shipmentSuccTime">
-                <Date-picker format="yyyy-MM-dd HH:mm:ss" v-model="orderProcessRecordEntity.shipmentSuccTime" placeholder="出货成功时间" readonly style="width: 240px;"/>
-            </Form-item>
-            <Form-item label="订单流转信息" prop="processContent">
+            </div>
+            <div style="padding-top:10px;">
+                <Form-item label="出货开始时间：" prop="shipmentStartTime" style="height: 14px">
+                    {{orderProcessRecordEntity.shipmentStartTimeStr}}
+                </Form-item>
+                <Form-item label="出货成功时间：" prop="shipmentSuccTime" style="height: 14px">
+                    {{orderProcessRecordEntity.shipmentSuccTimeStr}}
+                </Form-item>
+            </div>
+            <Form-item label="订单流转信息：" prop="processContent" style="padding-top:10px;">
                 <i-input type="textarea" v-model="orderProcessRecordEntity.processContent" readonly placeholder="订单流转信息"/>
             </Form-item>
             <Form-item>

kmall-api/src/main/java/com/kmall/api/api/ApiOrderController.java

@@ -12,6 +12,7 @@ import com.kmall.api.service.*;
 import com.kmall.api.service.express.kdn.ApiKdniaoService;
 import com.kmall.api.util.ApiBaseAction;
 import com.kmall.api.util.ApiPageUtils;
+import com.kmall.common.service.print.ticket.PrintTicketPropertiesBuilder;
 import com.kmall.common.utils.Constant;
 import com.kmall.common.utils.DateUtils;
 import com.kmall.common.utils.Query;
@@ -50,6 +51,8 @@ public class ApiOrderController extends ApiBaseAction {
     private ApiOrderProcessRecordService orderProcessRecordService;
     @Autowired
     private ApiOrderRefundService apiOrderRefundService;
+    @Autowired
+    private ApiStoreService apiStoreService;
 
     /**
      */
@@ -140,7 +143,9 @@ public class ApiOrderController extends ApiBaseAction {
             if((orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem()) ||
                     orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem()))){
                 Map map = new HashMap();
-                map.put("AcceptStation", "交易完成，用户已提走");
+                map.put("AcceptStation", PrintTicketPropertiesBuilder.instance().getAddress()
+                        + "送达" + apiStoreService.queryObject(orderInfo.getStore_id()).getStoreAddress()
+                        + ";交易完成，用户已提走");
                 mapList.add(map);
             }else{
                 if (!StringUtils.isEmpty(orderInfo.getShipping_code()) && !StringUtils.isEmpty(orderInfo.getShipping_no()) &&entity.getShipmentStartTime()!=null) {
@@ -169,16 +174,22 @@ public class ApiOrderController extends ApiBaseAction {
                 map.put("AcceptStation", "订单清关完成，等待仓库发货");
                 mapList.add(map);
             }
+            if (Dict.isSend.item_0.getItem().equalsIgnoreCase(entity.getIsCustomsSend())) {
+                Map map = new HashMap();
+                map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getCustomsSuccTime()));
+                map.put("AcceptStation", "订单清关失败");
+                mapList.add(map);
+            }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsPaymentSend())) {
                 Map map = new HashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getPaySuccTime()));
-                map.put("AcceptStation", "订单支付成功，等待海关清关");
+                map.put("AcceptStation", "订单支付成功");
                 mapList.add(map);
             }
             if (Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsAddOrderSend())) {
                 Map map = new HashMap();
                 map.put("AcceptTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getAddOrderSuccTime()));
-                map.put("AcceptStation", "订单提交成功");
+                map.put("AcceptStation", "客户下单成功");
                 mapList.add(map);
             }
         }
@@ -317,7 +328,9 @@ public class ApiOrderController extends ApiBaseAction {
             if(orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_10.getItem())
                     || orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_02.getItem())){
                 WuliuVo vo = new WuliuVo();
-                vo.setAcceptStation("交易完成，用户已提走");
+                vo.setAcceptStation(PrintTicketPropertiesBuilder.instance().getAddress()
+                        + "送达" + apiStoreService.queryObject(orderInfo.getStore_id()).getStoreAddress()
+                        + ";交易完成，用户已提走");
                 wuliuList.add(vo);
             }else {
                 if (!StringUtils.isEmpty(orderInfo.getShipping_code()) && !StringUtils.isEmpty(orderInfo.getShipping_no()) && entity.getShipmentStartTime() != null) {
@@ -355,15 +368,20 @@ public class ApiOrderController extends ApiBaseAction {
                 wuliuVo.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getCustomsSuccTime()));
                 wuliuList.add(wuliuVo);
             }
+            if (Dict.isSend.item_0.getItem().equalsIgnoreCase(entity.getIsCustomsSend())) {
+                WuliuVo wuliuVo = new WuliuVo();
+                wuliuVo.setAcceptStation("订单清关失败");
+                wuliuList.add(wuliuVo);
+            }
             if(Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsPaymentSend())){
                 WuliuVo wuliuVo = new WuliuVo();
-                wuliuVo.setAcceptStation("订单支付成功，等待海关清关");
+                wuliuVo.setAcceptStation("订单支付成功");
                 wuliuVo.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getPaySuccTime()));
                 wuliuList.add(wuliuVo);
             }
             if(Dict.isSend.item_1.getItem().equalsIgnoreCase(entity.getIsAddOrderSend())){
                 WuliuVo wuliuVo = new WuliuVo();
-                wuliuVo.setAcceptStation("订单提交成功");
+                wuliuVo.setAcceptStation("订单下单成功");
                 wuliuVo.setAcceptTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(entity.getAddOrderSuccTime()));
                 wuliuList.add(wuliuVo);
             }