Browse Source

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git into test

limin 7 years ago
parent
commit
934db18690

+ 8 - 9
GeneratorConfig.xml

@@ -1,15 +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.44.jar" />
-  <!-- <classPathEntry location="E:/mysql-connector-java-5.1.46.jar" /> -->
+  <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" />
+   <!-- <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" /> -->
   <context id="context1">	
- 	<property name="javaFileEncoding" value="UTF-8"/>
     <jdbcConnection connectionURL="jdbc:mysql://192.168.0.17: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="t_order_bill_new"/>
+    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
+    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="aft" />
+    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="aft" />
+    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="aft" type="XMLMAPPER" />
+    <table schema="aft" tableName="t_order_back"/> 
   </context>
-</generatorConfiguration>
+</generatorConfiguration>

+ 17 - 15
src/main/java/com/goafanti/common/dao/TOrderBackMapper.java

@@ -10,15 +10,15 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
-    int countByExample(TOrderBackExample example);
+    long countByExample(TOrderBackExample example);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int deleteByExample(TOrderBackExample example);
 
@@ -26,7 +26,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int insert(TOrderBack record);
 
@@ -42,7 +42,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int insertSelective(TOrderBack record);
 
@@ -50,7 +50,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     List<TOrderBack> selectByExampleWithBLOBs(TOrderBackExample example);
 
@@ -58,7 +58,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     List<TOrderBack> selectByExample(TOrderBackExample example);
 
@@ -66,7 +66,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     TOrderBack selectByPrimaryKey(Integer id);
 
@@ -74,7 +74,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByExampleSelective(@Param("record") TOrderBack record, @Param("example") TOrderBackExample example);
 
@@ -82,7 +82,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByExampleWithBLOBs(@Param("record") TOrderBack record, @Param("example") TOrderBackExample example);
 
@@ -90,7 +90,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByExample(@Param("record") TOrderBack record, @Param("example") TOrderBackExample example);
 
@@ -98,7 +98,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByPrimaryKeySelective(TOrderBack record);
 
@@ -106,7 +106,7 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByPrimaryKeyWithBLOBs(TOrderBack record);
 
@@ -114,7 +114,9 @@ public interface TOrderBackMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     int updateByPrimaryKey(TOrderBack record);
+
+	int updateByOrderNoAndBackStatus(String orderNo);
 }

+ 5 - 2
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNewExample;
+import com.goafanti.order.bo.TOrderNewBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -117,9 +119,10 @@ public interface TOrderNewMapper {
      * @mbg.generated Mon Nov 19 10:12:37 CST 2018
      */
     int updateByPrimaryKey(TOrderNew record);
-    
-    
+
+    TOrderNewBo getOrderNewDetail(String orderNo); 
     int getCountByIdAndStatus(TOrderNew orderNew);
     
     String getSaleIdByOno(String ono);
+
 }

+ 46 - 41
src/main/java/com/goafanti/common/mapper/TOrderBackMapper.xml

@@ -3,9 +3,10 @@
 <mapper namespace="com.goafanti.common.dao.TOrderBackMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -18,17 +19,17 @@
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     <result column="reason_attachment_url" jdbcType="LONGVARCHAR" property="reasonAttachmentUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -60,9 +61,9 @@
   </sql>
   <sql id="Update_By_Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -94,25 +95,25 @@
   </sql>
   <sql id="Base_Column_List">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     id, order_no, back_status, create_time, initiate, accept, reason, result
   </sql>
   <sql id="Blob_Column_List">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     reason_attachment_url
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderBackExample" resultMap="ResultMapWithBLOBs">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     select
     <if test="distinct">
@@ -131,9 +132,9 @@
   </select>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderBackExample" resultMap="BaseResultMap">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     select
     <if test="distinct">
@@ -150,9 +151,9 @@
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -163,18 +164,18 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     delete from t_order_back
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderBackExample">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     delete from t_order_back
     <if test="_parameter != null">
