add

yami-shop-bean/src/main/java/com/yami/shop/bean/vo/FreightStatisticsVo.java

@@ -32,7 +32,7 @@ public class FreightStatisticsVo {
 
     @ApiModelProperty("运输公司")
     @ExcelProperty("运输公司")
-    private String delivery = "邮政";
+    private String delivery;
 
     @ApiModelProperty("运单号")
     @ExcelProperty("运单号")

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/SkuController.java

@@ -85,6 +85,7 @@ public class SkuController {
     @GetMapping("/freightStatisticsList")
     @ApiOperation(value = "运费明细表-列表")
     public R<IPage<FreightStatisticsVo>> freightStatisticsList(PageParam<FreightStatisticsPo> page, FreightStatisticsPo po) {
+        System.out.println(po);
         if (po.getChannelIds().contains(0L)){
             List<IdNameVo> idNameVos = channelService.queryMyChannel(SecurityUtils.getSysUser().getUserId());
             if (!idNameVos.isEmpty()){

yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-    active: dev
-#    active: prod
+#    active: dev
+    active: prod
   #文件上传设置
   servlet:
 

yami-shop-service/src/main/resources/mapper/SkuMapper.xml

@@ -591,16 +591,25 @@
     </select>
 
     <select id="freightStatisticsList" resultType="com.yami.shop.bean.vo.FreightStatisticsVo">
-        SELECT @row_number := @row_number + 1 AS sort,a.pay_time,CONCAT(b.receiver,'  ',b.mobile) receiver,a.dvy_flow_id delivery_no,b.address to_address,a.freight_amount money,a.order_number order_no
+        SELECT @row_number := @row_number + 1 AS sort,a.pay_time,CONCAT(b.receiver,'  ',b.mobile) receiver,a.dvy_flow_id delivery_no,b.address to_address,a.freight_amount money,a.order_number order_no,
+        CASE WHEN a.dvy_type=1 THEN '邮政'
+        WHEN a.dvy_type=3 THEN '麦芽田-闪送'
+        ELSE
+        '其他'
+        END delivery
         FROM (SELECT @row_number := 0) sort,
         tz_order a
         LEFT JOIN tz_user_addr_order b on a.addr_order_id =b.addr_order_id
-        WHERE a.is_payed=1 and a.dvy_type=1 and a.hb_order_status not in(0,60)
+        WHERE a.is_payed=1 and a.hb_order_status not in(0,60)
         and a.channel_id in
         <foreach collection="po.channelIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
 
+        <if test="po.delivery != null">
+            and a.dvy_type=#{po.delivery}
+        </if>
+
         <if test="po.receiver != null and po.receiver != ''">
             AND b.receiver like concat('%',#{po.receiver} ,'%')
         </if>