fanli-server.git

			@@ -31,8 +31,8 @@
			<id column="co_order_goods_id" property="id" jdbcType="BIGINT" />
			</association>
			</resultMap>




			<resultMap id="BaseDetailResultMap" type="com.yeshi.fanli.entity.order.CommonOrder">
			<id column="co_id" property="id" jdbcType="BIGINT" />
			<result column="co_order_no" property="orderNo" jdbcType="VARCHAR" />
			@@ -57,8 +57,9 @@
			<id column="co_uid" property="id" jdbcType="BIGINT" />
			</association>

			<association property="commonOrderGoods" resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap">

			<association property="commonOrderGoods"
			resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap">

			</association>
			</resultMap>

			@@ -122,6 +123,14 @@
			* from yeshi_ec_common_order where co_order_no=#{orderNo}
			and
			co_source_type=#{orderType} and co_order_by=#{orderBy}
			</select>

			<select id="countByUidAndOrderStateWithOrderBalanceTime"
			resultType="java.lang.Long">
			SELECT COUNT(*) FROM yeshi_ec_common_order co WHERE
			co.`co_state`=#{state} and co.`co_uid`=#{uid} and co.`co_settle_time`
			is not null and co.`co_settle_time`>=#{minDate} and
			#{maxDate}>co.`co_settle_time`
			</select>


			@@ -290,7 +299,7 @@
			DESC
			LIMIT ${start},${count}
			</select>


			<select id="countMoneyGroupOrderNoByUid" resultType="java.util.Map">
			SELECT COALESCE(SUM(A.moneys),0)AS totalMoney,COUNT(*) AS totalRow FROM
			(SELECT COALESCE(SUM(th.`hb_money`),0)AS moneys FROM yeshi_ec_common_order tc
			@@ -402,7 +411,7 @@
			parameterType="java.util.List">
			SELECT COALESCE(SUM(tc.`co_settlement`),0)AS
			totalSettlement,COALESCE(SUM(tc.`co_count`),0)AS
			totalCount,tc.`co_source_type`,tc.`co_order_no`,tg.*
			totalCount,tc.`co_source_type`,tc.`co_order_no`,tg.*,tc.co_id
			FROM
			yeshi_ec_common_order_goods tg
			LEFT JOIN yeshi_ec_common_order tc ON