@@ -183,9 +184,9 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     insert into t_order_back (id, order_no, back_status, 
       create_time, initiate, accept, 
@@ -198,9 +199,9 @@
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     insert into t_order_back
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -262,11 +263,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBackExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderBackExample" resultType="java.lang.Long">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     select count(*) from t_order_back
     <if test="_parameter != null">
@@ -275,9 +276,9 @@
   </select>
   <update id="updateByExampleSelective" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     <set>
@@ -315,9 +316,9 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     set id = #{record.id,jdbcType=INTEGER},
@@ -335,9 +336,9 @@
   </update>
   <update id="updateByExample" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     set id = #{record.id,jdbcType=INTEGER},
@@ -354,9 +355,9 @@
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     <set>
@@ -389,9 +390,9 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -406,9 +407,9 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderBack">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Nov 20 11:06:11 CST 2018.
+      This element was generated on Wed Nov 21 11:44:14 CST 2018.
     -->
     update t_order_back
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -420,4 +421,8 @@
       result = #{result,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <update id="updateByOrderNoAndBackStatus" parameterType="java.lang.String">
+  update t_order_back set back_status=1 where  back_status=0 and order_no= #{orderNo,jdbcType=VARCHAR} 
+
+  </update>
 </mapper>

+ 50 - 8
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1009,10 +1009,22 @@
   		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,d.name as financeName
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
   	left join admin c on a.salesman_id=c.id
-  	left join admin d on a.finance_id=c.id
-  	where a.delete_sign = 0
-  	<if test="orderStatus != null">
-  	and a.order_status = #{orderStatus,jdbcType=VARCHAR}
+  	left join admin d on a.finance_id=d.id
+  	where a.delete_sign = 0 
+  	<if test="specially == 0">
+  	and a.order_status not in(3,5) and a.approval !=3
+  	</if>
+  	<if test="specially == 1">
+  	and a.process_status =1  and a.order_status=1
+  	</if>
+  	<if test="specially == 2">
+  	and a.order_status in(3,5) 
+  	</if>
+  	<if test="specially == 3">
+  	and a.approval = 1 and  a.order_status=2
+  	</if>
+  	<if test="aid != null">
+  	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
@@ -1034,9 +1046,21 @@
   	select 
   		count(*)
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
-  	where a.delete_sign = 0
-  	<if test="orderStatus != null">
-  	and a.order_status = #{orderStatus,jdbcType=VARCHAR}
+  	where a.delete_sign = 0  
+ 	<if test="specially == 0">
+  	and a.order_status not in(3,5) and a.approval !=3
+  	</if>
+  	<if test="specially == 1">
+  	and a.process_status =1  and a.order_status=1
+  	</if>
+  	<if test="specially == 2">
+  	and a.order_status in(3,5) 
+  	</if>
+  	<if test="specially == 3">
+  	and a.approval = 1 and  a.order_status=2
+  	</if>
+  	<if test="aid != null">
+  	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
@@ -1092,4 +1116,22 @@
   	and b.sign_time &lt; #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
-</mapper>
+  
+  <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
+     select 
+    a.order_no as orderNo, a.order_type as ordertType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId, a.first_amount as firstAmount, 
+    a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus, a.liquidation_status as liquidationStatus, a.process_status as processStatus, 
+    a.project_status as projectStatus, a.approval, a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, finance_id as financeId, technician_id as technicianId, 
+    a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
+    a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
+    c.name as salesmanName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
+    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate
+    from t_order_new a
+    left join `user` b on a.buyer_id=b.id
+    left join admin c on a.salesman_id=c.id
+  	left join admin d on a.finance_id=d.id
+  	left join t_order_back e on a.order_no=e.order_no
+  	left join admin f on e.initiate=f.id
+    where a.order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
+</mapper>

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

@@ -650,9 +650,9 @@
   <select id="selectOrderTask"  resultType="com.goafanti.order.bo.TOrderTaskBo">
   	select 
   		a.id,a.order_no as orderNo,a.commodity_name as commodityName,a.commodity_id as commodityId,
-  		a.commodity_price as commodityPrice,a.task_comment as taskComment,a.task_status as taskStatus,
-  		a.project_status as project_status,a.main,a.task_receiver as taskReceiver ,d.name as contacts,
-  		d.contact_mobile as contactsMobile,c.cname
+  		a.commodity_quantity as commodityQuantity,a.commodity_price as commodityPrice,a.task_comment as taskComment,
+  		a.task_status as taskStatus,a.project_status as project_status,a.main,a.task_receiver as taskReceiver ,
+  		d.name as contacts,d.contact_mobile as contactsMobile,c.cname
   	 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
   	where order_no=  #{orderNo,jdbcType=VARCHAR}

+ 2 - 1
src/main/java/com/goafanti/common/model/TOrderBack.java

@@ -7,7 +7,7 @@ public class TOrderBack {
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column t_order_back.id
-     *
+     *
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
      */
     private Integer id;
@@ -295,6 +295,7 @@ public class TOrderBack {
      * @param reasonAttachmentUrl the value for t_order_back.reason_attachment_url
      *
      * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+>>>>>>> refs/remotes/origin/test
      */
     public void setReasonAttachmentUrl(String reasonAttachmentUrl) {
         this.reasonAttachmentUrl = reasonAttachmentUrl;

+ 17 - 17
src/main/java/com/goafanti/common/model/TOrderBackExample.java

@@ -9,7 +9,7 @@ public class TOrderBackExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class TOrderBackExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class TOrderBackExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public TOrderBackExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -43,7 +43,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +63,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ public class TOrderBackExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,7 +152,7 @@ public class TOrderBackExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -730,7 +730,7 @@ public class TOrderBackExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table t_order_back
      *
-     * @mbggenerated do_not_delete_during_merge Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated do_not_delete_during_merge Wed Nov 21 11:44:14 CST 2018
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -743,7 +743,7 @@ public class TOrderBackExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table t_order_back
      *
-     * @mbggenerated Tue Nov 20 11:06:11 CST 2018
+     * @mbg.generated Wed Nov 21 11:44:14 CST 2018
      */
     public static class Criterion {
         private String condition;

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

@@ -0,0 +1,7 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TOrderNew;
+
+public class BackOrderListBo  extends TOrderNew{
+
+}

+ 58 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.bo;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import com.goafanti.common.constant.AFTConstants;
@@ -13,8 +14,17 @@ public class TOrderNewBo extends TOrderNew{
 	private String financeName;
 	private String dunSubject;
 	private String startDate;
+	private String financeMobile;
+	private String salesmanMobile;
+	private Integer backStatus;
+	private String initiateName;
+	private String reason;
+	private String backDate;
 	
 	public String getSignDate() {
+		if (StringUtils.isBlank(signDate)&&super.getSignTime()!=null) {
+			return DateFormatUtils.format(super.getSignTime(), AFTConstants.YYYYMMDD);
+		}
 		return signDate;
 	}
 
@@ -85,5 +95,53 @@ public class TOrderNewBo extends TOrderNew{
 	public void setId(String id) {
 		this.id = id;
 	}
+
+	public String getFinanceMobile() {
+		return financeMobile;
+	}
+
+	public void setFinanceMobile(String financeMobile) {
+		this.financeMobile = financeMobile;
+	}
+
+	public String getSalesmanMobile() {
+		return salesmanMobile;
+	}
+
+	public void setSalesmanMobile(String salesmanMobile) {
+		this.salesmanMobile = salesmanMobile;
+	}
+
+	public Integer getBackStatus() {
+		return backStatus;
+	}
+
+	public void setBackStatus(Integer backStatus) {
+		this.backStatus = backStatus;
+	}
+
+	public String getInitiateName() {
+		return initiateName;
+	}
+
+	public void setInitiateName(String initiateName) {
+		this.initiateName = initiateName;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+	public String getBackDate() {
+		return backDate;
+	}
+
+	public void setBackDate(String backDate) {
+		this.backDate = backDate;
+	}
 	
 }

+ 53 - 12
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -16,6 +16,8 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
+import com.goafanti.order.enums.ApprovalNewState;
+import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.service.OrderNewService;
 
 @RestController
@@ -71,7 +73,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	public Result updateOrderTask(TOrderTask t){
 		Result res=new Result();
 		if(null==t.getId()){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","项目编号"));
 			return res;
 		}
 		if (t.getOrderNo()!=null&&orderNewService.checkOrderMain(t)) {
@@ -94,6 +96,20 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderNewService.delectOrderTask(id));
 	}
+	/**
+	 * 删除订单
+	 * @param detailId
+	 * @return
+	 */
+	@RequestMapping(value = "/deleteOrderNew",method = RequestMethod.POST)
+	public Result deleteOrderNew(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		return res.data(orderNewService.deleteOrderNew(orderNo));
+	}
 	
 	/**
 	 * 获取订单项目信息
@@ -193,27 +209,32 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单列表
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime,Integer orderStatus,Integer pageNo,Integer pageSize){
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime,orderStatus, pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , pageNo, pageSize));
 		return res;
 	}
+	
 	/**
 	 * 订单审核
 	 */
-	@RequestMapping(value="/auditOrderNew", method = RequestMethod.GET)
-	public Result auditOrderNewList(String orderNo,Integer orderStatus){
+	@RequestMapping(value="/auditOrderNew", method = RequestMethod.POST)
+	public Result auditOrderNewList(String orderNo,Integer orderStatus,String reason){
 		Result res=new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));
 			return res;
 		}
-		if(orderStatus==null||(orderStatus!=2&&orderStatus!=3)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "审核状态","审核状态"));
+		if(orderStatus==null||(orderStatus!=OrderNewState.QDSHTG.getCode()&&orderStatus!=OrderNewState.QDSHJJ.getCode())||
+				orderNewService.chekeOrderStatus(orderNo)){
+			res.getError().add(buildError( "审核状态错误","审核状态错误"));
 			return res;
 		}
-		orderNewService.updateOrderNew(orderNo,orderStatus);
-		return res;
+		if (orderStatus==OrderNewState.QDSHJJ.getCode()&&StringUtils.isBlank(reason)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"驳回原因", "驳回原因"));
+			return res;
+		}
+		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason));
 	}
 	/**
 	 * 催款统计列表
@@ -269,6 +290,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同与申请表","合同与申请表"));
 				return res;
 			}
+			if (StringUtils.isBlank(t.getReason())) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "退单原因","退单原因"));
+				return res;
+			}
+			if(orderNewService.checkOderSettlementAmount(t.getOrderNo())){
+				res.getError().add(buildError( "未达退单条件","未达退单条件"));
+				return res;
+			}
 			res.data(orderNewService.addOrderRefund(t));
 			return res;
 	}
@@ -277,10 +306,22 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @param orderNo
 	 * @return
 	 */
