diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java index 1674f01..5fbaf69 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java @@ -76,8 +76,8 @@ public interface BsGasOrderMapperExt { " = #{param.payTimeS} ]]> " + " " + " and b.`status` in (${param.status}) " + - " ORDER BY b.pay_time desc) a where" + - " a.gainsRebateUserId = #{param.userId} OR a.gainsRebateOneUserId = #{param.userId} OR a.gainsRebateTwoUserId = #{param.userId}" + + " ORDER BY b.pay_time desc) a " + + " where a.gainsRebateUserId = #{param.userId} OR a.gainsRebateOneUserId = #{param.userId} OR a.gainsRebateTwoUserId = #{param.userId} " + "") @Results({ @Result(column="id", property="id", jdbcType= JdbcType.BIGINT, id=true), diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java index 83b494a..d8cd0b4 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderSpreadMapperExt.java @@ -49,21 +49,22 @@ public interface BsGasOrderSpreadMapperExt { " select sum(b.gains_rebate_one_amount) totalAmount" + " from bs_gas_order a LEFT JOIN bs_gas_order_spread b on a.order_no = b.order_no" + " WHERE a.`status` in (${param.status})" + - " and b.gains_rebate_user_id = #{param.userId} " + + " and b.gains_rebate_one_user_id = #{param.userId} " + " = #{param.payTimeS} ]]> " + " " + " union all" + " select sum(b.gains_rebate_two_amount) totalAmount" + " from bs_gas_order a LEFT JOIN bs_gas_order_spread b on a.order_no = b.order_no" + " WHERE a.`status` in (${param.status})" + - " and b.gains_rebate_user_id = #{param.userId} " + + " and b.gains_rebate_two_user_id = #{param.userId} " + " = #{param.payTimeS} ]]> " + " " + " ) a" + "") BigDecimal countSettleOrderPrice(@Param("param") Map param); - @Select(" select " + + @Select("") BigDecimal queryNotCashOutAmount(@Param("userId") Long userId); @Select(" select " +