Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 years ago
parent
commit
007a85d7c2
41 changed files with 8066 additions and 6051 deletions
  1. 13 13
      GeneratorConfig.xml
  2. 2 0
      pom.xml
  3. 11 11
      src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java
  4. 80 0
      src/main/java/com/goafanti/common/dao/NewOrderRefundMapper.java
  5. 94 94
      src/main/java/com/goafanti/common/dao/TOrderBillNewMapper.java
  6. 1 0
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  7. 0 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  8. 54 22
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml
  9. 323 0
      src/main/java/com/goafanti/common/mapper/NewOrderRefundMapper.xml
  10. 336 381
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  11. 686 654
      src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml
  12. 67 3
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  13. 21 3
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  14. 0 1
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  15. 130 84
      src/main/java/com/goafanti/common/model/NewOrderChange.java
  16. 146 16
      src/main/java/com/goafanti/common/model/NewOrderChangeExample.java
  17. 171 0
      src/main/java/com/goafanti/common/model/NewOrderRefund.java
  18. 703 0
      src/main/java/com/goafanti/common/model/NewOrderRefundExample.java
  19. 551 487
      src/main/java/com/goafanti/common/model/TOrderBillNew.java
  20. 1412 1292
      src/main/java/com/goafanti/common/model/TOrderBillNewExample.java
  21. 17 0
      src/main/java/com/goafanti/order/bo/InputNewOrderRefund.java
  22. 8 0
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  23. 15 0
      src/main/java/com/goafanti/order/bo/OutNewOrderRefund.java
  24. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java
  25. 4 2
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  26. 10 0
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  27. 66 0
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  28. 5 4
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  29. 2 0
      src/main/java/com/goafanti/order/service/OrderBillService.java
  30. 14 0
      src/main/java/com/goafanti/order/service/OrderChangeService.java
  31. 2 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  32. 2 2
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  33. 526 524
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  34. 22 0
      src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java
  35. 909 806
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  36. 239 237
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java
  37. 1243 1239
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  38. 8 6
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  39. 87 87
      src/main/resources/props/config_local.properties
  40. 78 78
      src/main/resources/props/config_test.properties
  41. 1 3
      src/main/resources/spring-context-4.0.xsd

+ 13 - 13
GeneratorConfig.xml

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-<generatorConfiguration>
-  <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" />
-   <!-- <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" /> -->
-  <context id="context1">	
-    <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft" 
-    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
-    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
-    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
-    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="new_order_change"/>
-  </context>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+  <!-- <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> -->
+   <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" />
+  <context id="context1">	
+    <jdbcConnection connectionURL="jdbc:mysql://101.37.32.31:3306/aft" 
+    	driverClass="com.mysql.jdbc.Driver" password="dev123456" userId="dev" />
+    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
+    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
+    <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
+    <table schema="aft" tableName="new_order_refund"/>
+  </context>
 </generatorConfiguration>

+ 2 - 0
pom.xml

@@ -452,6 +452,8 @@
 		</repository>
 	</repositories>
 
+
+    
 	<pluginRepositories>
 		<pluginRepository>
 			<id>aliyun-plugin</id>

+ 11 - 11
src/main/java/com/goafanti/common/dao/NewOrderChangeMapper.java

