diff --git a/hai-bweb/src/main/resources/dev/application.yml b/hai-bweb/src/main/resources/dev/application.yml index b3326583..21d771dd 100644 --- a/hai-bweb/src/main/resources/dev/application.yml +++ b/hai-bweb/src/main/resources/dev/application.yml @@ -9,7 +9,7 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://139.159.177.244:3306/hsg_test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: HF123456. type: com.alibaba.druid.pool.DruidDataSource diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java index 3e099165..6b08cdc8 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java @@ -28,11 +28,11 @@ public interface OutRechargeOrderMapperExt { "count(1) as count,", "sum(pay_price) as pay_price,", "sum(order_price) as order_price,", - "`status`", + "`pay_status`", "from out_recharge_order", "where ", " create_timed between #{finishTimeS} and #{finishTimeE} " , - " and status = #{status} ", + " and pay_status = #{status} ", "GROUP BY day", "" }) @@ -41,7 +41,7 @@ public interface OutRechargeOrderMapperExt { @Result(column="day", property="day", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), - @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), }) List getListOrderCount(String finishTimeS , String finishTimeE , Integer status); @@ -108,7 +108,7 @@ public interface OutRechargeOrderMapperExt { List selectOrderCount(@Param("map") Map map); - @Select({"SELECT * FROM out_recharge_order ho WHERE TIMESTAMPDIFF(MINUTE,ho.create_timed,SYSDATE()) > 15 AND ho.status = 1"}) + @Select({"SELECT * FROM out_recharge_order ho WHERE TIMESTAMPDIFF(MINUTE,ho.create_timed,SYSDATE()) > 15 AND ho.pay_status = 101"}) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @@ -147,7 +147,7 @@ public interface OutRechargeOrderMapperExt { @Select(value = { "" }) @Results({ diff --git a/hai-service/src/main/java/com/hai/model/OutOrderModel.java b/hai-service/src/main/java/com/hai/model/OutOrderModel.java index 5bf2c3e2..1de5c073 100644 --- a/hai-service/src/main/java/com/hai/model/OutOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/OutOrderModel.java @@ -18,14 +18,14 @@ public class OutOrderModel { */ private BigDecimal orderPrice; - private Integer status; + private Integer payStatus; - public Integer getStatus() { - return status; + public Integer getPayStatus() { + return payStatus; } - public void setStatus(Integer status) { - this.status = status; + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; } public Date getDay() { diff --git a/v1/target/hai-v1-1.0-SNAPSHOT.jar b/v1/target/hai-v1-1.0-SNAPSHOT.jar index f7213b9a..07d2a24d 100644 Binary files a/v1/target/hai-v1-1.0-SNAPSHOT.jar and b/v1/target/hai-v1-1.0-SNAPSHOT.jar differ diff --git a/v1/target/hai-v1-1.0-SNAPSHOT.jar.original b/v1/target/hai-v1-1.0-SNAPSHOT.jar.original index 118ef6a0..bedf98de 100644 Binary files a/v1/target/hai-v1-1.0-SNAPSHOT.jar.original and b/v1/target/hai-v1-1.0-SNAPSHOT.jar.original differ