新增院线通订单管理模块

common/src/main/java/com/winsun/bean/YxtAddress.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 〈院线能地址信息〉
+ *
+ * @author PXL
+ * @create 2020/5/7 16:46
+ */
+@Data
+@TableName("hhr_yxt_address")
+public class YxtAddress implements Serializable {
+    private static final long serialVersionUID = -8075106948609530240L;
+    /**
+     *
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     *
+     */
+    @TableField("user_id")
+    private String userId;
+    /**
+     * 地址
+     */
+    @TableField("area")
+    private String area;
+    /**
+     * 详细地址
+     */
+    @TableField("detail_address")
+    private String detailAddress;
+    /**
+     * 收货人
+     */
+    @TableField("consignee")
+    private String consignee;
+    /**
+     * 收货人电话
+     */
+    @TableField("phone")
+    private String phone;
+    /**
+     *
+     */
+    @TableField("del_flag")
+    private Integer delFlag;
+    /**
+     *
+     */
+    @TableField("update_date")
+    private Date updateDate;
+    /**
+     * 是否默认地址  0：否 1：是
+     */
+    @TableField("is_default")
+    private Integer isDefault;
+}

common/src/main/java/com/winsun/bean/YxtOrder.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 〈院线通订单信息类〉
+ *
+ * @author PXL
+ * @create 2020/5/7 16:21
+ */
+@Data
+@TableName("hhr_yxt_order")
+public class YxtOrder implements Serializable {
+    private static final long serialVersionUID = 4315993781602576770L;
+    /**
+     *
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     *
+     */
+    @TableField("user_id")
+    private String userId;
+    /**
+     *订单号
+     */
+    @TableField("order_num")
+    private String orderNum;
+    /**
+     *微信支付订单号
+     */
+    @TableField("wx_order_num")
+    private String wxOrderNum;
+    /**
+     *金额
+     */
+    @TableField("total_price")
+    private double totalPrice;
+    /**
+     *订单状态 (1:未付款  2：付款成功 3：付款失败  4：已取消订单)
+     */
+    @TableField("state")
+    private Integer state;
+    /**
+     *创建时间
+     */
+    @TableField("update_date")
+    private Date updateDate;
+    /**
+     *是否删除(1.已删除，2.不删除)
+     */
+    @TableField("del_flag")
+    private Integer delFlag;
+    /**
+     *兑换券购买数
+     */
+    @TableField("goods_num")
+    private Integer goodsNum;
+    /**
+     *兑换券单价
+     */
+    @TableField("unit_price")
+    private double unitPrice;
+    /**
+     *订单类型
+     */
+    @TableField("order_type")
+    private String orderType;
+    /**
+     *地址id
+     */
+    @TableField("address_id")
+    private Integer addressId;
+    /**
+     * 快递状态(0:无须快递,1:寄出,2:已寄出)
+     */
+    @TableField("express_state")
+    private Integer expressState;
+    /**
+     *物流公司
+     */
+    @TableField("logistics_company")
+    private String logisticsCompany;
+    /**
+     *快递单号
+     */
+    @TableField("express_number")
+    private String expressNumber;
+    /**
+     * 信息推送状态(0:未发模板,1:已发订单通知,2:已发发货通知)
+     */
+    @TableField("template_state")
+    private Integer templateState;
+
+}

common/src/main/java/com/winsun/bean/YxtOrderDetail.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 〈院线通订单和兑换券中间表〉
+ *
+ * @author PXL
+ * @create 2020/5/8 11:56
+ */
+@Data
+@TableName("hhr_yxt_order_detail")
+public class YxtOrderDetail implements Serializable {
+    /**
+     *
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     *
+     */
+    @TableField("order_id")
+    private Integer orderId;
+    /**
+     *
+     */
+    @TableField("yxt_id")
+    private Integer yxtId;
+}

common/src/main/java/com/winsun/mapper/YxtAddressMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.YxtAddress;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈院线能地址表〉
+ *
+ * @author PXL
+ * @create 2020/5/7 16:53
+ */
+@Mapper
+@Component
+public interface YxtAddressMapper extends BaseMapper<YxtAddress> {
+}

common/src/main/java/com/winsun/mapper/YxtOrderDetailMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.YxtOrderDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈院线通兑换券中间表〉
+ *
+ * @author PXL
+ * @create 2020/5/8 11:59
+ */
+@Mapper
+@Component
+public interface YxtOrderDetailMapper extends BaseMapper<YxtOrderDetail> {
+}

common/src/main/java/com/winsun/mapper/YxtOrderMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.YxtOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * 〈院线通订单Mapper〉
+ *
+ * @author PXL
+ * @create 2020/5/7 16:22
+ */
+@Mapper
+@Component
+public interface YxtOrderMapper extends BaseMapper<YxtOrder> {
+}

service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java

@@ -98,6 +98,22 @@ public class ExcelDealUtils {
 		resultMap.put("sheetName", sheetName);
 		return resultMap;
 	}
+	// 院线通订单导出excel表头
+	public static Map<String, Object> yxtOrderExcel(String sheetName){
+		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
+		headMap.put("订单号", "orderNum");
+		headMap.put("金额", "totalPrice");
+		headMap.put("订单状态", "state");
+		headMap.put("订单类型", "orderType");
+		headMap.put("账号", "account");
+		headMap.put("姓名", "sysuName");
+		headMap.put("学校", "schoolName");
+		headMap.put("县分", "substName");
+		headMap.put("创建时间", "updateDate");
+		Map<String, Object> resultMap = dealHeadMap(headMap);
+		resultMap.put("sheetName", sheetName);
+		return resultMap;
+	}
 	// 兑换券导出excel表头
 	public static Map<String, Object> exchangeCouponExcel(String sheetName){
 		Map<String, Object> headMap = new LinkedHashMap<String, Object>();