@@ -14,68 +14,68 @@ public interface NewOrderChangeMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	long countByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int deleteByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int insert(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int insertSelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	List<NewOrderChange> selectByExample(NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	NewOrderChange selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderChange record,
 			@Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int updateByExample(@Param("record") NewOrderChange record, @Param("example") NewOrderChangeExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderChange record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderChange record);
 

+ 80 - 0
src/main/java/com/goafanti/common/dao/NewOrderRefundMapper.java

@@ -0,0 +1,80 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.NewOrderRefund;
+import com.goafanti.common.model.NewOrderRefundExample;
+import com.goafanti.order.bo.OutNewOrderRefund;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface NewOrderRefundMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	long countByExample(NewOrderRefundExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int deleteByExample(NewOrderRefundExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int insert(NewOrderRefund record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int insertSelective(NewOrderRefund record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	List<NewOrderRefund> selectByExample(NewOrderRefundExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	NewOrderRefund selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") NewOrderRefund record,
+			@Param("example") NewOrderRefundExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int updateByExample(@Param("record") NewOrderRefund record, @Param("example") NewOrderRefundExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int updateByPrimaryKeySelective(NewOrderRefund record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	int updateByPrimaryKey(NewOrderRefund record);
+
+	List<OutNewOrderRefund> listRefund(Integer id);
+}

+ 94 - 94
src/main/java/com/goafanti/common/dao/TOrderBillNewMapper.java

@@ -1,95 +1,95 @@
-package com.goafanti.common.dao;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.goafanti.common.model.TOrderBillNew;
-import com.goafanti.common.model.TOrderBillNewExample;
-import com.goafanti.order.bo.BillBo;
-
-public interface TOrderBillNewMapper {
-    /**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	long countByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int deleteByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int deleteByPrimaryKey(String billNo);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int insert(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int insertSelective(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	List<TOrderBillNew> selectByExample(TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	TOrderBillNew selectByPrimaryKey(String billNo);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int updateByExampleSelective(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int updateByExample(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int updateByPrimaryKeySelective(TOrderBillNew record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
-	 * @mbg.generated  Mon Oct 14 09:49:04 CST 2019
-	 */
-	int updateByPrimaryKey(TOrderBillNew record);
-
-	BigDecimal getAmountByOid(String oid);
-    
-    TOrderBillNew getOneRefundFlow(String BillNo);
-    
-    List<TOrderBillNew> getOneOrderAllRefundFlow(String oid);
-    
-    List<TOrderBillNew> getDeptBySome(TOrderBillNew ob);
-    
-    List<TOrderBillNew> getBillData(TOrderBillNew ob);
-
-	BigDecimal conutAmountByOrderNo(String orderNo);
-
-	List<BillBo> selectByOrderNo(String orderNo);
-
-	void insertBatch(List<TOrderBillNew> listBull);
-
+package com.goafanti.common.dao;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.goafanti.common.model.TOrderBillNew;
+import com.goafanti.common.model.TOrderBillNewExample;
+import com.goafanti.order.bo.BillBo;
+
+public interface TOrderBillNewMapper {
+    /**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	long countByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int deleteByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int deleteByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int insert(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int insertSelective(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	List<TOrderBillNew> selectByExample(TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	TOrderBillNew selectByPrimaryKey(String billNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByExample(@Param("record") TOrderBillNew record, @Param("example") TOrderBillNewExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TOrderBillNew record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_bill_new
+	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
+	 */
+	int updateByPrimaryKey(TOrderBillNew record);
+
+	BigDecimal getAmountByOid(String oid);
+    
+    TOrderBillNew getOneRefundFlow(String BillNo);
+    
+    List<TOrderBillNew> getOneOrderAllRefundFlow(String oid);
+    
+    List<TOrderBillNew> getDeptBySome(TOrderBillNew ob);
+    
+    List<TOrderBillNew> getBillData(TOrderBillNew ob);
+
+	BigDecimal conutAmountByOrderNo(String orderNo);
+
+	List<BillBo> selectByOrderNo(String orderNo);
+
+	void insertBatch(List<TOrderBillNew> listBull);
+
 }

+ 1 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -98,4 +98,5 @@ public interface TOrderNewMapper {
 	TOrderBillNew getLastPayment(String orderNo);
 	int updateSalesmanId(@Param("aid")String aid, @Param("transferId")String transferId);
 	List<TOrderNewBo> selectUsedOrderByOrder(String orderNo);
+	void updaterefund(TOrderNew o);
 }

+ 0 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -40,7 +40,6 @@
     <result column="audit_status" property="auditStatus" jdbcType="INTEGER" />
     <result column="tech_broker_id" property="techBrokerId" jdbcType="VARCHAR" />
     <result column="boutique" property="boutique" jdbcType="INTEGER" />
-    <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="urgent_days" property="urgentDays" jdbcType="INTEGER" />
     <result column="urgent_money" property="urgentMoney" jdbcType="DECIMAL" />
   </resultMap>

+ 54 - 22
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -35,12 +35,14 @@
     <result column="estimate_refundable" jdbcType="DECIMAL" property="estimateRefundable" />
     <result column="refund_Invoice" jdbcType="DECIMAL" property="refundInvoice" />
     <result column="used_order" jdbcType="VARCHAR" property="usedOrder" />
+    <result column="refund_status" jdbcType="INTEGER" property="refundStatus" />
+    <result column="refund_url" jdbcType="VARCHAR" property="refundUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -74,7 +76,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -108,19 +110,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     id, order_no, process_state, status, type, create_time, remarks, voucher_url, total_amount, 
     settlement_amount, change_amount, applicant, dep_name, project_state, zxs_cost, zxs_remarks, 
     payment_time, payment_amount, invoice_time, invoice_amount, invoice_type, cw_cost, 
     refundable_amount, cw_remarks, estimate_cost, estimate_refundable, refund_Invoice, 
-    used_order
+    used_order, refund_status, refund_url
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     select
     <if test="distinct">
@@ -139,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -150,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     delete from new_order_change
     where id = #{id,jdbcType=INTEGER}
@@ -159,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     delete from new_order_change
     <if test="_parameter != null">
@@ -170,7 +172,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     insert into new_order_change (id, order_no, process_state, 
       status, type, create_time, 
@@ -181,7 +183,8 @@
       invoice_time, invoice_amount, invoice_type, 
       cw_cost, refundable_amount, cw_remarks, 
       estimate_cost, estimate_refundable, refund_Invoice, 
-      used_order)
+      used_order, refund_status, refund_url
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, 
       #{status,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{remarks,jdbcType=VARCHAR}, #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
@@ -191,13 +194,14 @@
       #{invoiceTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL}, #{invoiceType,jdbcType=VARCHAR}, 
       #{cwCost,jdbcType=DECIMAL}, #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, 
       #{estimateCost,jdbcType=DECIMAL}, #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, 
-      #{usedOrder,jdbcType=VARCHAR})
+      #{usedOrder,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, #{refundUrl,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderChange">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     insert into new_order_change
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -285,6 +289,12 @@
       <if test="usedOrder != null">
         used_order,
       </if>
+      <if test="refundStatus != null">
+        refund_status,
+      </if>
+      <if test="refundUrl != null">
+        refund_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -371,13 +381,19 @@
       <if test="usedOrder != null">
         #{usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="refundStatus != null">
+        #{refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="refundUrl != null">
+        #{refundUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderChangeExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     select count(*) from new_order_change
     <if test="_parameter != null">
@@ -388,7 +404,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     update new_order_change
     <set>
@@ -476,6 +492,12 @@
       <if test="record.usedOrder != null">
         used_order = #{record.usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="record.refundStatus != null">
+        refund_status = #{record.refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.refundUrl != null">
+        refund_url = #{record.refundUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -485,7 +507,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     update new_order_change
     set id = #{record.id,jdbcType=INTEGER},
@@ -515,7 +537,9 @@
       estimate_cost = #{record.estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{record.estimateRefundable,jdbcType=DECIMAL},
       refund_Invoice = #{record.refundInvoice,jdbcType=DECIMAL},
-      used_order = #{record.usedOrder,jdbcType=VARCHAR}
+      used_order = #{record.usedOrder,jdbcType=VARCHAR},
+      refund_status = #{record.refundStatus,jdbcType=INTEGER},
+      refund_url = #{record.refundUrl,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -524,7 +548,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     update new_order_change
     <set>
@@ -609,6 +633,12 @@
       <if test="usedOrder != null">
         used_order = #{usedOrder,jdbcType=VARCHAR},
       </if>
+      <if test="refundStatus != null">
+        refund_status = #{refundStatus,jdbcType=INTEGER},
+      </if>
+      <if test="refundUrl != null">
+        refund_url = #{refundUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -616,7 +646,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 14:39:13 CST 2020.
+      This element was generated on Mon Feb 17 09:09:57 CST 2020.
     -->
     update new_order_change
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -645,7 +675,9 @@
       estimate_cost = #{estimateCost,jdbcType=DECIMAL},
       estimate_refundable = #{estimateRefundable,jdbcType=DECIMAL},
       refund_Invoice = #{refundInvoice,jdbcType=DECIMAL},
-      used_order = #{usedOrder,jdbcType=VARCHAR}
+      used_order = #{usedOrder,jdbcType=VARCHAR},
+      refund_status = #{refundStatus,jdbcType=INTEGER},
+      refund_url = #{refundUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">
@@ -676,8 +708,8 @@ select
   
   <select id="selectById" resultType="com.goafanti.order.bo.NewOrderChangeBo">
   select
-	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,
-	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,
+	a.id, a.order_no orderNo, a.process_state processState, a.status, a.`type`,a.refundable_amount refundableAmount,a.refund_url refundUrl,
+	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes, a.remarks, a.voucher_url voucherUrl,a.cw_cost cwCost,a.refund_status refundStatus,
 	a.total_amount totalAmount, a.settlement_amount settlementAmount, (a.total_amount-a.settlement_amount) arrears,
 	a.change_amount changeAmount, a.applicant, a.dep_name depName, a.project_state projectState, a.zxs_cost zxsCost,
 	a.zxs_remarks zxsRemarks, date_format(a.payment_time, '%Y-%m-%d')paymentTimes, a.payment_amount paymentAmount,

+ 323 - 0
src/main/java/com/goafanti/common/mapper/NewOrderRefundMapper.xml

@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.NewOrderRefundMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.NewOrderRefund">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
+    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    id, cid, order_no, create_time, refund_time, refund_amount, remarks
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from new_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from new_order_refund
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    delete from new_order_refund
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    delete from new_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.NewOrderRefund">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    insert into new_order_refund (id, cid, order_no, 
+      create_time, refund_time, refund_amount, 
+      remarks)
+    values (#{id,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, 
+      #{remarks,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderRefund">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    insert into new_order_refund
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="refundTime != null">
+        refund_time,
+      </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundTime != null">
+        #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundAmount != null">
+        #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderRefundExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    select count(*) from new_order_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.refundTime != null">
+        refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.refundAmount != null">
+        refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    set id = #{record.id,jdbcType=INTEGER},
+      cid = #{record.cid,jdbcType=INTEGER},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
+      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewOrderRefund">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    <set>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundTime != null">
+        refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.NewOrderRefund">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Feb 19 09:01:39 CST 2020.
+    -->
+    update new_order_refund
+    set cid = #{cid,jdbcType=INTEGER},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      refund_time = #{refundTime,jdbcType=TIMESTAMP},
+      refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      remarks = #{remarks,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="listRefund" resultType="com.goafanti.order.bo.OutNewOrderRefund">
+    select id,cid,order_no orderNo,refund_amount refundAmount,refund_time refundTime,DATE_FORMAT(refund_time,'%Y-%m-%d') refundDate,remarks
+   from new_order_refund  where cid = #{id}
+  </select>
+</mapper>

+ 336 - 381
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -1,382 +1,337 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.NewsMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.News">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="edit_time" jdbcType="TIMESTAMP" property="editTime" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="title_img" jdbcType="VARCHAR" property="titleImg" />
-    <result column="author" jdbcType="VARCHAR" property="author" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="hot" jdbcType="INTEGER" property="hot" />
-    <result column="source" jdbcType="VARCHAR" property="source" />
-    <result column="source_url" jdbcType="VARCHAR" property="sourceUrl" />
-    <result column="summary" jdbcType="VARCHAR" property="summary" />
-    <result column="jmrh_flag" jdbcType="INTEGER" property="jmrhFlag" />
-    <result column="province_id" jdbcType="INTEGER" property="provinceId" /> 
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.News">
-    <result column="content" jdbcType="LONGVARCHAR" property="content" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, create_time, edit_time, title, title_img, author, type, hot, source, source_url, 
-    summary,jmrh_flag,province_id
-  </sql>
-  <sql id="Blob_Column_List">
-    content
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select 
-    id,
-    content,
-    create_time as createTime, 
-    edit_time as editTime, 
-    title, 
-    title_img as titleImg, 
-    author, 
-    type, 
-    hot,
-    source, 
-    source_url as sourceUrl, 
-    summary,
-    jmrh_flag as jmrhFlag,
-    province_id as provinceId,
-    audit_status as auditStatus,
-    release_status as releaseStatus,
-    top_number as topNumber,
-    hotspot
-    from news
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from news
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.News">
-    insert into news (id, create_time, edit_time, 
-      title, title_img, author, 
-      type, hot, source, 
-      source_url, summary, content,jmrh_flag,province_id,top_number,hotspot
-      )
-    values (#{id,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{editTime,jdbcType=TIMESTAMP}, 
-      #{title,jdbcType=VARCHAR}, #{titleImg,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
-      #{type,jdbcType=INTEGER}, #{hot,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, 
-      #{sourceUrl,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR},
-      #{jmrhFlag,jdbcType=INTEGER}, #{provinceId,jdbcType=INTEGER}, #{topNumber,jdbcType=INTEGER}, #{hotspot,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.News">
-    insert into news
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="editTime != null">
-        edit_time,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="titleImg != null">
-        title_img,
-      </if>
-      <if test="author != null">
-        author,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="hot != null">
-        hot,
-      </if>
-      <if test="source != null">
-        source,
-      </if>
-      <if test="sourceUrl != null">
-        source_url,
-      </if>
-      <if test="summary != null">
-        summary,
-      </if>
-      <if test="content != null">
-        content,
-      </if>
-      <if test="jmrhFlag != null">
-      	jmrh_flag,
-      </if>
-      <if test="provinceId != null">
-      	province_id,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="editTime != null">
-        #{editTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="titleImg != null">
-        #{titleImg,jdbcType=VARCHAR},
-      </if>
-      <if test="author != null">
-        #{author,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="hot != null">
-        #{hot,jdbcType=INTEGER},
-      </if>
-      <if test="source != null">
-        #{source,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceUrl != null">
-        #{sourceUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="summary != null">
-        #{summary,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-       <if test="jmrhFlag != null">
-        #{jmrhFlag,jdbcType=INTEGER},
-      </if>
-      <if test="provinceId != null">
-        #{provinceId,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.News">
-    update news
-    <set>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="editTime != null">
-        edit_time = #{editTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="titleImg != null">
-        title_img = #{titleImg,jdbcType=VARCHAR},
-      </if>
-      <if test="author != null">
-        author = #{author,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
-      </if>
-      <if test="hot != null">
-        hot = #{hot,jdbcType=INTEGER},
-      </if>
-      <if test="source != null">
-        source = #{source,jdbcType=VARCHAR},
-      </if>
-      <if test="sourceUrl != null">
-        source_url = #{sourceUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="summary != null">
-        summary = #{summary,jdbcType=VARCHAR},
-      </if>
-      <if test="content != null">
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="jmrhFlag != null">
-        content = #{jmrhFlag,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.News">
-    update news
-    set create_time = #{createTime,jdbcType=TIMESTAMP},
-      edit_time = #{editTime,jdbcType=TIMESTAMP},
-      title = #{title,jdbcType=VARCHAR},
-      title_img = #{titleImg,jdbcType=VARCHAR},
-      author = #{author,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      hot = #{hot,jdbcType=INTEGER},
-      source = #{source,jdbcType=VARCHAR},
-      source_url = #{sourceUrl,jdbcType=VARCHAR},
-      summary = #{summary,jdbcType=VARCHAR},
-      content = #{content,jdbcType=LONGVARCHAR},
-      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
-      province_id = #{provinceId,jdbcType=INTEGER},
-      audit_status = #{auditStatus,jdbcType=INTEGER},
-      release_status = #{releaseStatus,jdbcType=INTEGER},
-      top_number = #{topNumber,jdbcType=INTEGER},
-      hotspot = #{hotspot,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.News">
-    update news
-    set create_time = #{createTime,jdbcType=TIMESTAMP},
-      edit_time = #{editTime,jdbcType=TIMESTAMP},
-      title = #{title,jdbcType=VARCHAR},
-      title_img = #{titleImg,jdbcType=VARCHAR},
-      author = #{author,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
-      hot = #{hot,jdbcType=INTEGER},
-      source = #{source,jdbcType=VARCHAR},
-      source_url = #{sourceUrl,jdbcType=VARCHAR},
-      summary = #{summary,jdbcType=VARCHAR},
-      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
-      province_id = #{provinceId,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="portalNewsList" resultType="com.goafanti.news.bo.NewsPortalList">
-		select
-			a.id,
-			DATE_FORMAT(a.create_time,'%Y-%m-%d') as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source,
-			a.content
-		from news a
-		where
-		a.type != 1 and a.type != 2
-		<if test="provinceId != null">
-			and a.province_id = #{provinceId,jdbcType=INTEGER}
-		</if>
-
-		<if test="type != null and type != 0 " >
-			and a.type = #{type,jdbcType=INTEGER}
-		</if>
-		<!-- 
-		<if test="hot != null">
-			and a.hot = #{hot,jdbcType=INTEGER}
-		</if> 
-		-->
-		<if test="keyword != null">
-			and a.title like concat('%',#{keyword},'%')
-		</if>	
-		order by create_time desc
-		<if test="page_sql != null">
-			${page_sql}
-		</if>
-	</select>
-	
-	<select id="portalNewsCount" resultType="java.lang.Integer">
-		select 
-			count(0)
-		from news a
-		where 
-		a.type != 1 and a.type != 2
-		<if test="provinceId != null">
-			and a.province_id = #{provinceId,jdbcType=INTEGER}
-		</if>
-		<if test="type != null and type != 0 and type != 1 and type != 2" >
-			and a.type = #{type,jdbcType=INTEGER}
-		</if>
-		<!-- 	
-		<if test="hot != null">
-			and a.hot = #{hot,jdbcType=INTEGER}
-		</if>
-		-->
-		<if test="keyword != null">
-			and a.title like concat('%',#{keyword},'%')
-		</if>
-	</select>
-	<select id="portalNewsPolicy" resultType="com.goafanti.news.bo.NewsPortalList">
-		select
-			a.id,
-			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source,
-			a.content
-		from news a
-		where
-		a.type =5 or a.type =4
-		order by create_time desc
-	</select>
-	<select id="portalNewsQuestion" resultType="com.goafanti.news.bo.NewsPortalList">
-		select
-			a.id,
-			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source,
-			a.content
-		from news a
-		where
-		a.type =2
-		order by create_time desc
-	</select>
-	<select id="newsInterest" resultType="com.goafanti.news.bo.newsInterestBo">
-		select
-		n.id,n.title ,n.create_time as createTime
-	from news_interest ni
-	LEFT  join news n on ni.new_id=n.id
-	where uid=#{uid,jdbcType=VARCHAR}
-	</select>
-	
-	
-	<select id="appNewsList" resultType="com.goafanti.news.bo.NewsPortalList">
-		select
-			a.id,
-			DATE_FORMAT(a.create_time,'%Y-%m-%d') as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source,
-			a.content,
-			top_number as topNumber,
-    		hotspot
-		from news a
-		left join district_glossory d on a.province_id=d.id
-		where
-		a.type != 1 and a.type != 2
-		<if test="param != null">
-			and a.title like concat('%',#{param},'%')
-			or a.source like concat('%',#{param},'%')
-			or d.name like concat('%',#{param},'%')
-		</if>	
-		order by  IF(ISNULL(top_number),1,0) ,top_number asc,
-				 IF(ISNULL(hotspot),1,0),hotspot  asc,
-				create_time desc
-		<if test="page_sql != null">
-			${page_sql}
-		</if>
-	</select>
-	
-	<select id="appNewsCount" resultType="java.lang.Integer">
-		select 
-			count(0)
-		from news a
-		left join district_glossory d on a.province_id=d.id
-		where 
-		a.type != 1 and a.type != 2
-		<if test="param != null">
-			and a.title like concat('%',#{param},'%')
-			or a.source like concat('%',#{param},'%')
-			or d.name like concat('%',#{param},'%')
-		</if>	
-	</select>
-	
-	
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.NewsMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.News">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="edit_time" jdbcType="TIMESTAMP" property="editTime" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="title_img" jdbcType="VARCHAR" property="titleImg" />
+    <result column="author" jdbcType="VARCHAR" property="author" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="hot" jdbcType="INTEGER" property="hot" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="source_url" jdbcType="VARCHAR" property="sourceUrl" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
+    <result column="jmrh_flag" jdbcType="INTEGER" property="jmrhFlag" />
+    <result column="province_id" jdbcType="INTEGER" property="provinceId" /> 
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.News">
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_time, edit_time, title, title_img, author, type, hot, source, source_url, 
+    summary,jmrh_flag,province_id
+  </sql>
+  <sql id="Blob_Column_List">
+    content
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    id,
+    content,
+    create_time as createTime, 
+    edit_time as editTime, 
+    title, 
+    title_img as titleImg, 
+    author, 
+    type, 
+    hot,
+    source, 
+    source_url as sourceUrl, 
+    summary,
+    jmrh_flag as jmrhFlag,
+    province_id as provinceId,
+    audit_status as auditStatus,
+    release_status as releaseStatus,
+    top_number as topNumber,
+    hotspot
+    from news
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from news
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.News">
+    insert into news (id, create_time, edit_time, 
+      title, title_img, author, 
+      type, hot, source, 
+      source_url, summary, content,jmrh_flag,province_id,top_number,hotspot
+      )
+    values (#{id,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{editTime,jdbcType=TIMESTAMP}, 
+      #{title,jdbcType=VARCHAR}, #{titleImg,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, 
+      #{type,jdbcType=INTEGER}, #{hot,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, 
+      #{sourceUrl,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR},
+      #{jmrhFlag,jdbcType=INTEGER}, #{provinceId,jdbcType=INTEGER}, #{topNumber,jdbcType=INTEGER}, #{hotspot,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.News">
+    insert into news
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="editTime != null">
+        edit_time,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="titleImg != null">
+        title_img,
+      </if>
+      <if test="author != null">
+        author,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="hot != null">
+        hot,
+      </if>
+      <if test="source != null">
+        source,
+      </if>
+      <if test="sourceUrl != null">
+        source_url,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="jmrhFlag != null">
+      	jmrh_flag,
+      </if>
+      <if test="provinceId != null">
+      	province_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleImg != null">
+        #{titleImg,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="hot != null">
+        #{hot,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceUrl != null">
+        #{sourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=LONGVARCHAR},
+      </if>
+       <if test="jmrhFlag != null">
+        #{jmrhFlag,jdbcType=INTEGER},
+      </if>
+      <if test="provinceId != null">
+        #{provinceId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.News">
+    update news
+    <set>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editTime != null">
+        edit_time = #{editTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="titleImg != null">
+        title_img = #{titleImg,jdbcType=VARCHAR},
+      </if>
+      <if test="author != null">
+        author = #{author,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="hot != null">
+        hot = #{hot,jdbcType=INTEGER},
+      </if>
+      <if test="source != null">
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceUrl != null">
+        source_url = #{sourceUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="jmrhFlag != null">
+        content = #{jmrhFlag,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.News">
+    update news
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      title = #{title,jdbcType=VARCHAR},
+      title_img = #{titleImg,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      hot = #{hot,jdbcType=INTEGER},
+      source = #{source,jdbcType=VARCHAR},
+      source_url = #{sourceUrl,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=VARCHAR},
+      content = #{content,jdbcType=LONGVARCHAR},
+      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
+      province_id = #{provinceId,jdbcType=INTEGER},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      release_status = #{releaseStatus,jdbcType=INTEGER},
+      top_number = #{topNumber,jdbcType=INTEGER},
+      hotspot = #{hotspot,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.News">
+    update news
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      title = #{title,jdbcType=VARCHAR},
+      title_img = #{titleImg,jdbcType=VARCHAR},
+      author = #{author,jdbcType=VARCHAR},
+      type = #{type,jdbcType=INTEGER},
+      hot = #{hot,jdbcType=INTEGER},
+      source = #{source,jdbcType=VARCHAR},
+      source_url = #{sourceUrl,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=VARCHAR},
+      jmrh_flag = #{jmrhFlag,jdbcType=INTEGER},
+      province_id = #{provinceId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="portalNewsList" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			DATE_FORMAT(a.create_time,'%Y-%m-%d') as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where
+		a.type != 1 and a.type != 2
+		<if test="provinceId != null">
+			and a.province_id = #{provinceId,jdbcType=INTEGER}
+		</if>
+
+		<if test="type != null and type != 0 " >
+			and a.type = #{type,jdbcType=INTEGER}
+		</if>
+		<!-- 
+		<if test="hot != null">
+			and a.hot = #{hot,jdbcType=INTEGER}
+		</if> 
+		-->
+		<if test="keyword != null">
+			and a.title like concat('%',#{keyword},'%')
+		</if>	
+		order by create_time desc
+		<if test="page_sql != null">
+			${page_sql}
+		</if>
+	</select>
+	
+	<select id="portalNewsCount" resultType="java.lang.Integer">
+		select 
+			count(0)
+		from news a
+		where 
+		a.type != 1 and a.type != 2
+		<if test="provinceId != null">
+			and a.province_id = #{provinceId,jdbcType=INTEGER}
+		</if>
+		<if test="type != null and type != 0 and type != 1 and type != 2" >
+			and a.type = #{type,jdbcType=INTEGER}
+		</if>
+		<!-- 	
+		<if test="hot != null">
+			and a.hot = #{hot,jdbcType=INTEGER}
+		</if>
+		-->
+		<if test="keyword != null">
+			and a.title like concat('%',#{keyword},'%')
+		</if>
+	</select>
+	<select id="portalNewsPolicy" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where
+		a.type =5 or a.type =4
+		order by create_time desc
+	</select>
+	<select id="portalNewsQuestion" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			DATE_FORMAT(a.create_time,'%Y-%d-%m') as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where
+		a.type =2
+		order by create_time desc
+	</select>
+	<select id="newsInterest" resultType="com.goafanti.news.bo.newsInterestBo">
+		select
+		n.id,n.title ,n.create_time as createTime
+	from news_interest ni
+	LEFT  join news n on ni.new_id=n.id
+	where uid=#{uid,jdbcType=VARCHAR}
+	</select>
+	
+	
+	
 </mapper>

File diff suppressed because it is too large
+ 686 - 654
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml


+ 67 - 3
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1112,6 +1112,21 @@ left join t_order_outsource too on o.order_no=too.order_no where delete_sign !=
   		<if test="o.liquidationStatus != null">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
+	  	<if test="o.amountStatus == 0">
+	  	and o.total_amount &lt; 10
+	  	</if>
+	  	<if test="o.amountStatus == 1">
+	  	and o.total_amount between 10 and 20
+	  	</if>
+	  	<if test="o.amountStatus == 2">
+	  	and o.total_amount between 20 and 30
+	  	</if>
+	  	<if test="o.amountStatus == 3">
+	  	and o.total_amount between 30 and 40
+	  	</if>
+	  	<if test="o.amountStatus == 4">
+	  	and o.total_amount  &gt; 40
+	  	</if>
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
@@ -1162,6 +1177,21 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   		<if test="o.liquidationStatus != null">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
+	  	<if test="o.amountStatus == 0">
+	  	and o.total_amount &lt; 10
+	  	</if>
+	  	<if test="o.amountStatus == 1">
+	  	and o.total_amount between 10 and 20
+	  	</if>
+	  	<if test="o.amountStatus == 2">
+	  	and o.total_amount between 20 and 30
+	  	</if>
+	  	<if test="o.amountStatus == 3">
+	  	and o.total_amount between 30 and 40
+	  	</if>
+	  	<if test="o.amountStatus == 4">
+	  	and o.total_amount  &gt; 40
+	  	</if>
   		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
@@ -1236,8 +1266,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	</if>
   	<if test="specially == 3">
   	 and  a.order_status=2 and a.process_status != 99
+  	</if>
   	 <if test="approval ==0">
-  	and a.approval &gt; 0
+  	and a.approval = 0
   	</if>
   	<if test="approval ==1">
   	and a.approval = 1
@@ -1245,8 +1276,6 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="approval ==2">
   	and a.approval &gt; 1
   	</if> 
-  	</if>
-  	
   	<if test="specially == 4">
   	and e.main=1
   	and a.process_status in (4,5,6,99)
@@ -1279,6 +1308,21 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="liquidationStatus != null">
   	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
   	</if>
+  	<if test="amountStatus == 0">
+  	and a.total_amount &lt; 10
+  	</if>
+  	<if test="amountStatus == 1">
+  	and a.total_amount between 10 and 20
+  	</if>
+  	<if test="amountStatus == 2">
+  	and a.total_amount between 20 and 30
+  	</if>
+  	<if test="amountStatus == 3">
+  	and a.total_amount between 30 and 40
+  	</if>
+  	<if test="amountStatus == 4">
+  	and a.total_amount  &gt; 40
+  	</if>
   	<if test="depId != null">
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
@@ -1384,6 +1428,21 @@ where super_id is null ) e on e.order_no=a.order_no
   	<if test="liquidationStatus != null">
   	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
   	</if>
+  	<if test="amountStatus == 0">
+  	and a.total_amount &lt; 10
+  	</if>
+  	<if test="amountStatus == 1">
+  	and a.total_amount between 10 and 20
+  	</if>
+  	<if test="amountStatus == 2">
+  	and a.total_amount between 20 and 30
+  	</if>
+  	<if test="amountStatus == 3">
+  	and a.total_amount between 30 and 40
+  	</if>
+  	<if test="amountStatus == 4">
+  	and a.total_amount  &gt; 40
+  	</if>
   	<if test="depId != null">
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
@@ -1652,4 +1711,9 @@ where super_id is null ) e on e.order_no=a.order_no
   	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
   	where noc.order_no= #{orderNo} order by noc.create_time
   </select>
+  
+  <update id="updaterefund" parameterType="com.goafanti.common.model.TOrderNew">
+  	update t_order_new set settlement_amount=settlement_amount-#{refundAmount,jdbcType=DECIMAL},
+  	refund_amount=#{refundAmount,jdbcType=DECIMAL}	where order_no=#{orderNo}
+  </update>
 </mapper>

+ 21 - 3
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -921,21 +921,30 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,
-    a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
+  		select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,e.contract_no contractNo,
+    a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,e.approval,
     ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
     on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid
-    where e.delete_sign !=1  and e.order_status not in (5,7)  and e.outsource= #{outsource,jdbcType=INTEGER}
+    where e.delete_sign !=1  and e.order_status not in (5,7)   and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="approval ==0">
+  	and e.approval = 0
+  	</if>
+  	<if test="approval ==1">
+  	and e.approval = 1
+  	</if>
+  	<if test="approval ==2">
+  	and e.approval &gt; 1
+  	</if> 
   	<if test="contractNo != null">
   	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
   	</if>
@@ -981,6 +990,15 @@
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="approval ==0">
+  	and e.approval = 0
+  	</if>
+  	<if test="approval ==1">
+  	and e.approval = 1
+  	</if>
+  	<if test="approval ==2">
+  	and e.approval &gt; 1
+  	</if> 
   	<if test="contractNo != null">
   	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
   	</if>

+ 0 - 1
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -31,7 +31,6 @@
 		<result column="founder" property="founder" jdbcType="VARCHAR" />
 		<result column="contract_id" property="contractId" jdbcType="VARCHAR" />
 		<result column="principal" property="principal" jdbcType="VARCHAR" />
-		<result column="publish_status" property="publishStatus" jdbcType="INTEGER" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		id, uid, serial_number, contacts, department, dispatch_info,

+ 130 - 84
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -7,149 +7,159 @@ public class NewOrderChange {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.id
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.order_no
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.process_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Integer processState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.status
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.create_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.voucher_url
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String voucherUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.total_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.settlement_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal settlementAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.change_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal changeAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.applicant
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.dep_name
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String depName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.project_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String projectState;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal zxsCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.zxs_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String zxsRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Date paymentTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.payment_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal paymentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private Date invoiceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal invoiceAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.invoice_type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String invoiceType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal cwCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refundable_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal refundableAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.cw_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String cwRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal estimateCost;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.estimate_refundable
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal estimateRefundable;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_Invoice
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private BigDecimal refundInvoice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	private String usedOrder;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_status
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	private Integer refundStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_change.refund_url
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	private String refundUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.id
 	 * @return  the value of new_order_change.id
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -158,7 +168,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.id
 	 * @param id  the value for new_order_change.id
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -167,7 +177,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.order_no
 	 * @return  the value of new_order_change.order_no
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -176,7 +186,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.order_no
 	 * @param orderNo  the value for new_order_change.order_no
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -185,7 +195,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.process_state
 	 * @return  the value of new_order_change.process_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Integer getProcessState() {
 		return processState;
@@ -194,7 +204,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.process_state
 	 * @param processState  the value for new_order_change.process_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setProcessState(Integer processState) {
 		this.processState = processState;
@@ -203,7 +213,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.status
 	 * @return  the value of new_order_change.status
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -212,7 +222,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.status
 	 * @param status  the value for new_order_change.status
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -221,7 +231,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.type
 	 * @return  the value of new_order_change.type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -230,7 +240,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.type
 	 * @param type  the value for new_order_change.type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -239,7 +249,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.create_time
 	 * @return  the value of new_order_change.create_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -248,7 +258,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.create_time
 	 * @param createTime  the value for new_order_change.create_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -257,7 +267,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.remarks
 	 * @return  the value of new_order_change.remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -266,7 +276,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.remarks
 	 * @param remarks  the value for new_order_change.remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -275,7 +285,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.voucher_url
 	 * @return  the value of new_order_change.voucher_url
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getVoucherUrl() {
 		return voucherUrl;
@@ -284,7 +294,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.voucher_url
 	 * @param voucherUrl  the value for new_order_change.voucher_url
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setVoucherUrl(String voucherUrl) {
 		this.voucherUrl = voucherUrl;
@@ -293,7 +303,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.total_amount
 	 * @return  the value of new_order_change.total_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -302,7 +312,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.total_amount
 	 * @param totalAmount  the value for new_order_change.total_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -311,7 +321,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.settlement_amount
 	 * @return  the value of new_order_change.settlement_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -320,7 +330,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.settlement_amount
 	 * @param settlementAmount  the value for new_order_change.settlement_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -329,7 +339,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.change_amount
 	 * @return  the value of new_order_change.change_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getChangeAmount() {
 		return changeAmount;
@@ -338,7 +348,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.change_amount
 	 * @param changeAmount  the value for new_order_change.change_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setChangeAmount(BigDecimal changeAmount) {
 		this.changeAmount = changeAmount;
@@ -347,7 +357,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.applicant
 	 * @return  the value of new_order_change.applicant
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -356,7 +366,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.applicant
 	 * @param applicant  the value for new_order_change.applicant
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -365,7 +375,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.dep_name
 	 * @return  the value of new_order_change.dep_name
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getDepName() {
 		return depName;
@@ -374,7 +384,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.dep_name
 	 * @param depName  the value for new_order_change.dep_name
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setDepName(String depName) {
 		this.depName = depName;
@@ -383,7 +393,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.project_state
 	 * @return  the value of new_order_change.project_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getProjectState() {
 		return projectState;
@@ -392,7 +402,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.project_state
 	 * @param projectState  the value for new_order_change.project_state
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setProjectState(String projectState) {
 		this.projectState = projectState;
@@ -401,7 +411,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_cost
 	 * @return  the value of new_order_change.zxs_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getZxsCost() {
 		return zxsCost;
@@ -410,7 +420,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_cost
 	 * @param zxsCost  the value for new_order_change.zxs_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setZxsCost(BigDecimal zxsCost) {
 		this.zxsCost = zxsCost;
@@ -419,7 +429,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.zxs_remarks
 	 * @return  the value of new_order_change.zxs_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getZxsRemarks() {
 		return zxsRemarks;
@@ -428,7 +438,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.zxs_remarks
 	 * @param zxsRemarks  the value for new_order_change.zxs_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setZxsRemarks(String zxsRemarks) {
 		this.zxsRemarks = zxsRemarks;
@@ -437,7 +447,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_time
 	 * @return  the value of new_order_change.payment_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Date getPaymentTime() {
 		return paymentTime;
@@ -446,7 +456,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_time
 	 * @param paymentTime  the value for new_order_change.payment_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setPaymentTime(Date paymentTime) {
 		this.paymentTime = paymentTime;
@@ -455,7 +465,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.payment_amount
 	 * @return  the value of new_order_change.payment_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getPaymentAmount() {
 		return paymentAmount;
@@ -464,7 +474,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.payment_amount
 	 * @param paymentAmount  the value for new_order_change.payment_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setPaymentAmount(BigDecimal paymentAmount) {
 		this.paymentAmount = paymentAmount;
@@ -473,7 +483,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_time
 	 * @return  the value of new_order_change.invoice_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Date getInvoiceTime() {
 		return invoiceTime;
@@ -482,7 +492,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_time
 	 * @param invoiceTime  the value for new_order_change.invoice_time
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setInvoiceTime(Date invoiceTime) {
 		this.invoiceTime = invoiceTime;
@@ -491,7 +501,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_amount
 	 * @return  the value of new_order_change.invoice_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getInvoiceAmount() {
 		return invoiceAmount;
@@ -500,7 +510,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_amount
 	 * @param invoiceAmount  the value for new_order_change.invoice_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setInvoiceAmount(BigDecimal invoiceAmount) {
 		this.invoiceAmount = invoiceAmount;
@@ -509,7 +519,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.invoice_type
 	 * @return  the value of new_order_change.invoice_type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getInvoiceType() {
 		return invoiceType;
@@ -518,7 +528,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.invoice_type
 	 * @param invoiceType  the value for new_order_change.invoice_type
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setInvoiceType(String invoiceType) {
 		this.invoiceType = invoiceType;
@@ -527,7 +537,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_cost
 	 * @return  the value of new_order_change.cw_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getCwCost() {
 		return cwCost;
@@ -536,7 +546,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_cost
 	 * @param cwCost  the value for new_order_change.cw_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setCwCost(BigDecimal cwCost) {
 		this.cwCost = cwCost;
@@ -545,7 +555,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refundable_amount
 	 * @return  the value of new_order_change.refundable_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getRefundableAmount() {
 		return refundableAmount;
@@ -554,7 +564,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refundable_amount
 	 * @param refundableAmount  the value for new_order_change.refundable_amount
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setRefundableAmount(BigDecimal refundableAmount) {
 		this.refundableAmount = refundableAmount;
@@ -563,7 +573,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.cw_remarks
 	 * @return  the value of new_order_change.cw_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getCwRemarks() {
 		return cwRemarks;
@@ -572,7 +582,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.cw_remarks
 	 * @param cwRemarks  the value for new_order_change.cw_remarks
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setCwRemarks(String cwRemarks) {
 		this.cwRemarks = cwRemarks;
@@ -581,7 +591,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_cost
 	 * @return  the value of new_order_change.estimate_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getEstimateCost() {
 		return estimateCost;
@@ -590,7 +600,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_cost
 	 * @param estimateCost  the value for new_order_change.estimate_cost
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setEstimateCost(BigDecimal estimateCost) {
 		this.estimateCost = estimateCost;
@@ -599,7 +609,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.estimate_refundable
 	 * @return  the value of new_order_change.estimate_refundable
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getEstimateRefundable() {
 		return estimateRefundable;
@@ -608,7 +618,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.estimate_refundable
 	 * @param estimateRefundable  the value for new_order_change.estimate_refundable
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setEstimateRefundable(BigDecimal estimateRefundable) {
 		this.estimateRefundable = estimateRefundable;
@@ -617,7 +627,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_Invoice
 	 * @return  the value of new_order_change.refund_Invoice
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public BigDecimal getRefundInvoice() {
 		return refundInvoice;
@@ -626,7 +636,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_Invoice
 	 * @param refundInvoice  the value for new_order_change.refund_Invoice
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setRefundInvoice(BigDecimal refundInvoice) {
 		this.refundInvoice = refundInvoice;
@@ -635,7 +645,7 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.used_order
 	 * @return  the value of new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getUsedOrder() {
 		return usedOrder;
@@ -644,9 +654,45 @@ public class NewOrderChange {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.used_order
 	 * @param usedOrder  the value for new_order_change.used_order
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setUsedOrder(String usedOrder) {
 		this.usedOrder = usedOrder;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_status
+	 * @return  the value of new_order_change.refund_status
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	public Integer getRefundStatus() {
+		return refundStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_status
+	 * @param refundStatus  the value for new_order_change.refund_status
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	public void setRefundStatus(Integer refundStatus) {
+		this.refundStatus = refundStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_change.refund_url
+	 * @return  the value of new_order_change.refund_url
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	public String getRefundUrl() {
+		return refundUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_change.refund_url
+	 * @param refundUrl  the value for new_order_change.refund_url
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
+	 */
+	public void setRefundUrl(String refundUrl) {
+		this.refundUrl = refundUrl;
+	}
 }

+ 146 - 16
src/main/java/com/goafanti/common/model/NewOrderChangeExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class NewOrderChangeExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public NewOrderChangeExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderChangeExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1943,11 +1943,141 @@ public class NewOrderChangeExample {
 			addCriterion("used_order not between", value1, value2, "usedOrder");
 			return (Criteria) this;
 		}
+
+		public Criteria andRefundStatusIsNull() {
+			addCriterion("refund_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusIsNotNull() {
+			addCriterion("refund_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusEqualTo(Integer value) {
+			addCriterion("refund_status =", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotEqualTo(Integer value) {
+			addCriterion("refund_status <>", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusGreaterThan(Integer value) {
+			addCriterion("refund_status >", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("refund_status >=", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusLessThan(Integer value) {
+			addCriterion("refund_status <", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("refund_status <=", value, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusIn(List<Integer> values) {
+			addCriterion("refund_status in", values, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotIn(List<Integer> values) {
+			addCriterion("refund_status not in", values, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusBetween(Integer value1, Integer value2) {
+			addCriterion("refund_status between", value1, value2, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("refund_status not between", value1, value2, "refundStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIsNull() {
+			addCriterion("refund_url is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIsNotNull() {
+			addCriterion("refund_url is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlEqualTo(String value) {
+			addCriterion("refund_url =", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotEqualTo(String value) {
+			addCriterion("refund_url <>", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlGreaterThan(String value) {
+			addCriterion("refund_url >", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlGreaterThanOrEqualTo(String value) {
+			addCriterion("refund_url >=", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLessThan(String value) {
+			addCriterion("refund_url <", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLessThanOrEqualTo(String value) {
+			addCriterion("refund_url <=", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlLike(String value) {
+			addCriterion("refund_url like", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotLike(String value) {
+			addCriterion("refund_url not like", value, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlIn(List<String> values) {
+			addCriterion("refund_url in", values, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotIn(List<String> values) {
+			addCriterion("refund_url not in", values, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlBetween(String value1, String value2) {
+			addCriterion("refund_url between", value1, value2, "refundUrl");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundUrlNotBetween(String value1, String value2) {
+			addCriterion("refund_url not between", value1, value2, "refundUrl");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_change
-	 * @mbg.generated  Mon Jan 13 14:39:13 CST 2020
+	 * @mbg.generated  Mon Feb 17 09:09:57 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 171 - 0
src/main/java/com/goafanti/common/model/NewOrderRefund.java

@@ -0,0 +1,171 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.annotation.Generated;
+
+public class NewOrderRefund {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.id
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.cid
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Integer cid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.order_no
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.create_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private Date refundTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.refund_amount
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private BigDecimal refundAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	private String remarks;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.id
+	 * @return  the value of new_order_refund.id
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.id
+	 * @param id  the value for new_order_refund.id
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.cid
+	 * @return  the value of new_order_refund.cid
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.cid
+	 * @param cid  the value for new_order_refund.cid
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.order_no
+	 * @return  the value of new_order_refund.order_no
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.order_no
+	 * @param orderNo  the value for new_order_refund.order_no
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.create_time
+	 * @return  the value of new_order_refund.create_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.create_time
+	 * @param createTime  the value for new_order_refund.create_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.refund_time
+	 * @return  the value of new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Date getRefundTime() {
+		return refundTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.refund_time
+	 * @param refundTime  the value for new_order_refund.refund_time
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setRefundTime(Date refundTime) {
+		this.refundTime = refundTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.refund_amount
+	 * @return  the value of new_order_refund.refund_amount
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public BigDecimal getRefundAmount() {
+		return refundAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.refund_amount
+	 * @param refundAmount  the value for new_order_refund.refund_amount
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setRefundAmount(BigDecimal refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_refund.remarks
+	 * @return  the value of new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_refund.remarks
+	 * @param remarks  the value for new_order_refund.remarks
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	
+}

+ 703 - 0
src/main/java/com/goafanti/common/model/NewOrderRefundExample.java

@@ -0,0 +1,703 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class NewOrderRefundExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public NewOrderRefundExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNull() {
+			addCriterion("cid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIsNotNull() {
+			addCriterion("cid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidEqualTo(Integer value) {
+			addCriterion("cid =", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotEqualTo(Integer value) {
+			addCriterion("cid <>", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThan(Integer value) {
+			addCriterion("cid >", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("cid >=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThan(Integer value) {
+			addCriterion("cid <", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidLessThanOrEqualTo(Integer value) {
+			addCriterion("cid <=", value, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidIn(List<Integer> values) {
+			addCriterion("cid in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotIn(List<Integer> values) {
+			addCriterion("cid not in", values, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidBetween(Integer value1, Integer value2) {
+			addCriterion("cid between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCidNotBetween(Integer value1, Integer value2) {
+			addCriterion("cid not between", value1, value2, "cid");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNull() {
+			addCriterion("order_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNotNull() {
+			addCriterion("order_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoEqualTo(String value) {
+			addCriterion("order_no =", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotEqualTo(String value) {
+			addCriterion("order_no <>", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThan(String value) {
+			addCriterion("order_no >", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+			addCriterion("order_no >=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThan(String value) {
+			addCriterion("order_no <", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThanOrEqualTo(String value) {
+			addCriterion("order_no <=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLike(String value) {
+			addCriterion("order_no like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotLike(String value) {
+			addCriterion("order_no not like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIn(List<String> values) {
+			addCriterion("order_no in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotIn(List<String> values) {
+			addCriterion("order_no not in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoBetween(String value1, String value2) {
+			addCriterion("order_no between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotBetween(String value1, String value2) {
+			addCriterion("order_no not between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeIsNull() {
+			addCriterion("refund_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeIsNotNull() {
+			addCriterion("refund_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeEqualTo(Date value) {
+			addCriterion("refund_time =", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeNotEqualTo(Date value) {
+			addCriterion("refund_time <>", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeGreaterThan(Date value) {
+			addCriterion("refund_time >", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("refund_time >=", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeLessThan(Date value) {
+			addCriterion("refund_time <", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeLessThanOrEqualTo(Date value) {
+			addCriterion("refund_time <=", value, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeIn(List<Date> values) {
+			addCriterion("refund_time in", values, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeNotIn(List<Date> values) {
+			addCriterion("refund_time not in", values, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeBetween(Date value1, Date value2) {
+			addCriterion("refund_time between", value1, value2, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundTimeNotBetween(Date value1, Date value2) {
+			addCriterion("refund_time not between", value1, value2, "refundTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountIsNull() {
+			addCriterion("refund_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountIsNotNull() {
+			addCriterion("refund_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountEqualTo(BigDecimal value) {
+			addCriterion("refund_amount =", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountNotEqualTo(BigDecimal value) {
+			addCriterion("refund_amount <>", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountGreaterThan(BigDecimal value) {
+			addCriterion("refund_amount >", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("refund_amount >=", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountLessThan(BigDecimal value) {
+			addCriterion("refund_amount <", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("refund_amount <=", value, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountIn(List<BigDecimal> values) {
+			addCriterion("refund_amount in", values, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountNotIn(List<BigDecimal> values) {
+			addCriterion("refund_amount not in", values, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_amount between", value1, value2, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_amount not between", value1, value2, "refundAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNull() {
+			addCriterion("remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIsNotNull() {
+			addCriterion("remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksEqualTo(String value) {
+			addCriterion("remarks =", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotEqualTo(String value) {
+			addCriterion("remarks <>", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThan(String value) {
+			addCriterion("remarks >", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("remarks >=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThan(String value) {
+			addCriterion("remarks <", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLessThanOrEqualTo(String value) {
+			addCriterion("remarks <=", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksLike(String value) {
+			addCriterion("remarks like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotLike(String value) {
+			addCriterion("remarks not like", value, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksIn(List<String> values) {
+			addCriterion("remarks in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotIn(List<String> values) {
+			addCriterion("remarks not in", values, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksBetween(String value1, String value2) {
+			addCriterion("remarks between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andRemarksNotBetween(String value1, String value2) {
+			addCriterion("remarks not between", value1, value2, "remarks");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_refund
+	 * @mbg.generated  Wed Feb 19 09:01:39 CST 2020
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table new_order_refund
+     *
+     * @mbg.generated do_not_delete_during_merge Tue Feb 11 14:39:46 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

File diff suppressed because it is too large
+ 551 - 487
src/main/java/com/goafanti/common/model/TOrderBillNew.java


File diff suppressed because it is too large
+ 1412 - 1292
src/main/java/com/goafanti/common/model/TOrderBillNewExample.java


+ 17 - 0
src/main/java/com/goafanti/order/bo/InputNewOrderRefund.java

@@ -0,0 +1,17 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.NewOrderRefund;
+
+public class InputNewOrderRefund extends NewOrderRefund {
+
+	
+	private String refundDate;
+
+	public String getRefundDate() {
+		return refundDate;
+	}
+
+	public void setRefundDate(String refundDate) {
+		this.refundDate = refundDate;
+	}
+}

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -88,6 +88,8 @@ public class OrderListBo {
 	private String startFinalReceivablesTime;	
 	/** 外包金额*/
 	private String outsourceAmount;
+	/** 筛选金额*/
+	private Integer amountStatus;
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -338,4 +340,10 @@ public class OrderListBo {
 	public void setOutsourceAmount(String outsourceAmount) {
 		this.outsourceAmount = outsourceAmount;
 	}
+	public Integer getAmountStatus() {
+		return amountStatus;
+	}
+	public void setAmountStatus(Integer amountStatus) {
+		this.amountStatus = amountStatus;
+	}
 }

+ 15 - 0
src/main/java/com/goafanti/order/bo/OutNewOrderRefund.java

@@ -0,0 +1,15 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.NewOrderRefund;
+
+public class OutNewOrderRefund  extends NewOrderRefund{
+	private String refundDate;
+
+	public String getRefundDate() {
+		return refundDate;
+	}
+
+	public void setRefundDate(String refundDate) {
+		this.refundDate = refundDate;
+	}
+}

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -23,6 +23,7 @@ public class TOrderTaskListBo {
 	private String salesmanName;
 	private String taskDistributionTime;
 	private String taskEndTime;
+	private Integer approval;
 	/** 外包部门 */
 	private String outsourceName;
 	public String getContractNo() {
@@ -151,5 +152,11 @@ public class TOrderTaskListBo {
 	public void setSalesmanName(String salesmanName) {
 		this.salesmanName = salesmanName;
 	}
+	public Integer getApproval() {
+		return approval;
+	}
+	public void setApproval(Integer approval) {
+		this.approval = approval;
+	}
 	
 }

+ 4 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -242,12 +242,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 
 	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
+	 *amountStatus 0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
-			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo,Integer pageSize){
+			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer amountStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially ,approval, distribution,depId, contractNo,outsource, liquidationStatus,pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially ,approval, distribution,depId, 
+				contractNo,outsource, liquidationStatus,amountStatus,pageNo, pageSize));
 		return res;
 	}
 	

+ 10 - 0
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -281,6 +281,16 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 删除流水
+	 * 
+	 */
+	@RequestMapping(value="/deleteMyBill", method = RequestMethod.GET)
+	public Result deleteMyBill(String billNo){
+		Result res = new Result();
+		res.setData(orderBillServiceImpl.deleteMyBill(billNo));
+		return res;
+	}
+	/**
 	 * 查看部门的流水
 	 * @param billNew
 	 * @param pageNo

+ 66 - 0
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -14,10 +14,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.service.OrderChangeService;
 
@@ -394,4 +396,68 @@ public class OrderChangeApiController extends CertifyApiController {
     	return res;
     }
 	
+    
+    /**
+	 *	  变更退款图片文件上传 
+	 */
+	@RequestMapping(value = "/uploadRefund", method = RequestMethod.POST)
+	public Result uploadRefund(HttpServletRequest req,String sign){
+		Result res = new Result();
+		//order_refund_file
+		res.setData(handleFile(res, "/order_refund/", false, req, sign));
+		return res;
+	}
+	
+	/**
+	 *	  新增退款信息 
+	 */
+	@RequestMapping(value = "/addRefund", method = RequestMethod.POST)
+	public Result addRefund(InputNewOrderRefund or){
+		Result res = new Result();
+		if (or.getRefundAmount()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"金额", "金额"));
+			return res;
+		}
+		if (or.getRefundDate()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"时间", "时间"));
+			return res;
+		}
+		if (orderChangeService.checkrefund(or)) {
+			res.getError().add(buildError("金额与实际收款不符", "金额与实际收款不符"));
+			return res;
+		}
+		res.setData(orderChangeService.addOrderRefund(or));
+		return res;
+	}
+	
+	/**
+	 * 删除退款信息
+	 */
+	@RequestMapping(value = "/deleteRefund", method = RequestMethod.POST)
+	public Result deleteRefund(Integer id){
+		Result res = new Result();
+		res.setData(orderChangeService.deleteRefund(id));
+		return res;
+	}
+	
+	/**
+	 * 退款信息列表
+	 */
+	@RequestMapping(value = "/listRefund", method = RequestMethod.GET)
+	public Result listRefund(Integer id){
+		Result res = new Result();
+		res.setData(orderChangeService.listRefund(id));
+		return res;
+	}
+	
+	/**
+	 * 确认退款
+	 */
+	@RequestMapping(value = "/pushRefund", method = RequestMethod.POST)
+	public Result pushRefund(Integer id,String refundUrl){
+		Result res = new Result();
+		res.setData(orderChangeService.pushRefund(id,refundUrl));
+		return res;
+	}
+	
 }

+ 5 - 4
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -38,13 +38,13 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * specially 0 任务派单(咨询师经理派单) 1项目派单(咨询师管理员派单)2咨询师退回给经理
 	 */
 	@RequestMapping(value = "/projectDistribution", method = RequestMethod.POST)
-	public Result projectDistribution(Integer taskId,String taskReceiverId,Integer specially ){
+	public Result projectDistribution(Integer taskId,String taskReceiverId,Integer specially ,String remarks){
 		Result res = new Result();
 		if(null==taskId || StringUtils.isBlank(taskReceiverId)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和受理人"));
 			return res;
 		}
-		res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId,specially));
+		res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId,specially,remarks));
 		return res;
 	}
 	
@@ -53,9 +53,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
 	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
-			String contractNo,Integer projectStatus ,Integer pageNo,Integer pageSize,Integer outsource){
+			String contractNo,Integer projectStatus ,Integer approval,Integer pageNo,Integer pageSize,Integer outsource){
 		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, projectStatus,pageNo, pageSize, outsource));
+		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, 
+				projectStatus,approval,pageNo, pageSize, outsource));
 		return res;
 	}
 	

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderBillService.java

@@ -23,4 +23,6 @@ public interface OrderBillService {
 	 * @return
 	 */
 	XSSFWorkbook exportBillData(TOrderBillNew billNew);
+
+	int deleteMyBill(String billNo);
 }

+ 14 - 0
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -6,14 +6,18 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.model.NewOrderRefund;
 import com.goafanti.common.model.OrderRefundInvoice;
 import com.goafanti.common.model.TChangeDun;
 import com.goafanti.common.model.TChangeTask;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.InputNewOrderRefund;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.OutNewOrderRefund;
 import com.goafanti.order.bo.TChangeDunOut;
 import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -73,5 +77,15 @@ public interface OrderChangeService {
 
 	List<Map<String, String>> getOrderChange(String orderNo);
 
+	int addOrderRefund(InputNewOrderRefund or);
+
+	int deleteRefund(Integer id);
+
+	List<OutNewOrderRefund> listRefund(Integer id);
+
+	int pushRefund(Integer id, String refundUrl);
+
+	boolean checkrefund(InputNewOrderRefund or);
+
 
 }

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -85,9 +85,10 @@ public interface OrderNewService {
 	 * @param orderStatus
 	 * @param pageNo
 	 * @param pageSize
+	 * @param amountStatus 
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,Integer pageNo, Integer pageSize);
 	/**
 	 * 订单审核
 	 * @param orderNo

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -17,10 +17,10 @@ import com.goafanti.order.bo.inuptTaskHoursListBo;
 
 public interface OrderProjectService {
 
-	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially);
+	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially, String remarks);
 
 	Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,Integer specially, String depId,
-			String contractNo, Integer pageNo, Integer pageSize,Integer outsource, Integer outsource2);
+			String contractNo, Integer approval, Integer pageNo, Integer pageSize,Integer outsource, Integer outsource2);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
 

File diff suppressed because it is too large
+ 526 - 524
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java


+ 22 - 0
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,7 +13,9 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderBillNewMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderBillNew;
+import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -25,6 +28,8 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	
 	@Autowired
 	private TOrderBillNewMapper billNewMapper;
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
 	@Value(value = "${upload.path}")
 	private String	uploadPath = null;
 
@@ -71,6 +76,23 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		
 		return wb;
 	}
+
+
+	@Override
+	public int deleteMyBill(String billNo) {
+		TOrderBillNew tbn=billNewMapper.selectByPrimaryKey(billNo);
+		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(tbn.getOrderNo());
+		TOrderNew o2=new TOrderNew();
+		o2.setOrderNo(o.getOrderNo());
+		o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));
+		tOrderNewMapper.updateByPrimaryKeySelective(o2);
+		TOrderBillNew ntbn=new TOrderBillNew();
+		ntbn.setBillNo(tbn.getBillNo());
+		ntbn.setDeleteSign((byte)1);
+		ntbn.setDeleteTime(new Date());
+		billNewMapper.updateByPrimaryKeySelective(ntbn);
+		return 1;
+	}
 	
 
 	

File diff suppressed because it is too large
+ 909 - 806
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java


+ 239 - 237
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -1,237 +1,239 @@
-package com.goafanti.order.service.impl;
-
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.TOrderInvoiceMapper;
-import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.TOrderInvoice;
-import com.goafanti.common.model.TOrderNew;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.order.bo.TOrderInvoiceBo;
-import com.goafanti.order.bo.TOrderInvoiceDetails;
-import com.goafanti.order.service.OrderInvoiceService;
-import com.goafanti.order.service.OrderNewService;
-import com.mysql.fabric.xmlrpc.base.Array;
-
-@Service
-public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper> implements OrderInvoiceService {
-	@Autowired
-	private TOrderInvoiceMapper tOrderInvoiceMapper;
-	@Autowired
-	private TOrderNewMapper		tOrderNewMapper;
-	@Autowired
-	private OrganizationManagementMapper	organizationManagementMapper;
-	@Autowired
-	private AdminMapper	adminMapper;
-	@Autowired
-	private OrderNewService	orderNewService;
-	@Autowired
-	private TOrderMidMapper	tOrderMidMapper;
-	@Override
-	public int createServiceOrder(TOrderInvoice o) {
-		o.setCreateTime(new Date());
-		sendNoticeAndEmail(o);
-		return tOrderInvoiceMapper.insertSelective(o);
-	}
-	
-	
-
-	@Override
-	public int updateServiceOrder(TOrderInvoice o) {
-		sendNoticeAndEmail(o);
-		return tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
-	}
-	/**
-	 * 	开票提交发送站内消息及邮件
-	 * @param o
-	 */
-	private void sendNoticeAndEmail(TOrderInvoice o) {
-		List<String> aids = new ArrayList<>();
-		if (o.getStatus()==1) {//发起
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
-			if (o.getType()==0) {//省内
-				if(o.getApproval()==0) {
-					aids.add(organizationManagementMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
-				}else {
-					for (Admin admin : adminMapper.getAdminRoleList("集团副总")) {
-						aids.add(admin.getId());
-					}
-				}
-			}else if (o.getType()==1) {//省外
-				if(o.getApproval()==0) {
-					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "营销管理员"));
-				}else {
-					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "公司管理"));
-				}
-			}
-		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),0);
-	}
-
-	@Override
-	public boolean checkAmount(TOrderInvoice t) {
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
-		
-			String i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
-			//处理精度问题
-		BigDecimal q=t.getAmount().add(new BigDecimal(i)).setScale(4, BigDecimal.ROUND_DOWN);;
-		BigDecimal w=tn.getTotalAmount();
-		int	flag=q.compareTo(w);
-		if (flag>0) {
-			return true;
-		}
-		return false;
-	}
-
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, Integer type,Integer pageNo,
-			Integer pageSize) {
-		Map<String, Object> params = new HashMap<String, Object>();
-		if(pageSize==null||pageSize<0)pageSize=10;
-		if(pageNo==null||pageNo<0)pageNo=1;
-		if(type==0 &&(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN))) {
-			params.put("financeId", TokenManager.getAdminId());
-		}
-		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
-		if(type!=null)params.put("type", type);
-		if (type ==1) {
-			//如果是省外则直接查本部门
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-			params.put("aDep", a.getDepartmentId());
-		}
-		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
-		if(StringUtils.isNotBlank(name))params.put("name", name);
-		return (Pagination<TOrderInvoiceBo>)findPage("financeOrderInvoiceList", "financeOrderInvoiceCount", params, pageNo, pageSize);
-		
-	}
-
-	@Override
-	public TOrderInvoiceDetails selectByIdOrderInvoice(Integer id) {
-		return tOrderInvoiceMapper.selectByInvoiceDitails(id);
-	}
-	
-	@Override
-	public TOrderInvoiceDetails getInvoiceDetails(String orderNo) {
-		return tOrderInvoiceMapper.getInvoiceDetails(orderNo);
-	}
-	
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<TOrderInvoiceBo> salesmanOrderInvoiceList( String orderNo, 
-			Integer pageNo, Integer pageSize) {
-		Map<String, Object> params = new HashMap<String, Object>();
-		if(pageSize==null||pageSize<0)pageSize=10;
-		if(pageNo==null||pageNo<0)pageNo=1;
-		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
-		return (Pagination<TOrderInvoiceBo>)findPage("salesmanOrderInvoiceList", "salesmanOrderInvoiceCount", params, pageNo, pageSize);
-	}
-
-	@Override
-	public int updatefinanceExamine(Integer id, Integer examine, String reason) {
-		TOrderInvoice t=new TOrderInvoice();
-		t.setId(id);
-		t.setRejectReason(reason);
-		t.setStatus(examine);
-		//examine 2通过 3拒绝
-		List<String> aids = new ArrayList<>();
-		TOrderInvoice t2=tOrderInvoiceMapper.selectByPrimaryKey(id);
-		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(t2.getOrderNo());
-		Integer type=null;
-		if(examine==3){
-			if(t2.getApproval()==2)t.setApproval(1);
-			type=NoticeStatus.ORDER_INVPICE_NO.getCode();
-			aids.add(o.getSalesmanId());
-		}else if(examine==2) {
-			type=NoticeStatus.ORDER_INVPICE_END.getCode();
-			aids.add(o.getSalesmanId());
-			//重新计算开票金额
-			
-		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),0);
-		tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
-		if(examine==2)tOrderMidMapper.updateInvoice(t2.getOrderNo());
-		return 1; 
-	}
-
-		
-		
-
-
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name,String userName,
-			Integer pageNo, Integer pageSize) {
-		Map<String, Object> params = new HashMap<String, Object>();
-		if(pageSize==null||pageSize<0)pageSize=10;
-		if(pageNo==null||pageNo<0)pageNo=1;
-		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
-		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
-		if(StringUtils.isNotBlank(name))params.put("name", name);
-		if(StringUtils.isNotBlank(userName))params.put("userName", userName);
-		if(approval!=null)params.put("approval", approval);
-		if(status!=null)params.put("status", status);
-		//0省内 1省外 2查看所有省外
-		if(type==0||type==1)params.put("type", type);
-		if (type==2) {
-			params.put("type", 1);
-			params.put("special", 1);
-		}
-		if (type ==1) {
-			//如果是省外则直接查本部门
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-			params.put("aDep", a.getDepartmentId());
-		}
-		return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);
-	}
-
-	@Override
-	public int updateapprovalExamine(Integer id, Integer examine, String reason) {
- 		TOrderInvoice t=new TOrderInvoice();
-		t.setId(id);
-		t.setRejectReason(reason);
-		List<String> aids=new ArrayList<>();
-		TOrderInvoice o=tOrderInvoiceMapper.selectByPrimaryKey(id);
-		TOrderNew ts=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
-		//examine 2通过 3拒绝
-		Integer type =null;
-		if(examine==3) {
-		t.setStatus(examine);
-		type= NoticeStatus.ORDER_INVPICE_APPROVA_NO.getCode();
-		aids.add(ts.getSalesmanId());
-		}else {
-			t.setApproval(examine);
-			type= NoticeStatus.ORDER_INVPICE_APPROVA_YES.getCode();
-			if (o.getType()==0) {
-				aids.add(organizationManagementMapper.selectByPrimaryKey(ts.getOrderDep()).getFinanceId());
-			}else if(o.getType()==1) {
-				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), "营销管理员"));
-			}
-		
-		}
-		orderNewService.pushGeneralSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId(),0);
-		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
-	}
-
-}
+package com.goafanti.order.service.impl;
+
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.OrganizationManagementMapper;
+import com.goafanti.common.dao.TOrderInvoiceMapper;
+import com.goafanti.common.dao.TOrderMidMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.enums.NoticeStatus;
+import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.TOrderInvoice;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.TOrderInvoiceBo;
+import com.goafanti.order.bo.TOrderInvoiceDetails;
+import com.goafanti.order.service.OrderInvoiceService;
+import com.goafanti.order.service.OrderNewService;
+import com.mysql.fabric.xmlrpc.base.Array;
+
+@Service
+public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper> implements OrderInvoiceService {
+	@Autowired
+	private TOrderInvoiceMapper tOrderInvoiceMapper;
+	@Autowired
+	private TOrderNewMapper		tOrderNewMapper;
+	@Autowired
+	private OrganizationManagementMapper	organizationManagementMapper;
+	@Autowired
+	private AdminMapper	adminMapper;
+	@Autowired
+	private OrderNewService	orderNewService;
+	@Autowired
+	private TOrderMidMapper	tOrderMidMapper;
+	@Override
+	public int createServiceOrder(TOrderInvoice o) {
+		o.setCreateTime(new Date());
+		sendNoticeAndEmail(o);
+		return tOrderInvoiceMapper.insertSelective(o);
+	}
+	
+	
+
+	@Override
+	public int updateServiceOrder(TOrderInvoice o) {
+		sendNoticeAndEmail(o);
+		return tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
+	}
+	/**
+	 * 	开票提交发送站内消息及邮件
+	 * @param o
+	 */
+	private void sendNoticeAndEmail(TOrderInvoice o) {
+		List<String> aids = new ArrayList<>();
+		if (o.getStatus()==1) {//发起
+			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+			if (o.getType()==0) {//省内
+				if(o.getApproval()==0) {
+					aids.add(organizationManagementMapper.selectByPrimaryKey(t.getOrderDep()).getFinanceId());
+				}else {
+					for (Admin admin : adminMapper.getAdminRoleList("集团副总")) {
+						aids.add(admin.getId());
+					}
+				}
+			}else if (o.getType()==1) {//省外
+				if(o.getApproval()==0) {
+					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "营销管理员"));
+				}else {
+					aids.addAll(adminMapper.listNameByDepAndName(t.getOrderDep(), "公司管理"));
+				}
+			}
+		}
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),0);
+	}
+
+	@Override
+	public boolean checkAmount(TOrderInvoice t) {
+		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		
+			String i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
+			//处理精度问题
+		BigDecimal q=t.getAmount().add(new BigDecimal(i)).setScale(4, BigDecimal.ROUND_DOWN);;
+		BigDecimal w=tn.getTotalAmount();
+		int	flag=q.compareTo(w);
+		if (flag>0) {
+			return true;
+		}
+		return false;
+	}
+
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, Integer type,Integer pageNo,
+			Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		if(type==0 &&(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN))) {
+			params.put("financeId", TokenManager.getAdminId());
+		}
+		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
+		if(type!=null)params.put("type", type);
+		if (type ==1) {
+			//如果是省外则直接查本部门
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			params.put("aDep", a.getDepartmentId());
+		}
+		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
+		if(StringUtils.isNotBlank(name))params.put("name", name);
+		return (Pagination<TOrderInvoiceBo>)findPage("financeOrderInvoiceList", "financeOrderInvoiceCount", params, pageNo, pageSize);
+		
+	}
+
+	@Override
+	public TOrderInvoiceDetails selectByIdOrderInvoice(Integer id) {
+		return tOrderInvoiceMapper.selectByInvoiceDitails(id);
+	}
+	
+	@Override
+	public TOrderInvoiceDetails getInvoiceDetails(String orderNo) {
+		return tOrderInvoiceMapper.getInvoiceDetails(orderNo);
+	}
+	
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TOrderInvoiceBo> salesmanOrderInvoiceList( String orderNo, 
+			Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
+		return (Pagination<TOrderInvoiceBo>)findPage("salesmanOrderInvoiceList", "salesmanOrderInvoiceCount", params, pageNo, pageSize);
+	}
+
+	@Override
+	public int updatefinanceExamine(Integer id, Integer examine, String reason) {
+		TOrderInvoice t=new TOrderInvoice();
+		t.setId(id);
+		t.setRejectReason(reason);
+		t.setStatus(examine);
+		//examine 2通过 3拒绝
+		List<String> aids = new ArrayList<>();
+		TOrderInvoice t2=tOrderInvoiceMapper.selectByPrimaryKey(id);
+		TOrderNew o=tOrderNewMapper.selectByPrimaryKey(t2.getOrderNo());
+		Integer type=null;
+		if(examine==3){
+			if(t2.getApproval()==2)t.setApproval(1);
+			type=NoticeStatus.ORDER_INVPICE_NO.getCode();
+			aids.add(o.getSalesmanId());
+		}else if(examine==2) {
+			type=NoticeStatus.ORDER_INVPICE_END.getCode();
+			aids.add(o.getSalesmanId());
+			//重新计算开票金额
+			
+		}
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),0);
+		tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
+		if(examine==2)tOrderMidMapper.updateInvoice(t2.getOrderNo());
+		return 1; 
+	}
+
+		
+		
+
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TOrderInvoiceBo> approvalOrderInvoiceList(Integer status,Integer approval,Integer type, String orderDep, String orderNo, String name,String userName,
+			Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		if(StringUtils.isNotBlank(orderDep))params.put("orderDep", orderDep);
+		if(StringUtils.isNotBlank(orderNo))params.put("orderNo", orderNo);
+		if(StringUtils.isNotBlank(name))params.put("name", name);
+		if(StringUtils.isNotBlank(userName))params.put("userName", userName);
+		if(approval!=null)params.put("approval", approval);
+		if(status!=null)params.put("status", status);
+		//0省内 1省外 2查看所有省外
+		if(type==0||type==1)params.put("type", type);
+		if (type==2) {
+			params.put("type", 1);
+			params.put("special", 1);
+		}
+		if (type ==1) {
+			//如果是省外则直接查本部门
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			params.put("aDep", a.getDepartmentId());
+		}
+		return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);
+	}
+
+	@Override
+	public int updateapprovalExamine(Integer id, Integer examine, String reason) {
+ 		TOrderInvoice t=new TOrderInvoice();
+		t.setId(id);
+		t.setRejectReason(reason);
+		List<String> aids=new ArrayList<>();
+		TOrderInvoice o=tOrderInvoiceMapper.selectByPrimaryKey(id);
+		TOrderNew ts=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+		//examine 2通过 3拒绝
+		Integer type =null;
+		if(examine==3) {
+		t.setStatus(examine);
+		type= NoticeStatus.ORDER_INVPICE_APPROVA_NO.getCode();
+		aids.add(ts.getSalesmanId());
+		}else {
+			t.setApproval(examine);
+			type= NoticeStatus.ORDER_INVPICE_APPROVA_YES.getCode();
+			if (o.getType()==0) {
+				aids.add(organizationManagementMapper.selectByPrimaryKey(ts.getOrderDep()).getFinanceId());
+			}else if(o.getType()==1) {
+				aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), "营销管理员"));
+			}
+		
+		}
+		orderNewService.pushGeneralSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId(),0);
+		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
+	}
+
+}

File diff suppressed because it is too large
+ 1243 - 1239
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java


+ 8 - 6
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -114,7 +114,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	
 	
 	@Override
-	public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially) {
+	public int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially,String remarks) {
 		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
 		t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
 		t.setTaskAllocator(TokenManager.getAdminId());
@@ -127,11 +127,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		insetLog(taskId, taskReceiverId);
 		//0-经理 (经理分派会创建子项目)1 管理员或经理转交
 		if (specially==1) {
-			addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode());
+			addOrderLog(t.getOrderNo(), OrderLogProcess.XMDDPD.getCode(),remarks);
 			t.setManagerId(taskReceiverId);
 			t.setConsultantId(null);
 		}else if (specially==0) {
-			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode());
+			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode(),remarks);
 			t.setConsultantId(taskReceiverId);
 		}else if(specially==2) { //咨询师推给咨询师经理
 			t.setConsultantId(null);
@@ -148,11 +148,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));
 		return t;
 	}
-	public void addOrderLog(String orderNo, Integer code) {
+	public void addOrderLog(String orderNo, Integer code,String remarks) {
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(orderNo);
 		tl.setProcess(code);
 		tl.setAid(TokenManager.getAdminId());
+		if(null!=remarks)tl.setRemarks(remarks);
 		tOrderLogMapper.insertSelective(tl);
 		
 	}
@@ -187,7 +188,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName,Integer specially, String depId, String contractNo,Integer projectStatus ,Integer pageNo, Integer pageSize,Integer outsource) {
+			String adminName,Integer specially, String depId, String contractNo,Integer projectStatus , Integer approval,Integer pageNo, Integer pageSize,Integer outsource) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -199,6 +200,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (projectStatus !=null ) params.put("projectStatus", projectStatus);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
+		if (approval !=null) params.put("approval", approval);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		params.put("outsource", outsource==null?0:outsource);
@@ -426,7 +428,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				tb.setOrderNo(task.getOrderNo());
 				if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()) {
 					tb.setBonusSubject(21);//项目已提交
-					addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode());
+					addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode(),null);
 				}
 				if (task.getProjectStatus()==ProjectNewStage.LS.getCode())tb.setBonusSubject(23);//项目立项
 				if (task.getProjectStatus()==ProjectNewStage.GS.getCode())tb.setBonusSubject(24);//项目公示

+ 87 - 87
src/main/resources/props/config_local.properties

@@ -1,87 +1,87 @@
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
-#测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
-jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
-jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
-jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
-#jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
-jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
-jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
-jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
-jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
-jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
-jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
-jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
-jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
-jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
-jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
-jdbc.filters=stat
-
-logging.level.com.goafanti=DEBUG
-
-jedis.host=localhost
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=aft123456
-
-pwd.hash_algorithm_name=md5
-pwd.hash_iterations=2
-
-session.timeout=12000000
-session.validate.timespan=18000000
-
-app.name=AFT
-template.cacheable=false
-
-
-portal.host=//sf.jishutao.com/portal/2.0.6
-avatar.upload.host=//sb.jishutao.com/upload
-#连接开发
-#static.host=//sb.jishutao.com/1.1.30
-#avatar.host=//sb.jishutao.com
-
-#连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.30
-
-upload.path=F:/data/public/upload
-upload.private.path=F:/data/private/upload
-
-accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-aesSecretKey=aft1234567890123
-
-mobileCodeTemplate=SMS_37845022
-mobileRemindCodeTemplate=SMS_137421952
-patentTemplate=SMS_72005286
-
-easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
-easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
-easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
-
-jiguang.appKey=dbcea43366e038073452a04e
-jiguang.masterSecret=59792298288e4f635c737def
-jiguang.pushUrl=https://api.jpush.cn/v3/push
+#Driver
+jdbc.driverClassName=com.mysql.jdbc.Driver
+#本地
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
+#测试
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+jdbc.validationQuery=SELECT 'x'
+#\u521d\u59cb\u8fde\u63a5\u6570
+jdbc.initialSize=3
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
+jdbc.maxActive=20
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
+#jdbc.maxIdle=20
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
+jdbc.minIdle=0
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
+jdbc.maxWait=120000
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
+jdbc.testOnBorrow=false
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
+jdbc.testOnReturn=false
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
+jdbc.testWhileIdle=true
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
+jdbc.timeBetweenEvictionRunsMillis=60000
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
+jdbc.minEvictableIdleTimeMillis=300000
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
+jdbc.removeAbandoned=true
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
+jdbc.removeAbandonedTimeout=300
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
+jdbc.logAbandoned=true
+#\u7edf\u8ba1\u76d1\u63a7
+jdbc.filters=stat
+
+logging.level.com.goafanti=DEBUG
+
+jedis.host=localhost
+jedis.port=6379
+jedis.timeout=5000
+#jedis.password=aft123456
+jedis.password=hqa103146
+pwd.hash_algorithm_name=md5
+pwd.hash_iterations=2
+
+session.timeout=12000000
+session.validate.timespan=18000000
+
+app.name=AFT
+template.cacheable=false
+
+
+portal.host=//sf.jishutao.com/portal/2.0.6
+avatar.upload.host=//sb.jishutao.com/upload
+#连接开发
+#static.host=//sb.jishutao.com/1.1.31
+#avatar.host=//sb.jishutao.com
+
+#连测试
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.31
+
+upload.path=F:/data/public/upload
+upload.private.path=F:/data/private/upload
+
+accessKey=LTAIqTgQLLwz252Z
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+aesSecretKey=aft1234567890123
+
+mobileCodeTemplate=SMS_37845022
+mobileRemindCodeTemplate=SMS_137421952
+patentTemplate=SMS_72005286
+
+easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
+easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
+easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
+
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
+jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 78 - 78
src/main/resources/props/config_test.properties

@@ -1,79 +1,79 @@
-#Driver
-jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5e10\u53f7
-jdbc.username=root
-#\u5bc6\u7801
-jdbc.password=aftdev
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
-jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
-jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
-jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
-#jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
-jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
-jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
-jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
-jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
-jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
-jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
-jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
-jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
-jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
-jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
-jdbc.filters=stat
-
-logging.level.com.goafanti=DEBUG
-
-jedis.host=127.0.0.1
-jedis.port=6379
-jedis.timeout=5000
-jedis.password=aft123456
-
-pwd.hash_algorithm_name=md5
-pwd.hash_iterations=2
-
-session.timeout=12000000
-session.validate.timespan=18000000
-
-app.name=AFT
-template.cacheable=false
-
-static.host=//static.jishutao.com/1.1.30
-portal.host=//static.jishutao.com/portal/2.0.6
-avatar.host=//static.jishutao.com
-avatar.upload.host=//static.jishutao.com/upload
-
-upload.path=/data/static/public/upload
-upload.private.path=/data/static/private/upload
-
-accessKey=LTAIqTgQLLwz252Z
-accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-aesSecretKey=aft1234567890123
-
-mobileCodeTemplate=WSMS_37845022
-patentTemplate=WSMS_72005286
-mobileRemindCodeTemplate=WSMS_137421952
-
-easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
-easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
-easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
-
-jiguang.appKey=dbcea43366e038073452a04e
-jiguang.masterSecret=59792298288e4f635c737def
+#Driver
+jdbc.driverClassName=com.mysql.jdbc.Driver
+#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
+jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5e10\u53f7
+jdbc.username=root
+#\u5bc6\u7801
+jdbc.password=aftdev
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+jdbc.validationQuery=SELECT 'x'
+#\u521d\u59cb\u8fde\u63a5\u6570
+jdbc.initialSize=3
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
+jdbc.maxActive=20
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
+#jdbc.maxIdle=20
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
+jdbc.minIdle=0
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
+jdbc.maxWait=120000
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
+jdbc.testOnBorrow=false
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
+jdbc.testOnReturn=false
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
+jdbc.testWhileIdle=true
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
+jdbc.timeBetweenEvictionRunsMillis=60000
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
+jdbc.minEvictableIdleTimeMillis=300000
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
+jdbc.removeAbandoned=true
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
+jdbc.removeAbandonedTimeout=300
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
+jdbc.logAbandoned=true
+#\u7edf\u8ba1\u76d1\u63a7
+jdbc.filters=stat
+
+logging.level.com.goafanti=DEBUG
+
+jedis.host=127.0.0.1
+jedis.port=6379
+jedis.timeout=5000
+jedis.password=aft123456
+
+pwd.hash_algorithm_name=md5
+pwd.hash_iterations=2
+
+session.timeout=12000000
+session.validate.timespan=18000000
+
+app.name=AFT
+template.cacheable=false
+
+static.host=//static.jishutao.com/1.1.31
+portal.host=//static.jishutao.com/portal/2.0.6
+avatar.host=//static.jishutao.com
+avatar.upload.host=//static.jishutao.com/upload
+
+upload.path=/data/static/public/upload
+upload.private.path=/data/static/private/upload
+
+accessKey=LTAIqTgQLLwz252Z
+accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+aesSecretKey=aft1234567890123
+
+mobileCodeTemplate=WSMS_37845022
+patentTemplate=WSMS_72005286
+mobileRemindCodeTemplate=WSMS_137421952
+
+easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
+easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
+easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
+
+jiguang.appKey=dbcea43366e038073452a04e
+jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push

+ 1 - 3
src/main/resources/spring-context-4.0.xsd

@@ -471,9 +471,7 @@
 				<xsd:extension base="beans:identifiedType">
 					<xsd:attribute name="agent-id" type="xsd:string">
 						<xsd:annotation>
-							<xsd:documentation><![CDATA[
-	The agent id of the target MBeanServer, if any.
-							]]></xsd:documentation>
+							<xsd:documentation><![CDATA[ The agent id of the target MBeanServer, if any. ]]></xsd:documentation>
 						</xsd:annotation>
 					</xsd:attribute>
 				</xsd:extension>