Merge branch 'master-fix' into dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -829,6 +829,12 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
             if (makeBillOfLadingListBackVO.getSpecialPriceCount() > 0L) {
                 stringBuffer.append("申请特价").append(",");
             }
+            if (makeBillOfLadingListBackVO.getAdminDiscountCount() > 0L) {
+                stringBuffer.append("申请管理折扣").append(",");
+            }
+            if (makeBillOfLadingListBackVO.getBubbleDiscount() > 0L) {
+                stringBuffer.append("申请泡货优惠").append(",");
+            }
             if (makeBillOfLadingListBackVO.getHeavyDiscount() > 0L) {
                 stringBuffer.append("申请重货优惠").append(",");
             }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/makeBillOfLading/MakeBillOfLadingListBackVO.java

@@ -78,6 +78,10 @@ public class MakeBillOfLadingListBackVO {
 
     private Integer specialPriceCount;
 
+    private Integer adminDiscountCount;
+
+    private Integer bubbleDiscount;
+
     private Integer heavyDiscount;
 
     private String orderStatusString;

yudao-module-shipment/yudao-module-shipment-core/src/main/resources/mapper/MakeBillOfLadingMapper.xml

@@ -15,7 +15,9 @@
 	t.customs_type,
 	t.drawee as draweeCode,
 	(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type in (1,31) and c.deleted=0) as specialPriceCount,
-	(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type=4 and c.deleted=0) as heavyDiscount,
+	(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type in (2,32) and c.deleted=0) as adminDiscountCount,
+	(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type=4 and c.deleted=0) as bubbleDiscount,
+	(select count(*) from ecw_order_approval c where c.order_id=t.order_id and c.type=5 and c.deleted=0) as heavyDiscount,
 	t.is_cargo_control as isCargoControl,
 	t.sum_num as num,(
 	SELECT