1

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

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}  " ,
-            "<if test='status != null'> and status = #{status} </if>",
+            "<if test='status != null'> and pay_status = #{status} </if>",
             "GROUP BY day",
             "</script>"
     })
@@ -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<OutOrderModel> getListOrderCount(String finishTimeS , String finishTimeE , Integer status);
 
@@ -108,7 +108,7 @@ public interface OutRechargeOrderMapperExt {
     List<OutRechargeOrderModel> selectOrderCount(@Param("map") Map<String,Object> 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 = {
             "<script>",
             "select sum(order_price) orderPrice, sum(pay_real_price)  payRealPrice , count(*) count ",
-            "from out_recharge_order where status in (2,3) and Identification_code = #{code}",
+            "from out_recharge_order where pay_status in (2,3) and Identification_code = #{code}",
             "</script>"
     })
     @Results({

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() {
+    public Integer getPayStatus() {
-        return status;
+        return payStatus;
     }
 
-    public void setStatus(Integer status) {
+    public void setPayStatus(Integer payStatus) {
-        this.status = status;
+        this.payStatus = payStatus;
     }
 
     public Date getDay() {