yujian
2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -108,6 +108,8 @@
      <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />
      <result column="co_uid" property="userId" jdbcType="VARCHAR" />
      <result column="co_urank" property="urank" jdbcType="INTEGER" />
      <result column="co_child_source_type" property="childSourceType"
         jdbcType="VARCHAR" />
      <association property="userInfo" column="co_uid"
         resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />
      <association property="commonOrderGoods" column="co_order_goods_id"
@@ -151,6 +153,8 @@
      <result column="co_trade_id" property="tradeId" jdbcType="VARCHAR" />
      <result column="co_state_desc" property="stateDesc" jdbcType="VARCHAR" />
      <result column="co_urank" property="urank" jdbcType="INTEGER" />
      <result column="co_child_source_type" property="childSourceType"
         jdbcType="VARCHAR" />
      <association property="userInfo" column="co_uid"
         select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey" />
      <association property="commonOrderGoods" column="co_order_goods_id"
@@ -167,7 +171,7 @@
      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,co_urank
      co_update_time,co_state_desc,co_urank,co_child_source_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
@@ -464,6 +468,7 @@
         <foreach collection="listSource" item="item" open="AND ("
            close=")" separator="or">co.co_source_type = #{item}</foreach>
      </if>
      <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
      GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
      co.co_third_create_time DESC LIMIT ${start},${count}
   </select>
@@ -500,6 +505,7 @@
         <foreach collection="listSource" item="item" open="AND ("
            close=")" separator="or">co.co_source_type = #{item}</foreach>
      </if>
      <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
      GROUP BY co.`co_order_no`, co.`co_source_type` )A
   </select>
   <select id="listOrderGoodsInfo" resultMap="ResultMap"
@@ -1163,6 +1169,9 @@
         <foreach collection="listSource" item="item" open="AND ("
            close=")" separator="or">co.co_source_type = #{item}</foreach>
      </if>
      <if test="notBackSuVip == true">
         <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
      </if>
      GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
      co.co_third_create_time DESC LIMIT ${start},${count}
   </select>
@@ -1198,6 +1207,9 @@
         <foreach collection="listSource" item="item" open="AND ("
            close=")" separator="or">co.co_source_type = #{item}</foreach>
      </if>
      <if test="notBackSuVip == true">
         <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
      </if>
      GROUP BY co.`co_order_no`, co.`co_source_type` )A
   </select>
   <select id="countOrderByUidAndSettled" resultType="Long">SELECT