FEAT: 直播订单导出修改

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -43,6 +43,7 @@ import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStoreOrderStatus;
 import com.fs.store.domain.FsUser;
 import com.fs.store.mapper.FsStoreDeliversMapper;
+import com.fs.store.mapper.FsStoreProductMapper;
 import com.fs.store.mapper.FsWarehousesMapper;
 import com.fs.store.param.*;
 import com.fs.store.service.IFsExpressService;
@@ -115,6 +116,7 @@ public class LiveOrderController extends BaseController
     }
 
 
+
     /**
      * 导出订单列表
      */
@@ -123,7 +125,8 @@ public class LiveOrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(LiveOrder liveOrder)
     {
-        List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
+        List<LiveOrder> list = liveOrderService.selectLiveOrderListExport(liveOrder);
+
         for (LiveOrder order : list) {
             order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
             order.setUserAddress(ParseUtils.parseAddress(order.getUserAddress()));

fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -20,76 +20,87 @@ public class LiveOrder extends BaseEntity {
 
     /** 订单ID */
     private Long orderId;
-
-    /** 直播ID */
-    @Excel(name = "直播ID")
-    private Long liveId;
-
-    /** $column.columnComment */
-//    @Excel(name = "店铺ID")
-    private Long storeId;
-
-    @Excel(name = "商品id")
-    private Long productId;
-
     /** 订单号 */
     @Excel(name = "订单号")
     private String orderCode;
-
-    /** 用户id */
-    @Excel(name = "用户id")
+    /** 会员ID */
+    @Excel(name = "会员ID")
     private String userId;
 
+    /** 管易云订单号 */
+    @Excel(name = "管易云订单号")
+    private String extendOrderId;
+
+    @Excel(name = "所属公司")
+    private String companyName;
+    @Excel(name = "所属销售")
+    private String companyUserName;
+
+    @Excel(name = "推线编号")
+    private String registerCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "客户创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date customerCreateTime;
+    @Excel(name = "客户来源",dictType = "crm_customer_source")
+    private Long source;
+    @Excel(name = "成单类型", dictType = "store_order_type")
+    private String orderType;
+
+    @Excel(name = "套餐包分类", dictType = "store_product_package_cate")
+    private String cateId;
     /** 收货人 */
-    @Excel(name = "收货人")
+    @Excel(name = "收货人姓名")
     private String userName;
 
     /** 收货人电话 */
     @Excel(name = "收货人电话")
     private String userPhone;
 
+
     /** 详细地址 */
     @Excel(name = "详细地址")
     private String userAddress;
 
-    /** 购物车id */
-    @Excel(name = "购物车id")
-    private String cartId;
+    /** $column.columnComment */
+//    @Excel(name = "店铺ID")
+    private Long storeId;
+
+    private Long productId;
 
-    /** 订单商品总数 */
-    @Excel(name = "订单商品总数")
-    private String totalNum;
 
     /** 订单总价 */
-    @Excel(name = "订单总价")
+    @Excel(name = "商品金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal totalPrice;
 
     /** 实际支付金额 */
-    @Excel(name = "实际支付金额")
+    @Excel(name = "应付金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payPrice;
 
-    /** 支付金额 */
-    @Excel(name = "支付金额")
+    @Excel(name = "实付金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal payMoney;
 
-    /** 支付状态 待支付 1已支付 */
-    @Excel(name = "支付状态",readConverterExp = "待支付=0,已支付=1")
-    private String isPay;
+    @Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal payDelivery;
 
-    /** 取消理由*/
-    @Excel(name = "取消理由")
-    private String cancelReason;
+    @Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal payPostage;
+
+    /** 抵扣金额 */
+    @Excel(name = "抵扣金额",cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal deductionPrice;
+
+    /** 优惠券金额 */
+    @Excel(name = "优惠券金额",cellType= Excel.ColumnType.NUMERIC)
+    private BigDecimal discountMoney;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payTime;
-
-    // 支付开始时间
-    private String payStartTime;
-    // 支付结束时间
-    private String payEndTime;
-
     /** 支付方式 1微信 */
     @Excel(name = "支付方式", readConverterExp = "微信=1")
     private String payType;
@@ -98,31 +109,21 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "订单状态", dictType = "store_order_status")
     private Integer status;
 
-    /** 0 未退款 1 申请中 2 已退款 */
-    @Excel(name = "退款状态",readConverterExp = "未退款=0,申请中=1,已退款=2")
-    private String refundStatus;
-
-    /** 退款图片 */
-    @Excel(name = "退款图片")
-    private String refundImg;
-
-    /** 退款用户说明 */
-    @Excel(name = "退款用户说明")
-    private String refundExplain;
+    @Excel(name = "交易单号")
+    private String bankTrxId;
 
     /** 退款时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date refundTime;
 
-    /** 不退款的理由 */
-    @Excel(name = "不退款的理由")
-    private String refundReason;
-
     /** 退款金额 */
     @Excel(name = "退款金额")
     private BigDecimal refundMoney;
 
+
+
+
     /** 快递公司编号 */
     @Excel(name = "快递公司编号")
     private String deliveryCode;
@@ -135,29 +136,124 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "快递单号")
     private String deliverySn;
 
+    /** 备注*/
+    @Excel(name = "备注")
+    private String remark;
+
+
+    @Excel(name = "物流代收结算状态", dictType = "store_delivery_pay_status")
+    private Integer deliveryPayStatus;
+
+    @Excel(name = "快递帐单日期")
+    private String deliveryTime;
+
+    /** $column.columnComment */
+    @Excel(name = "快递结算日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private String deliveryPayTime;
+
+    @Excel(name = "物流结算费用")
+    private BigDecimal deliveryPayMoney;
+
+    /** 物流跟踪状态 */
+    @Excel(name = "物流跟踪状态", dictType = "store_order_delivery_type")
+    private String deliveryType;
+
+    /** 物流状态 */
+    @Excel(name = "物流状态",dictType = "store_order_delivery_status")
+    private Integer deliveryStatus;
+
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @Excel(name = "商品名称")
+    private String productName;
+
+    @Excel(name = "套餐名称",width = 60)
+    private String packageTitle;
+
+    @Excel(name = "是否上传凭证 0：未上传 1：已上传")
+    private Integer isUpload;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadTime;
+
+    @Excel(name = "归属档期")
+    private String scheduleName;
+    /** 直播ID */
+    @Excel(name = "直播ID")
+    private Long liveId;
+
+    /** 购物车id */
+//    @Excel(name = "购物车id")
+    private String cartId;
+
+    /** 订单商品总数 */
+//    @Excel(name = "订单商品总数")
+    private String totalNum;
+
+
+    /** 支付状态 待支付 1已支付 */
+//    @Excel(name = "支付状态",readConverterExp = "待支付=0,已支付=1")
+    private String isPay;
+
+    /** 取消理由*/
+    @Excel(name = "取消理由")
+    private String cancelReason;
+
+
+
+    // 支付开始时间
+    private String payStartTime;
+    // 支付结束时间
+    private String payEndTime;
+
+
+
+
+
+    /** 0 未退款 1 申请中 2 已退款 */
+//    @Excel(name = "退款状态",readConverterExp = "未退款=0,申请中=1,已退款=2")
+    private String refundStatus;
+
+    /** 退款图片 */
+//    @Excel(name = "退款图片")
+    private String refundImg;
+
+    /** 退款用户说明 */
+//    @Excel(name = "退款用户说明")
+    private String refundExplain;
+
+
+
+    /** 不退款的理由 */
+//    @Excel(name = "不退款的理由")
+    private String refundReason;
+
+
     /** 是否删除 */
-    @Excel(name = "是否删除")
+//    @Excel(name = "是否删除")
     private String isDel;
 
     /** 成本价 */
-    @Excel(name = "成本价")
+//    @Excel(name = "成本价")
     private BigDecimal costPrice;
 
     /** 核销码 */
-    @Excel(name = "核销码")
+//    @Excel(name = "核销码")
     private String verifyCode;
 
     /** 配送方式 1=快递 ，2=门店自提 */
-    @Excel(name = "配送方式",readConverterExp = "快递=1,门店自提=2")
+//    @Excel(name = "配送方式",readConverterExp = "快递=1,门店自提=2")
     private Integer shippingType;
 
     /** 支付渠道(1微信小程序) */
-    @Excel(name = "支付渠道(1微信小程序)")
+//    @Excel(name = "支付渠道(1微信小程序)")
     private String isChannel;
 
     /** $column.columnComment */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
     // 完成时间-开始
@@ -165,163 +261,120 @@ public class LiveOrder extends BaseEntity {
     // 完成时间-结束
     private String finishTimeEnd;
 
-    /** 发货时间 */
-    @Excel(name = "发货时间")
-    private String deliveryTime;
 
     /** 推广佣金 */
-    @Excel(name = "推广佣金")
+//    @Excel(name = "推广佣金")
     private BigDecimal tuiMoney;
 
     /** 推广佣金状态 1已发放 0待发放 */
-    @Excel(name = "推广佣金状态",readConverterExp = "已发放=1,待发放=0")
+//    @Excel(name = "推广佣金状态",readConverterExp = "已发放=1,待发放=0")
     private Integer tuiMoneyStatus;
 
     /** 上级推荐人ID */
-    @Excel(name = "上级推荐人ID")
+//    @Excel(name = "上级推荐人ID")
     private Long tuiUserId;
 
     /** orderItem字符串 */
-    @Excel(name = "orderItem字符串")
+//    @Excel(name = "orderItem字符串")
     private String itemJson;
 
     /** 优惠金额 */
-    @Excel(name = "优惠金额")
-    private BigDecimal discountMoney;
+//    @Excel(name = "优惠金额")
+
 
     /** $column.columnComment */
-    @Excel(name = "优惠金额")
+//    @Excel(name = "优惠金额")
     private Long userCouponId;
 
     /** 公司id */
 //    @Excel(name = "公司id")
     private Long companyId;
 
+
     /** 公司员工id */
 //    @Excel(name = "公司员工id")
     private Long companyUserId;
 
-    @Excel(name = "公司名称")
-    private String companyName;
-    @Excel(name = "销售名称")
-    private String companyUserName;
+
 
     /** 仓库代码 */
     @Excel(name = "仓库代码")
     private String storeHouseCode;
 
-    /** 扩展订单ID */
-    @Excel(name = "扩展订单ID")
-    private String extendOrderId;
-
-    /** 支付运费 */
-    @Excel(name = "支付运费")
-    private BigDecimal payDelivery;
-
     /** 剩余金额 */
-    @Excel(name = "剩余金额")
+//    @Excel(name = "剩余金额")
     private BigDecimal payRemain;
 
-    /** 物流状态 */
-    @Excel(name = "物流状态",dictType = "store_order_delivery_status")
-    private Integer deliveryStatus;
-
-    /** 物流结算状态 */
-    @Excel(name = "物流支付状态")
-    private Integer deliveryPayStatus;
-
-    /** $column.columnComment */
-    @Excel(name = "物流支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private String deliveryPayTime;
-
-    /** 物流跟踪状态 */
-    @Excel(name = "物流跟踪状态", dictType = "store_order_delivery_type")
-    private String deliveryType;
-
-    /** 物流结算金额 */
-    @Excel(name = "物流支付金额")
-    private BigDecimal deliveryPayMoney;
 
     /** 回单导入时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "回单导入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "回单导入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryImportTime;
 
     /** 发货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
 
     /** 是否可售后 */
-    @Excel(name = "是否可售后")
+//    @Excel(name = "是否可售后")
     private Integer isAfterSales;
 
     /** 部门id */
-    @Excel(name = "部门id")
+//    @Excel(name = "部门id")
     private Long deptId;
 
     /** 渠道 */
-    @Excel(name = "渠道")
+//    @Excel(name = "渠道")
     private String channel;
 
-    /** 订单来源 */
-    @Excel(name = "订单来源")
-    private Long source;
 
     /** 开票金额 */
-    @Excel(name = "开票金额")
+//    @Excel(name = "开票金额")
     private BigDecimal billPrice;
 
     /** 邮费 */
-    @Excel(name = "邮费")
+//    @Excel(name = "邮费")
     private BigDecimal totalPostage;
 
-    /** 支付邮费 */
-    @Excel(name = "支付邮费")
-    private BigDecimal payPostage;
 
     /** 消费赚取积分 */
-    @Excel(name = "消费赚取积分")
+//    @Excel(name = "消费赚取积分")
     private BigDecimal gainIntegral;
 
     /** 使用积分 */
-    @Excel(name = "使用积分")
+//    @Excel(name = "使用积分")
     private BigDecimal useIntegral;
 
     /** 实际支付积分 */
-    @Excel(name = "实际支付积分")
+//    @Excel(name = "实际支付积分")
     private BigDecimal payIntegral;
 
     /** 给用户退了多少积分 */
-    @Excel(name = "给用户退了多少积分")
+//    @Excel(name = "给用户退了多少积分")
     private BigDecimal backIntegral;
 
     /** 是否改价 */
-    @Excel(name = "是否改价")
+//    @Excel(name = "是否改价")
     private Integer isEditMoney;
 
-    /** 创建时间*/
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
 
     /** 更新时间*/
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /** 备注*/
-    @Excel(name = "备注")
-    private String remark;
+
 
     /** 备注*/
-    @Excel(name = "订单名称")
+//    @Excel(name = "订单名称")
     private String orderName;
 
     /** 备注*/
-    @Excel(name = "订单名称")
+//    @Excel(name = "订单名称")
     private String productIntroduce;
 
     /** 备注*/
-    @Excel(name = "订单key")
+//    @Excel(name = "订单key")
     private String orderKey;
 
     /** 城市Id*/

fs-service-system/src/main/java/com/fs/live/service/ILiveOrderService.java

@@ -43,6 +43,7 @@ public interface ILiveOrderService {
      * @return 订单集合
      */
     List<LiveOrder> selectLiveOrderList(LiveOrder liveOrder);
+    List<LiveOrder> selectLiveOrderListExport(LiveOrder liveOrder);
 
 
     /**

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -761,6 +761,39 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         return liveOrders;
     }
 
+    @Override
+    public List<LiveOrder> selectLiveOrderListExport(LiveOrder liveOrder) {
+        List<LiveOrder> liveOrders = baseMapper.selectLiveOrderList(liveOrder);
+        if(CollectionUtils.isEmpty(liveOrders)){
+            return liveOrders;
+        }
+        List<Long> collect = liveOrders.stream().map(LiveOrder::getOrderId)
+                .filter(Objects::nonNull).collect(Collectors.toList());
+
+        if(CollectionUtils.isEmpty(collect)) {
+            return Collections.emptyList();
+        }
+        Map<Long, FsStoreDelivers> byOrderIdWithTypeBatch = fsStoreDeliversMapper
+                .findByOrderIdWithTypeBatch(collect, 1);
+        for (LiveOrder order : liveOrders) {
+            FsStoreDelivers delivers = byOrderIdWithTypeBatch.get(order.getOrderId());
+            if(ObjectUtil.isNotNull(delivers)) {
+                order.setDeliveryCode(delivers.getDeliverSn());
+                order.setDeliveryName(delivers.getDeliverName());
+                order.setDeliverySn(delivers.getDeliverId());
+                order.setDeliveryStatus(delivers.getStatus());
+                order.setDeliveryType(String.valueOf(delivers.getStateEx()));
+            } else {
+                order.setDeliveryCode(null);
+                order.setDeliveryName(null);
+                order.setDeliverySn(null);
+                order.setDeliveryStatus(null);
+                order.setDeliveryType(null);
+            }
+        }
+        return liveOrders;
+    }
+
     @Override
     public List<LiveOrderListVo> selectLiveOrderListVo(LiveOrder liveOrder) {
         List<LiveOrderListVo> liveOrders = baseMapper.selectLiveOrderListVo(liveOrder.getUserId(),liveOrder.getStatus());

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreProductMapper.java

@@ -239,4 +239,13 @@ public interface FsStoreProductMapper
             "</if>" +
             "</script>"})
     List<FsStoreProductListVO> liveList(@Param("maps") LiveGoods maps);
+
+    @Select(" select sp.product_id as product_id, " +
+            "sp.warehouse_code as warehouse_code, " +
+            "fw.erp as erp, " +
+            "sp.product_name as product_name " +
+            " from fs_store_product sp " +
+            " left join fs_warehouses fw " +
+            " on sp.warehouse_code=fw.warehouse_code ")
+    Map<Long, FsStoreProduct> selectAllProductMappingInfoLiveOrder();
 }

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -108,7 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.pay_remain,	a.delivery_status,	a.delivery_pay_status,	a.delivery_pay_time,	a.delivery_type,
         a.delivery_pay_money,	a.delivery_import_time,	a.delivery_send_time,	a.is_after_sales,	a.dept_id,
         a.channel,	a.source,	a.bill_price,	a.total_postage,	a.pay_postage,	a.gain_integral,
-        a.use_integral,	a.pay_integral,	a.back_integral,	a.is_edit_money,	b.product_info as product_introduce,a.customer_id
+        a.use_integral,	a.pay_integral,	a.back_integral,	a.is_edit_money,	b.product_info as product_introduce,a.customer_id,
+        b.product_name as product_name
         FROM
         live_order a LEFT JOIN fs_store_product b ON a.product_id = b.product_id
         left join company_user cu on a.company_user_id = cu.user_id