订单 加入状态描述

yujian

2019-10-17 c0163bdd0c3a8c8d98371e251b9f960fc0eb2236

订单 加入状态描述

 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java

@@ -105,6 +105,10 @@


    @Column(name = "co_trade_id")

    private String tradeId;

	
    // 状态说明

    @Column(name = "co_state_desc")

    private String stateDesc;



    // 创建时间

    @Column(name = "co_create_time")

@@ -274,4 +278,12 @@
        this.tradeId = tradeId;

    }



    public String getStateDesc() {

        return stateDesc;

    }



    public void setStateDesc(String stateDesc) {

        this.stateDesc = stateDesc;

    }



}


 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -23,6 +23,7 @@
        <result column="co_create_time" property="createTime" jdbcType="TIMESTAMP" />

        <result column="co_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />

        <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />

        <association property="userInfo" column="co_uid"

            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">

            <id column="co_uid" property="id" jdbcType="BIGINT" />

@@ -54,6 +55,7 @@
        <result column="co_create_time" property="createTime" jdbcType="TIMESTAMP" />

        <result column="co_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />

        <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />

        <association property="userInfo" column="co_uid"

            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">

            <id column="co_uid" property="id" jdbcType="BIGINT" />

@@ -99,7 +101,7 @@
        <result column="hb_id" property="hongbaoId" jdbcType="BIGINT" />



        <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />



        <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />

        <association property="userInfo" column="co_uid"

            resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />



@@ -145,6 +147,7 @@
        <result column="userPortrait" property="userPortrait" jdbcType="VARCHAR" />

        <result column="hb_id" property="hongbaoId" jdbcType="BIGINT" />

        <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />

        <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />



        <association property="userInfo" column="co_uid"

            select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />

@@ -153,8 +156,16 @@
            select="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.selectByPrimaryKey" />

    </resultMap>



    <sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_state_whole_order,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_order_by,co_create_time,co_update_time,co_trade_id

    <sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_state_whole_order,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_order_by,co_create_time,co_update_time,co_trade_id,co_state_desc

    </sql>

	
    <sql id="Order_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,

        co_order_goods_id,co_count,co_state,co_state_whole_order,

        co_estimate,co_eIncome,co_payment,co_settlement, co_third_create_time,

        MAX(co_settle_time) AS co_settle_time, co_order_by, co_create_time,

        co_update_time,co_state_desc

    </sql>

	
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

        select

@@ -237,9 +248,9 @@
    </delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.order.CommonOrder"

        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_common_order

        (co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_create_time,co_update_time,co_state_whole_order,co_order_by,co_trade_id)

        (co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_create_time,co_update_time,co_state_whole_order,co_order_by,co_trade_id,co_state_desc)

        values

        (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{orderNo,jdbcType=VARCHAR},#{sourceType,jdbcType=INTEGER},#{sourcePosition,jdbcType=VARCHAR},#{commonOrderGoods.id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{estimate,jdbcType=DECIMAL},#{eIncome,jdbcType=DECIMAL},#{payment,jdbcType=DECIMAL},#{settlement,jdbcType=DECIMAL},#{thirdCreateTime,jdbcType=TIMESTAMP},#{settleTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{stateWholeOrder,jdbcType=INTEGER},#{orderBy,jdbcType=INTEGER},#{tradeId,jdbcType=VARCHAR})

        (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{orderNo,jdbcType=VARCHAR},#{sourceType,jdbcType=INTEGER},#{sourcePosition,jdbcType=VARCHAR},#{commonOrderGoods.id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{estimate,jdbcType=DECIMAL},#{eIncome,jdbcType=DECIMAL},#{payment,jdbcType=DECIMAL},#{settlement,jdbcType=DECIMAL},#{thirdCreateTime,jdbcType=TIMESTAMP},#{settleTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{stateWholeOrder,jdbcType=INTEGER},#{orderBy,jdbcType=INTEGER},#{tradeId,jdbcType=VARCHAR},#{stateDesc,jdbcType=VARCHAR})

    </insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.order.CommonOrder"

        useGeneratedKeys="true" keyProperty="id">

@@ -264,6 +275,7 @@
            <if test="createTime != null">co_create_time,</if>

            <if test="updateTime != null">co_update_time,</if>

            <if test="tradeId != null">co_trade_id,</if>

            <if test="stateDesc != null">co_state_desc,</if>

        </trim>

        values

        <trim prefix="(" suffix=")" suffixOverrides=",">

@@ -285,7 +297,8 @@
            <if test="orderBy != null">#{orderBy,jdbcType=INTEGER},</if>

            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>

            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="tradeId != null">#{tradeId,jdbcType=VARCHAR}</if>

            <if test="tradeId != null">#{tradeId,jdbcType=VARCHAR},</if>

            <if test="stateDesc != null">#{stateDesc,jdbcType=VARCHAR}</if>

        </trim>

    </insert>

    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.order.CommonOrder">update

@@ -307,7 +320,8 @@
        #{orderBy,jdbcType=INTEGER},co_create_time =

        #{createTime,jdbcType=TIMESTAMP},co_update_time =

        #{updateTime,jdbcType=TIMESTAMP} ,co_trade_id

        =#{tradeId,jdbcType=VARCHAR} where co_id = #{id,jdbcType=BIGINT}

        =#{tradeId,jdbcType=VARCHAR},co_state_desc

        =#{stateDesc,jdbcType=VARCHAR} where co_id = #{id,jdbcType=BIGINT}

    </update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.order.CommonOrder">

        update yeshi_ec_common_order

@@ -335,6 +349,7 @@
            <if test="updateTime != null">co_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="id !=null">co_id =#{id,jdbcType=BIGINT},</if>

            <if test="tradeId !=null">co_trade_id =#{tradeId,jdbcType=VARCHAR},</if>

            <if test="stateDesc !=null">co_state_desc =#{stateDesc,jdbcType=VARCHAR},</if>

        </set>

        where co_id = #{id,jdbcType=BIGINT}

    </update>

@@ -412,12 +427,6 @@
    </sql>

    <sql id="Hongbao_Column_List">hb_id,hb_uid,hb_urank,hb_pid,hb_type,hb_state,hb_pre_get_time,hb_get_time,hb_version,

        IF(v2.`hb_state` = 4, 0, v2.hb_money)AS hb_money

    </sql>

    <sql id="Order_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,

        co_order_goods_id,co_count,co_state,co_state_whole_order,

        co_estimate,co_eIncome,co_payment,co_settlement, co_third_create_time,

        MAX(co_settle_time) AS co_settle_time, co_order_by, co_create_time,

        co_update_time

    </sql>



    <select id="listUserOrder" resultMap="ResultMap">


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -543,6 +543,10 @@
            order.setHongBaoState(orderHongBaoState);

            order.setHongBaoDate(hongBaoDate);



            if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {

                stateContent = stateContent + "-" + order.getStateDesc();

            }

			
            Map<String, String> stateMap = new HashMap<String, String>();

            stateMap.put("content", stateContent);

            stateMap.put("fontColor", stateFontColor);