-	@RequestMapping(value = "/approvalOrder",method = RequestMethod.GET)
+	@RequestMapping(value = "/approvalOrder",method = RequestMethod.POST)
 	public Result approvalOrder(String orderNo,Integer confirm,String reason){
 		Result res = new Result();
-		orderNewService.updateApprovalOrder(orderNo,confirm,reason);
-		return res;
+		if (StringUtils.isBlank(orderNo)||confirm==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号和审批","订单编号和审批"));
+			return res;
+		}
+		if (confirm==ApprovalNewState.BH.getCode()&&StringUtils.isBlank(reason)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"驳回原因", "驳回原因"));
+			return res;
+		}
+		if (orderNewService.chekeApprovalOrderStatus(orderNo)) {
+			res.getError().add(buildError( "审核状态错误","审核状态错误"));
+			return res;
+		}
+		return res.data(orderNewService.updateApprovalOrder(orderNo,confirm,reason));
 	}
+	
 }

+ 4 - 0
src/main/java/com/goafanti/order/enums/ApprovalNewState.java

@@ -4,9 +4,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum ApprovalNewState {
+	/** 非特批 **/
 	FTP(0,"非特批"),
+	/** 待审核 **/
 	DSH(1,"待审核"),
+	/** 通过 **/
 	TG(2,"通过"),
+	/** 驳回 **/
 	BH(3,"驳回"),
 	/** 无效 **/
 	INVALID(10, "INVALID");

+ 7 - 5
src/main/java/com/goafanti/order/enums/OrderNewState.java

@@ -4,17 +4,19 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum OrderNewState {
-	/** 意向阶段 **/
+	/** 待签单 **/
 	DQD(0,"待签单 "),
-	/** 跟单阶段 **/
+	/** 签单待审 **/
 	QDDS(1,"签单待审"),
-	/** 合同阶段 **/
+	/** 签单审核通过 **/
 	QDSHTG(2,"签单审核通过"),
-	/** 项目阶段 **/
+	/** 签单审核拒绝 **/
 	QDSHJJ(3, "签单审核拒绝"),
-	
+	/** 已结项 **/
 	YJX(4, "已结项"),
+	/** 已驳回 **/
 	YBH(5, "已驳回"),
+	/** 已退单 **/
 	YTD(6, "已退单");
 	
 	private OrderNewState(Integer code, String desc) {

+ 7 - 0
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -9,12 +9,19 @@ import java.util.Map;
  *
  */
 public enum ProcessStatus {
+	/** 已派营销员 **/
 	YPYXY(0,"已派营销员"),
+	/** 已派营销管理员 **/
 	YPYXGLY(1,"已派营销管理员"),
+	/** 已派财务管理员 **/
 	YPCWGLY(2,"已派财务管理员"),
+	/** 已派财务专员 **/
 	YPCWZY(3,"已派财务专员"),
+	/** 已派咨询师管理员 **/
 	YPZXSGLY(4,"已派咨询师管理员"),
+	/** 已部分派咨询师经理 **/
 	YBFPZXSGLY(5,"已部分派咨询师经理"),
+	/** 已全部分派咨询师经理 **/
 	YQBFPZXSGLY(6,"已全部分派咨询师经理"),
 	/** 无效 **/
 	INVALID(10, "INVALID");

+ 8 - 3
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -9,6 +9,7 @@ import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.BackOrderListBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -76,14 +77,14 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime, Integer orderStatus,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer pageNo, Integer pageSize);
 	/**
 	 * 订单审核
 	 * @param orderNo
 	 * @param orderStatus
 	 * @return
 	 */
-	int updateOrderNew(String orderNo, Integer orderStatus);
+	int updateOrderNew(String orderNo, Integer orderStatus,String reason);
 	
 	/**
 	 * 催款订单列表
@@ -124,7 +125,11 @@ public interface OrderNewService {
 	int updateApprovalOrder(String orderNo,Integer confirm,String reason);
 	List<TOrderDun> selectOrderDun(String orderNo);
 	boolean checkOrderMain(TOrderTask t);
-	
+	boolean chekeOrderStatus(String orderNo);
+	boolean chekeApprovalOrderStatus(String orderNo);
+	int deleteOrderNew(String orderNo);
+	boolean checkOderSettlementAmount(String orderNo);
+
 
 	
 }

+ 101 - 18
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -26,6 +26,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.TDunLogMapper;
+import com.goafanti.common.dao.TOrderBackMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
 import com.goafanti.common.dao.TOrderMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
@@ -37,6 +38,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.TDunLog;
 import com.goafanti.common.model.TOrder;
+import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
@@ -50,6 +52,7 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
+import com.goafanti.order.bo.BackOrderListBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -57,6 +60,7 @@ import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.enums.OrderNewState;
+import com.goafanti.order.enums.OrderState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.order.enums.TaskState;
@@ -76,6 +80,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private TOrderRefundMapper	tOrderRefundMapper;	
 	@Autowired
+	private TOrderBackMapper	tOrderBackMapper;
+	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
 	private JDBCIdGenerator	idGenerator;
@@ -177,7 +183,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		contactBook.setName(t.getContacts());
 		contactBook.setMobile(t.getContactMobile());
 		organizationContactBookMapper.insertSelective(contactBook);
-		t.setOrderStatus(isSubmit==1?1:0);
+		if (isSubmit==1) {
+			t.setOrderStatus(OrderNewState.QDDS.getCode());
+			if (t.getApproval()==ApprovalNewState.FTP.getCode()) {
+				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
+			}
+		}
+		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		if (t2.getApproval()==ApprovalNewState.BH.getCode()||
+				t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
+					t2.getOrderStatus()==OrderNewState.YBH.getCode()) {
+			tOrderBackMapper.updateByOrderNoAndBackStatus(t.getOrderNo());
+		}
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -185,14 +202,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
-		TOrderNewBo bo =new TOrderNewBo();
-		try {
-			BeanUtilsExt.copyProperties( bo,tOrder);
-		} catch (IllegalAccessException | InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return bo;
+		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
+		return tOrder;
 	}
 
 
@@ -230,15 +241,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer orderStatus, Integer pageNo,
+	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially, 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 (orderStatus!=null&&orderStatus==1) {
-			params.put("orderStatus", orderStatus);
+		if (specially!=null&&specially==0) {
+			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+			params.put("specially",specially);
 		}else {
-			if (StringUtils.isNotBlank(TokenManager.getAdminId())) params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+			params.put("specially",specially);
 		}
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
@@ -251,15 +263,37 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public int updateOrderNew(String orderNo, Integer orderStatus) {
+	public int updateOrderNew(String orderNo, Integer orderStatus,String reason) {
 		TOrderNew t= new TOrderNew();
+		TOrderNew t2= tOrderNewMapper.selectByPrimaryKey(orderNo);
 		t.setOrderNo(orderNo);
+		if (orderStatus==OrderNewState.QDSHTG.getCode()&&t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
+				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+		}
+		if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
+			t.setProcessStatus(ProcessStatus.YPYXY.getCode());
+			addBackOrder(orderNo, reason);
+		}
 		t.setOrderStatus(orderStatus);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
 
 
+	private void addBackOrder(String orderNo, String reason) {
+		TOrderBack ob=new TOrderBack();
+		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		ob.setCreateTime(new Date());
+		ob.setOrderNo(orderNo);
+		ob.setReason(reason);
+		ob.setBackStatus(0);//待处理
+		ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		ob.setAccept(tOrder.getSalesmanId());
+		tOrderBackMapper.insertSelective(ob);
+	}
+
+
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
@@ -304,10 +338,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int addOrderRefund(TOrderRefundWithBLOBs t) {
+		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		t.setRefundStatus(refundState.DSH.getCode());
 		t.setCreateTime(new Date());
 		t.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		t.setAccept("受理人");
+		t.setAccept("1");
+		//t.setAccept(tOrder.getFinanceId());
 		t.setResult("");
 		return tOrderRefundMapper.insertSelective(t);
 	}
@@ -323,10 +359,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 		} else {
 			t.setApproval(3);
-			//TOrderb
-			
+			t.setOrderStatus(OrderNewState.YBH.getCode());
+			addBackOrder(orderNo, reason);
 		}
-		return 1;
+		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
 
@@ -353,5 +389,52 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		return flag;
 	}
+
+
+
+	@Override
+	public boolean chekeOrderStatus(String orderNo) {
+		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (tOrder.getOrderStatus()!=OrderNewState.QDDS.getCode()) {
+			return true;
+		}
+		return false;
+	}
+
+
+
+	@Override
+	public boolean chekeApprovalOrderStatus(String orderNo) {
+		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (tOrder.getApproval()==ApprovalNewState.FTP.getCode()||
+				tOrder.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
+					tOrder.getOrderStatus()==OrderNewState.YBH.getCode()) {
+			return true;
+		}
+		return false;
+	}
+
+
+
+	@Override
+	public int deleteOrderNew(String orderNo) {
+		TOrderNew t=new TOrderNew();
+		t.setOrderNo(orderNo);
+		t.setDeleteSign(1);//作废
+		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+	}
+
+
+
+	@Override
+	public boolean checkOderSettlementAmount(String orderNo) {
+		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (tOrder.getSettlementAmount()==null||tOrder.getSettlementAmount().doubleValue()==0){
+				return true;
+		}
+		return false;
+	}
+	
+	
 	
 }