Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -57,7 +57,8 @@
         <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>


@@ -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