bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html

@@ -53,7 +53,7 @@
                 </select>
             </div>
             <div class="col-sm-5">
-                <input class="form-control" type="text" placeholder="请填写url" id="targetObjInput">
+                <input style="display: none" class="form-control" type="text" placeholder="请填写url" id="targetObjInput">
                 <div hidden class="row" id="targetObjSelectShow">
                     <div class="col-lg-6">
                         <div class="input-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -35,6 +35,14 @@
                             <label>收货人姓名：</label>
                             <input type="text" name="expressContacts"/>
                         </li>
+                        <!--<li>
+                            <label>订单状态：</label>
+                            <select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>-->
                         <li>
                             <label>订单状态：</label>
                             <select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
@@ -45,9 +53,12 @@
                         </li>
                         <li>
                             <label>快递状态：</label>
-                            <select name="expressStatus" th:with="type=${@dict.getType('zhengzai_express_status')}">
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
+                            <select name="expressStatus">
+                                <option value="">所有</option>
+                                <option value="1">未下单</option>
+                                <option value="2">已下单</option>
+                                <option value="50">已揽收</option>
+                                <option value="80">已签收</option>
                             </select>
                         </li>
                         <li>
@@ -291,6 +302,14 @@
     }
 
     function printExpress(orderExpressId) {
+        try{
+            var LODOP = getLodop();
+            if (LODOP == undefined) {
+                return false;
+            }
+        } catch (err) {
+            return false;
+        }
         var data = '';
         if (orderExpressId) {
             var ids = [orderExpressId];

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html

@@ -241,6 +241,14 @@
     }
 
     function printExpress(performanceId) {
+        try{
+            var LODOP = getLodop();
+            if (LODOP == undefined) {
+                return false;
+            }
+        } catch (err) {
+            return false;
+        }
         var data = '';
         var ids = [performanceId];
         data = {"ids": ids.join()};

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java

@@ -139,11 +139,11 @@ public class KylinRefundPerformancesAdminServiceImpl {
             case "review":
                 batchUpdateStatus = batchStatus;
                 if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_ADOPT44) { // 通过申请
-                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
+                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_FINANCE_REJECT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED;
                 }
                 if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_REJECT33) { // 驳回申请
-                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
+                    paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_FINANCE_REJECT};
                     orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT;
                 }
                 break;