Merge remote-tracking branch 'origin/test' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -9,6 +9,9 @@ package com.liquidnet.service.kylin.constant;
  * @since 2021-05-25 6:38 下午
  */
 public class KylinTableStatusConst {
+    /**
+     * 退款
+     */
     // 批量退款 1处理完成 11 处理中
     public static final Integer STATUS_APPLY = 1; // 1申请退款
     public static final Integer STATUS_APPLY11 = 11;
@@ -72,4 +75,10 @@ public class KylinTableStatusConst {
     // 出票状态
     public static final Integer ENTITIES_STATUS0 = 0;    // 未出票
     public static final Integer ENTITIES_STATUS1 = 1;    // 已出票
+
+    /**
+     * 快递
+     */
+    public static final Integer ORDER_EXPRESS_STATUS1 = 1;    // 申请
+    public static final Integer ORDER_EXPRESS_STATUS2 = 2;    //   取消
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -95,4 +95,42 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
+    /**
+     * 取消
+     */
+    @RequiresPermissions("kylin:performancesExpress:cancelOrder")
+    @PostMapping("/cancelOrder")
+    @ResponseBody
+    public AjaxResult cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.cancelOrder(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 结果主动查询
+     */
+    @RequiresPermissions("kylin:performancesExpress:getResult")
+    @PostMapping("/getResult")
+    @ResponseBody
+    public AjaxResult getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getResult(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
 }

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

@@ -69,6 +69,8 @@
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var placeOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:placeOrder')}]];
+    var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
+    var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
 
     var prefix = ctx + "kylin/performancesExpress";
 
@@ -79,6 +81,8 @@
             url: prefix + "/performanceOrderList",
             modalName: "演出订单",
             placeOrderUrl: prefix + "/placeOrder",
+            cancelOrderUrl: prefix + "/cancelOrder",
+            getResultUrl: prefix + "/getResult",
             columns: [{
                 checkbox: true
             },
@@ -135,7 +139,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-danger btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
+                        actions.push('<a class="btn btn-default btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -167,12 +167,14 @@ public class MongoVoUtils {
         KylinOrderListVo voItem = new KylinOrderListVo();
         KylinOrderTicketVo data;
         if (dataSingle == null) {
-            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
+            data = (KylinOrderTicketVo) dataUtils.getOrderTicketVo(orderId);
+//            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
         } else {
             data = dataSingle;
         }
         BeanUtils.copyProperties(data, voItem);
-        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) dataUtils.getOrderList(userId);
+//        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
         if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java

@@ -19,6 +19,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     String expressContacts;
     String expressAddress;
     String expressPhone;
+    String expressStatus;
 
     Integer expressType;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpress.java

@@ -26,10 +26,12 @@ public class KylinOrderExpress implements Serializable {
 
     private String orderExpressId;
     private String orderTicketsId;
+    private String OrderExpressCode;
     private String mailno;
     private Integer expressType;
-    private Integer filterResult;
+    private String filterResult;
     private String remark;
+    private Integer expressStatus;
     private String origincode;
     private String destcode;
     private String printIcon;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -748,11 +748,12 @@ CREATE TABLE `kylin_order_express`
     `mid`                int unsigned NOT NULL AUTO_INCREMENT,
     `order_express_id`   varchar(255) NOT NULL DEFAULT '' COMMENT 'order_express_id',
     `order_tickets_id`   varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
+    `order_express_code` varchar(255) NOT NULL DEFAULT '' COMMENT '订单快递编号',
     `mailno`             varchar(255) NOT NULL DEFAULT '' COMMENT '顺丰运单号',
     `express_type`       tinyint      NOT NULL DEFAULT '0' COMMENT '快件产品类型 1顺丰特快...',
-    `filter_result`      tinyint      NOT NULL DEFAULT '0' COMMENT '1-人工确认；2-可收派；3-不可以收派',
+    `filter_result`      varchar(2)   NOT NULL DEFAULT '0' COMMENT '1-人工确认；2-可收派；3-不可以收派',
     `remark`             varchar(255) NOT NULL DEFAULT '' COMMENT 'filter_result=3时返回不可以收派的原因代码',
-    `status`             tinyint      NOT NULL DEFAULT '0' COMMENT '快递状态',
+    `express_status`     tinyint      NOT NULL DEFAULT '0' COMMENT '快递状态',
     `origincode`         varchar(255) NOT NULL DEFAULT '' COMMENT '原寄地区域代码 可用于顺丰电子面单标签打印',
     `destcode`           varchar(255) NOT NULL DEFAULT '' COMMENT '目的地区域代码 可用于顺丰电子面单标签打印',
     `print_icon`         varchar(255) NOT NULL DEFAULT '' COMMENT '打印图标',