Merge branch 'feature_chw_zjw' into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderPersonInsurance.java

+package com.xxfc.platform.order.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单人身保险
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-11-26 18:56:21
+ */
+@Data
+@Table(name = "order_person_insurance")
+public class OrderPersonInsurance implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	    /**
+     *  基础订单id
+     */
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "基础订单id")
+    private Integer orderId;
+	
+	    /**
+     *  姓名
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "姓名")
+    private String name;
+	
+	    /**
+     *  身份证号码
+     */
+    @Column(name = "id_card")
+	@ApiModelProperty(value = "身份证号码")
+    private String idCard;
+	
+	    /**
+     *  订单的天数
+     */
+    @Column(name = "order_day")
+	@ApiModelProperty(value = "订单的天数")
+    private Integer orderDay;
+	
+	    /**
+     *  保险的天数
+     */
+    @Column(name = "insurance_day")
+	@ApiModelProperty(value = "保险的天数")
+    private Integer insuranceDay;
+	
+	    /**
+     *  金额
+     */
+    @Column(name = "amount")
+	@ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+	
+	    /**
+     *  状态 1--已支付；2--已退款
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态 1--已支付；2--已退款")
+    private Integer status;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Date crtTime;
+	
+	    /**
+     *  创建者id
+     */
+    @Column(name = "crt_user")
+	@ApiModelProperty(value = "创建者id")
+    private String crtUser;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Date updTime;
+	
+	    /**
+     *  更新者id
+     */
+    @Column(name = "upd_user")
+	@ApiModelProperty(value = "更新者id")
+    private String updUser;
+	
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderPersonInsuranceBiz.java

+package com.xxfc.platform.order.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import com.xxfc.platform.order.mapper.OrderPersonInsuranceMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 订单人身保险
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-11-26 18:56:21
+ */
+@Service
+public class OrderPersonInsuranceBiz extends BaseBiz<OrderPersonInsuranceMapper, OrderPersonInsurance> {
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderPersonInsuranceMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 订单人身保险
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2020-11-26 18:56:21
+ */
+public interface OrderPersonInsuranceMapper extends Mapper<OrderPersonInsurance> {
+	
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderPersonInsuranceController.java

+package com.xxfc.platform.order.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderPersonInsuranceBiz;
+import com.xxfc.platform.order.entity.OrderPersonInsurance;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("orderPersonInsurance")
+public class OrderPersonInsuranceController extends BaseController<OrderPersonInsuranceBiz, OrderPersonInsurance> {
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/OrderPersonInsuranceMapper.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.xxfc.platform.order.mapper.OrderPersonInsuranceMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.order.entity.OrderPersonInsurance" id="orderPersonInsuranceMap">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="name" column="name"/>
+        <result property="idCard" column="id_card"/>
+        <result property="orderDay" column="order_day"/>
+        <result property="insuranceDay" column="insurance_day"/>
+        <result property="amount" column="amount"/>
+        <result property="status" column="status"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="crtUser" column="crt_user"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="updUser" column="upd_user"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file