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

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

@@ -5,6 +5,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dao.OrderExpressListDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdminDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
@@ -229,13 +230,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 批量下单
+     * 批量下载图片
      */
-    @RequiresPermissions("kylin:performancesExpress:batchPrint")
-    @PostMapping("/batchPrint")
+    @RequiresPermissions("kylin:performancesExpress:batchGenerateImage")
+    @PostMapping("/batchGenerateImage")
     @ResponseBody
-    public ResponseDto batchPrint(@RequestParam("ids") String performanceId) {
-        String res = performancesExpressServiceImpl.batchPrint(performanceId);
+    public ResponseDto batchGenerateImage(@RequestParam("ids") String performanceId) {
+        String res = performancesExpressServiceImpl.batchGenerateImage(performanceId);
         try {
             if (res.isEmpty()) {
                 return ResponseDto.failure("处理失败");
@@ -248,13 +249,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 打印快递单
+     * 下载图片
      */
-    @RequiresPermissions("kylin:performancesExpress:print")
-    @PostMapping("/print")
+    @RequiresPermissions("kylin:performancesExpress:generateImage")
+    @PostMapping("/generateImage")
     @ResponseBody
-    public ResponseDto print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        String res = performancesExpressServiceImpl.print(performanceExpressSearchAdminParam);
+    public ResponseDto generateImage(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        String res = performancesExpressServiceImpl.generateImage(performanceExpressSearchAdminParam);
         try {
             if (res.isEmpty()) {
                 return ResponseDto.failure("处理失败");
@@ -266,4 +267,34 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
+    /**
+     * 批量打印获取数据
+     */
+    @RequiresPermissions("kylin:performancesExpress:batchPrintExpress")
+    @PostMapping("/batchPrintExpress")
+    @ResponseBody
+    public ResponseDto<List<OrderExpressListDao>> batchPrintExpress(@RequestParam("ids") String performanceId) {
+        List<OrderExpressListDao> res = performancesExpressServiceImpl.batchPrintExpress(performanceId);
+        try {
+            return ResponseDto.success(res);
+        } catch (Exception e) {
+            return ResponseDto.failure(e.getMessage());
+        }
+    }
+
+    /**
+     * 打印单条获取数据
+     */
+    @RequiresPermissions("kylin:performancesExpress:printExpress")
+    @PostMapping("/printExpress")
+    @ResponseBody
+    public ResponseDto<List<OrderExpressListDao>> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<OrderExpressListDao> res = performancesExpressServiceImpl.printExpress(performanceExpressSearchAdminParam);
+        try {
+            return ResponseDto.success(res);
+        } catch (Exception e) {
+            return ResponseDto.failure(e.getMessage());
+        }
+    }
+
 }

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

@@ -77,15 +77,16 @@
     var getFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getFreight')}]];
     var getListFreightFlag = [[${@permission.hasPermi('kylin:performancesExpress:getListFreight')}]];
     var listOrderRouteFlag = [[${@permission.hasPermi('kylin:performancesExpress:listOrderRoute')}]];
-    var printFlag = [[${@permission.hasPermi('kylin:performancesExpress:print')}]];
+    var generateImageFlag = [[${@permission.hasPermi('kylin:performancesExpress:generateImage')}]];
+    var printExpressFlag = [[${@permission.hasPermi('kylin:performancesExpress:printExpress')}]];
 
     var prefix = ctx + "kylin/performancesExpress";
 
     var orderStatusDic = [[${@dict.getType('zhengzai_order_status')}]];
 
-    function printAjax(orderExpressId) {
+    function generateImage(orderExpressId) {
         var configPrint = {
-            url: prefix + "/print",
+            url: prefix + "/generateImage",
             type: "post",
             dataType: "json",
             data: {ids: orderExpressId},
@@ -101,7 +102,7 @@
         $.ajax(configPrint)
     }
 
-    function printTest(orderExpressId) {
+    function printExpressData(list) {
         var LODOP = getLodop();
         LODOP.PRINT_INIT("运单打印");
         // LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "100mm*148mm");
@@ -231,6 +232,24 @@
         LODOP.ADD_PRINT_LINE("147mm", "0mm", "147mm", "100mm", 0, 1);
         LODOP.PRINT();
     }
+    function printExpress(orderExpressId) {
+        /*var configPrint = {
+            url: prefix + "/print",
+            type: "post",
+            dataType: "json",
+            data: {ids: orderExpressId},
+            beforeSend: function () {
+                $.modal.loading("正在处理中，请稍后...");
+            },
+            success: function (result) {
+                $.modal.closeLoading();
+                var url = "https://img.zhengzai.tv/" + result.data;
+                window.location.href = url;
+            }
+        };
+        $.ajax(configPrint)*/
+        printExpressData();
+    }
 
     $(function () {
         var options = {
@@ -242,7 +261,7 @@
             getListFreightUrl: prefix + "/getListFreight",
             getResultUrl: prefix + "/getResult",
             listOrderRouteUrl: prefix + "/listOrderRoute",
-            printUrl: prefix + "/print",
+            generateImageUrl: prefix + "/generateImage",
             columns: [{
                 checkbox: true
             },
@@ -342,9 +361,8 @@
                         var actions = [];
                         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-warning btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderExpressId + '\', \'确定批量打印吗？\', table.options.printUrl)"></i>打印</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="printAjax(\'' + row.orderExpressId + '\',)"></i>下载快递单</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + printFlag + '" href="javascript:void(0)" onclick="printTest(\'' + row.orderExpressId + '\',)"></i>打印test</a> ');
+                        // actions.push('<a class="btn btn-warning btn-xs ' + generateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.orderExpressId + '\',)"></i>下载快递单</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + printExpressFlag + '" href="javascript:void(0)" onclick="printExpress(\'' + row.orderExpressId + '\',)"></i>打印快递单</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');

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

@@ -40,11 +40,11 @@
     var batchPlaceOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchPlaceOrder')}]];
     var batchCancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchCancelOrder')}]];
     var prefix = ctx + "kylin/performancesExpress";
-    var batchPrintFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchPrint')}]];
+    var batchGenerateImageFlag = [[${@permission.hasPermi('kylin:performancesExpress:batchGenerateImage')}]];
 
-    function printAjax(performanceId) {
+    function generateImage(performanceId) {
         var configPrint = {
-            url: prefix + "/batchPrint",
+            url: prefix + "/batchGenerateImage",
             type: "post",
             dataType: "json",
             data: {ids: performanceId},
@@ -71,7 +71,7 @@
             detailUrl: prefix + "/performanceOrderList/{id}",
             batchPlaceOrderUrl: prefix + "/batchPlaceOrder",
             batchCancelOrderUrl: prefix + "/batchCancelOrder",
-            printUrl: prefix + "/print",
+            batchGenerateImageUrl: prefix + "/batchGenerateImage",
             modalName: "演出快递",
             columns: [
                 {
@@ -110,7 +110,7 @@
                         actions.push('<a class="btn btn-success btn-xs ' + performanceOrderListFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + batchPlaceOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\', \'确定批量下单吗？\', table.options.batchPlaceOrderUrl)"></i>下单</a> ');
                         actions.push('<a class="btn btn-warning btn-xs ' + batchCancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.performancesId + '\', \'确定批量取消吗？\', table.options.batchCancelOrderUrl)"></i>取消</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + batchPrintFlag + '" href="javascript:void(0)" onclick="printAjax(\'' + row.performancesId + '\',)"></i>下载快递单</a> ');
+                        // actions.push('<a class="btn btn-warning btn-xs ' + batchGenerateImageFlag + '" href="javascript:void(0)" onclick="generateImage(\'' + row.performancesId + '\',)"></i>下载快递单</a> ');
                         return actions.join('');
                     }
                 }]

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

@@ -573,7 +573,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         } while (count >= limitNum);
     }
 
-    public String print(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+    public String generateImage(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<String> ids = performanceExpressSearchAdminParam.getIds();
 
         for (String orderExpressId : ids) {
@@ -600,7 +600,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return upload.getOssPath();
     }
 
-    public String batchPrint(String performanceId) {
+    public String batchGenerateImage(String performanceId) {
         List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
 
         String ossPath = "";
@@ -608,8 +608,29 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             List<String> orderIds = orderList.stream().map(KylinOrderTickets -> KylinOrderTickets.getOrderTicketsId()).collect(Collectors.toList());
             PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam = new PerformanceExpressSearchAdminParam();
             performanceExpressSearchAdminParam.setIds(orderIds);
-            ossPath = print(performanceExpressSearchAdminParam);
+            ossPath = generateImage(performanceExpressSearchAdminParam);
         }
         return ossPath;
     }
+
+    public List<OrderExpressListDao> printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<String> ids = performanceExpressSearchAdminParam.getIds();
+
+        List<OrderExpressListDao> list = kylinOrderExpressMapper.selectPrintList(ids);
+
+        return list;
+    }
+
+    public List<OrderExpressListDao> batchPrintExpress(String performanceId) {
+        List<KylinOrderTickets> orderList = kylinOrderTicketsMapper.getCanCancelOrderList(performanceId, 0, 9999999);
+
+        String ossPath = "";
+        if (!CollectionUtil.isEmpty(orderList)) {
+            List<String> orderIds = orderList.stream().map(KylinOrderTickets -> KylinOrderTickets.getOrderTicketsId()).collect(Collectors.toList());
+            PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam = new PerformanceExpressSearchAdminParam();
+            performanceExpressSearchAdminParam.setIds(orderIds);
+            ossPath = generateImage(performanceExpressSearchAdminParam);
+        }
+        return null;
+    }
 }

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

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class OrderExpressListDao implements Serializable {
+    private String orderExpressId;
+    private String orderTicketsId;
+    private String orderExpressCode;
+    private String mailno;
+    private Integer expressType;
+    private String filterResult;
+    private String remark;
+    private Integer expressStatus;
+    private String origincode;
+    private String destcode;
+    private String printIcon;
+    private String twoDimensionCode;
+    private String printFlag;
+    private BigDecimal freightPrice;
+
+    private String return_tracking_no;
+    private String sourceTransferCode;
+    private String sourceCityCode;
+    private String sourceDeptCode;
+    private String sourceTeamCode;
+    private String destCityCode;
+    private String destDeptCode;
+    private String destDeptCodeMapping;
+    private String destTeamCode;
+    private String destTeamCodeMapping;
+    private String destTransferCode;
+    private String destRouteLabel;
+    private String proName;
+    private String cargoTypeCode;
+    private String limitTypeCode;
+    private String expressTypeCode;
+    private String codingMapping;
+    private String codingMappingOut;
+    private String xbFlag;
+    private String proCode;
+    private String abFlag;
+    private String destPortCode;
+    private String destCountry;
+    private String destPostCode;
+    private String goodsValueTotal;
+    private String currencySymbol;
+    private String goodsNumber;
+    private String twoDimensionCode2;
+    private String newIcon;
+    private String newAbflag;
+    private String createdAt;
+    private String updatedAt;
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderExpressMapper.java

 package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.kylin.dao.OrderExpressListDao;
 import com.liquidnet.service.kylin.entity.KylinOrderExpress;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单快递 Mapper 接口 处理数据库
@@ -13,4 +16,5 @@ import com.liquidnet.service.kylin.entity.KylinOrderExpress;
  */
 public interface KylinOrderExpressMapper extends BaseMapper<KylinOrderExpress> {
 
+    List<OrderExpressListDao> selectPrintList(List<String> ids);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderExpressMapper">
+
+    <select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
+        SELECT a.*,
+               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.numger
+               d.use_start, d.title, d.type,
+               e.title, e.type
+        FROM kylin_order_express a
+        INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
+        INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
+        INNER JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
+        INNER JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
+        <where>
+            AND a.order_express_id IN
+            <foreach collection="ids" item="orderExpressId" index="index" open="(" close=")" separator=",">
+                ${order_express_id}
+            </foreach>
+        </where>
+        ORDER BY mid DESC
+    </select>
+</mapper>