Преглед изворни кода

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

anderx пре 4 година
родитељ
комит
eaf1fb217c

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderMidMapper.java

@@ -45,4 +45,6 @@ public interface TOrderMidMapper {
     List<ErrorDunListBo> selectErrorDun();
     List<ErrorDunListBo> selectErrorDun();
 
 
     void updateErrorDun();
     void updateErrorDun();
+
+    int judgeProjectType(String orderNo);
 }
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -65,4 +65,6 @@ public interface TOrderTaskMapper {
 
 
     List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
     List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
                                                    @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
                                                    @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
-}
+
+
+}

+ 23 - 4
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -24,12 +24,13 @@
     <result column="legal_affairs_type" jdbcType="INTEGER" property="legalAffairsType" />
     <result column="legal_affairs_type" jdbcType="INTEGER" property="legalAffairsType" />
     <result column="operation_time" jdbcType="DATE" property="operationTime" />
     <result column="operation_time" jdbcType="DATE" property="operationTime" />
     <result column="legal_affairs_status" jdbcType="INTEGER" property="legalAffairsStatus" />
     <result column="legal_affairs_status" jdbcType="INTEGER" property="legalAffairsStatus" />
+    <result column="project_type" jdbcType="INTEGER" property="projectType" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables,
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables,
     final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables,
     final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables,
     order_arrears, payment_amount, cost_amount, dep_name, province_name, legal_affairs,
     order_arrears, payment_amount, cost_amount, dep_name, province_name, legal_affairs,
-    dun_start_time, legal_affairs_type, operation_time, legal_affairs_status
+    dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type
   </sql>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     select
@@ -49,7 +50,7 @@
       order_arrears, payment_amount, cost_amount,
       order_arrears, payment_amount, cost_amount,
       dep_name, province_name, legal_affairs,
       dep_name, province_name, legal_affairs,
       dun_start_time, legal_affairs_type, operation_time,
       dun_start_time, legal_affairs_type, operation_time,
-      legal_affairs_status)
+      legal_affairs_status, project_type)
     values (#{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
     values (#{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
       #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, #{finalReceivables,jdbcType=DECIMAL},
       #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, #{finalReceivables,jdbcType=DECIMAL},
       #{finalReceivablesTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL},
       #{finalReceivablesTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL},
@@ -57,7 +58,7 @@
       #{orderArrears,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL},
       #{orderArrears,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL},
       #{depName,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, #{legalAffairs,jdbcType=INTEGER},
       #{depName,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, #{legalAffairs,jdbcType=INTEGER},
       #{dunStartTime,jdbcType=TIMESTAMP}, #{legalAffairsType,jdbcType=INTEGER}, #{operationTime,jdbcType=DATE},
       #{dunStartTime,jdbcType=TIMESTAMP}, #{legalAffairsType,jdbcType=INTEGER}, #{operationTime,jdbcType=DATE},
-      #{legalAffairsStatus,jdbcType=INTEGER})
+      #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER})
   </insert>
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
     insert into t_order_mid
     insert into t_order_mid
@@ -125,6 +126,9 @@
       <if test="legalAffairsStatus != null">
       <if test="legalAffairsStatus != null">
         legal_affairs_status,
         legal_affairs_status,
       </if>
       </if>
+      <if test="projectType != null">
+        project_type,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
       <if test="orderNo != null">
@@ -190,6 +194,9 @@
       <if test="legalAffairsStatus != null">
       <if test="legalAffairsStatus != null">
         #{legalAffairsStatus,jdbcType=INTEGER},
         #{legalAffairsStatus,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="projectType != null">
+        #{projectType,jdbcType=INTEGER},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderMid">
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderMid">
@@ -258,6 +265,9 @@
       <if test="legalAffairsStatus != null">
       <if test="legalAffairsStatus != null">
         legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
         legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="projectType != null">
+        project_type = #{projectType,jdbcType=INTEGER},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
@@ -283,7 +293,8 @@
       dun_start_time = #{dunStartTime,jdbcType=TIMESTAMP},
       dun_start_time = #{dunStartTime,jdbcType=TIMESTAMP},
       legal_affairs_type = #{legalAffairsType,jdbcType=INTEGER},
       legal_affairs_type = #{legalAffairsType,jdbcType=INTEGER},
       operation_time = #{operationTime,jdbcType=DATE},
       operation_time = #{operationTime,jdbcType=DATE},
-      legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER}
+      legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
+      project_type = #{projectType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
   <select id="selectByOrderNo" resultMap="BaseResultMap">
   <select id="selectByOrderNo" resultMap="BaseResultMap">
@@ -399,6 +410,9 @@
       <if test="legalAffairsStatus != null">
       <if test="legalAffairsStatus != null">
         legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
         legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="projectType != null">
+        project_type = #{projectType,jdbcType=INTEGER},
+      </if>
     </set>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   </update>
@@ -541,4 +555,9 @@
     set a.order_receivables=b.money,a.order_arrears =(b.money-c.settlement_amount)
     set a.order_receivables=b.money,a.order_arrears =(b.money-c.settlement_amount)
     where a.order_no =b.order_no and a.order_no =c.order_no and a.order_receivables !=b.money;
     where a.order_no =b.order_no and a.order_no =c.order_no and a.order_receivables !=b.money;
   </update>
   </update>
+  <select id="judgeProjectType" resultType="java.lang.Integer">
+    select count(*) from t_order_new a left join t_order_task b on a.order_no =b.order_no
+                                       left join business_project c on b.commodity_id =c.id left join business_category d on c.cid =d.id
+    where d.sort =6 and a.order_no = #{orderNo}
+  </select>
 </mapper>
 </mapper>

+ 18 - 5
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -829,17 +829,18 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select order_no orderNo ,salesman_id as salesmanId, a.name as salesmanName,
-           o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,
-           d.name departmentName,d.finance_id  financeId
+    select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,
+           o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
+           d.finance_id  financeId
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
-    left join department d on o.order_dep=d.id where order_no = #{_parameter,jdbcType=VARCHAR}
+    left join department d on o.order_dep=d.id
+    where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   </select>
 
 
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
   	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
   	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,
   	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,
-  	a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,
+  	a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
   	dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount
   	dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount
   	<if test="specially == 2">
   	<if test="specially == 2">
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
@@ -933,6 +934,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="name != null">
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
+    <if test="projectType != null">
+      and c.project_type = #{projectType}
+    </if>
+    <if test="processStatus != null">
+      and a.process_status = #{processStatus}
+    </if>
   	<if test="orderNo != null">
   	<if test="orderNo != null">
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
@@ -1064,6 +1071,12 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="name != null">
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	</if>
+     <if test="projectType != null">
+       and c.project_type = #{projectType}
+     </if>
+     <if test="processStatus != null">
+       and a.process_status = #{processStatus}
+     </if>
   	<if test="orderNo != null">
   	<if test="orderNo != null">
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
   	</if>
   	</if>

+ 1 - 2
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -469,8 +469,7 @@
 	<select id="selectPublicOrganizationCustomerCount" resultType="java.lang.Integer">
 	<select id="selectPublicOrganizationCustomerCount" resultType="java.lang.Integer">
 		select
 		select
 			count(0)
 			count(0)
-		from
-			user a
+		from user a
 		<if test="province != null or city != null or area != null">
 		<if test="province != null or city != null or area != null">
 			inner join organization_identity b on a.id = b.uid
 			inner join organization_identity b on a.id = b.uid
 		</if>
 		</if>

+ 11 - 96
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -119,6 +119,11 @@ public class TOrderMid implements Serializable {
      */
      */
     private Integer legalAffairsStatus;
     private Integer legalAffairsStatus;
 
 
+    /**
+     * 会员 0否 1是
+     */
+    private Integer projectType;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     public Integer getId() {
     public Integer getId() {
@@ -297,101 +302,11 @@ public class TOrderMid implements Serializable {
         this.legalAffairsStatus = legalAffairsStatus;
         this.legalAffairsStatus = legalAffairsStatus;
     }
     }
 
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        TOrderMid other = (TOrderMid) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
-            && (this.getSalesmanId() == null ? other.getSalesmanId() == null : this.getSalesmanId().equals(other.getSalesmanId()))
-            && (this.getFinanceId() == null ? other.getFinanceId() == null : this.getFinanceId().equals(other.getFinanceId()))
-            && (this.getSalesmanName() == null ? other.getSalesmanName() == null : this.getSalesmanName().equals(other.getSalesmanName()))
-            && (this.getFinanceName() == null ? other.getFinanceName() == null : this.getFinanceName().equals(other.getFinanceName()))
-            && (this.getFinalReceivables() == null ? other.getFinalReceivables() == null : this.getFinalReceivables().equals(other.getFinalReceivables()))
-            && (this.getFinalReceivablesTime() == null ? other.getFinalReceivablesTime() == null : this.getFinalReceivablesTime().equals(other.getFinalReceivablesTime()))
-            && (this.getInvoiceAmount() == null ? other.getInvoiceAmount() == null : this.getInvoiceAmount().equals(other.getInvoiceAmount()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getBuyerName() == null ? other.getBuyerName() == null : this.getBuyerName().equals(other.getBuyerName()))
-            && (this.getOrderReceivables() == null ? other.getOrderReceivables() == null : this.getOrderReceivables().equals(other.getOrderReceivables()))
-            && (this.getOrderArrears() == null ? other.getOrderArrears() == null : this.getOrderArrears().equals(other.getOrderArrears()))
-            && (this.getPaymentAmount() == null ? other.getPaymentAmount() == null : this.getPaymentAmount().equals(other.getPaymentAmount()))
-            && (this.getCostAmount() == null ? other.getCostAmount() == null : this.getCostAmount().equals(other.getCostAmount()))
-            && (this.getDepName() == null ? other.getDepName() == null : this.getDepName().equals(other.getDepName()))
-            && (this.getProvinceName() == null ? other.getProvinceName() == null : this.getProvinceName().equals(other.getProvinceName()))
-            && (this.getLegalAffairs() == null ? other.getLegalAffairs() == null : this.getLegalAffairs().equals(other.getLegalAffairs()))
-            && (this.getDunStartTime() == null ? other.getDunStartTime() == null : this.getDunStartTime().equals(other.getDunStartTime()))
-            && (this.getLegalAffairsType() == null ? other.getLegalAffairsType() == null : this.getLegalAffairsType().equals(other.getLegalAffairsType()))
-            && (this.getOperationTime() == null ? other.getOperationTime() == null : this.getOperationTime().equals(other.getOperationTime()))
-            && (this.getLegalAffairsStatus() == null ? other.getLegalAffairsStatus() == null : this.getLegalAffairsStatus().equals(other.getLegalAffairsStatus()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
-        result = prime * result + ((getSalesmanId() == null) ? 0 : getSalesmanId().hashCode());
-        result = prime * result + ((getFinanceId() == null) ? 0 : getFinanceId().hashCode());
-        result = prime * result + ((getSalesmanName() == null) ? 0 : getSalesmanName().hashCode());
-        result = prime * result + ((getFinanceName() == null) ? 0 : getFinanceName().hashCode());
-        result = prime * result + ((getFinalReceivables() == null) ? 0 : getFinalReceivables().hashCode());
-        result = prime * result + ((getFinalReceivablesTime() == null) ? 0 : getFinalReceivablesTime().hashCode());
-        result = prime * result + ((getInvoiceAmount() == null) ? 0 : getInvoiceAmount().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getBuyerName() == null) ? 0 : getBuyerName().hashCode());
-        result = prime * result + ((getOrderReceivables() == null) ? 0 : getOrderReceivables().hashCode());
-        result = prime * result + ((getOrderArrears() == null) ? 0 : getOrderArrears().hashCode());
-        result = prime * result + ((getPaymentAmount() == null) ? 0 : getPaymentAmount().hashCode());
-        result = prime * result + ((getCostAmount() == null) ? 0 : getCostAmount().hashCode());
-        result = prime * result + ((getDepName() == null) ? 0 : getDepName().hashCode());
-        result = prime * result + ((getProvinceName() == null) ? 0 : getProvinceName().hashCode());
-        result = prime * result + ((getLegalAffairs() == null) ? 0 : getLegalAffairs().hashCode());
-        result = prime * result + ((getDunStartTime() == null) ? 0 : getDunStartTime().hashCode());
-        result = prime * result + ((getLegalAffairsType() == null) ? 0 : getLegalAffairsType().hashCode());
-        result = prime * result + ((getOperationTime() == null) ? 0 : getOperationTime().hashCode());
-        result = prime * result + ((getLegalAffairsStatus() == null) ? 0 : getLegalAffairsStatus().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", orderNo=").append(orderNo);
-        sb.append(", salesmanId=").append(salesmanId);
-        sb.append(", financeId=").append(financeId);
-        sb.append(", salesmanName=").append(salesmanName);
-        sb.append(", financeName=").append(financeName);
-        sb.append(", finalReceivables=").append(finalReceivables);
-        sb.append(", finalReceivablesTime=").append(finalReceivablesTime);
-        sb.append(", invoiceAmount=").append(invoiceAmount);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", buyerName=").append(buyerName);
-        sb.append(", orderReceivables=").append(orderReceivables);
-        sb.append(", orderArrears=").append(orderArrears);
-        sb.append(", paymentAmount=").append(paymentAmount);
-        sb.append(", costAmount=").append(costAmount);
-        sb.append(", depName=").append(depName);
-        sb.append(", provinceName=").append(provinceName);
-        sb.append(", legalAffairs=").append(legalAffairs);
-        sb.append(", dunStartTime=").append(dunStartTime);
-        sb.append(", legalAffairsType=").append(legalAffairsType);
-        sb.append(", operationTime=").append(operationTime);
-        sb.append(", legalAffairsStatus=").append(legalAffairsStatus);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+    public Integer getProjectType() {
+        return projectType;
+    }
+
+    public void setProjectType(Integer projectType) {
+        this.projectType = projectType;
     }
     }
 }
 }

+ 22 - 27
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -5,7 +5,10 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
 
 
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.ErrorDunListBo;
 import com.goafanti.common.bo.ErrorDunListBo;
+import com.goafanti.common.dao.*;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.service.LegalAffairsService;
 import com.goafanti.order.service.LegalAffairsService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -18,10 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.PaymentNodeMapper;
-import com.goafanti.common.dao.TArrearsDunMapper;
-import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.PaymentNode;
@@ -35,9 +34,13 @@ import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.OutPaymentNode;
 import com.goafanti.organization.bo.OutPaymentNode;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 
 
 
 @Component
 @Component
+@RestController
 public class OrderDunTask {
 public class OrderDunTask {
 	@Autowired
 	@Autowired
 	private OrderNewService orderNewService;
 	private OrderNewService orderNewService;
@@ -50,6 +53,8 @@ public class OrderDunTask {
 	@Autowired
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	private TOrderMidMapper	tOrderMidMapper;
 	@Autowired
 	@Autowired
+	private AdminMapper adminMapper;
+	@Autowired
 	private PaymentNodeMapper	paymentNodeMapper;
 	private PaymentNodeMapper	paymentNodeMapper;
 	@Autowired
 	@Autowired
 	private OrderProjectService	orderProjectService;
 	private OrderProjectService	orderProjectService;
@@ -111,7 +116,7 @@ public class OrderDunTask {
 	/**
 	/**
 	 * 询处理需要新催款的信息
 	 * 询处理需要新催款的信息
 	 */
 	 */
-//	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
+	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
 	public void updateNewOrderDun(){
 	public void updateNewOrderDun(){
   		try {
   		try {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
@@ -217,7 +222,7 @@ public class OrderDunTask {
 	*
 	*
 	*/
 	*/
 	@Scheduled(cron = "0 0 4 1 * ?")
 	@Scheduled(cron = "0 0 4 1 * ?")
-//	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
+	@RequestMapping(value = "/open/pushOrderArrearsDun", method = RequestMethod.GET)
 	public void pushOrderArrearsDun(){
 	public void pushOrderArrearsDun(){
 		try {
 		try {
 			LoggerUtils.debug(logger, "======================欠款催款启动===================");
 			LoggerUtils.debug(logger, "======================欠款催款启动===================");
@@ -227,16 +232,17 @@ public class OrderDunTask {
 			List<TArrearsDun> list2=tArrearsDunMapper.selectStatusAll(1);
 			List<TArrearsDun> list2=tArrearsDunMapper.selectStatusAll(1);
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			for (TArrearsDun td : list) {
 			for (TArrearsDun td : list) {
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(td.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
-				System.out.println(tm.toString());
-				System.out.println(tm.getOrderArrears());
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					td.setDunStatus(1);
 					td.setDunStatus(1);
 					td.setStartTime(date);
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					addNotic(td.getOrderNo(),td,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
 					td.setDunStatus(2);
@@ -248,6 +254,8 @@ public class OrderDunTask {
 			}
 			}
 			for (TArrearsDun ta : list2) {
 			for (TArrearsDun ta : list2) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					ta.setDunStatus(3);
@@ -258,7 +266,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -269,6 +277,9 @@ public class OrderDunTask {
 			}
 			}
 			for (TArrearsDun ta : list3) {
 			for (TArrearsDun ta : list3) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
+				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					ta.setDunStatus(3);
@@ -279,7 +290,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					addNotic(ta.getOrderNo(),ta,NoticeStatus.ORDER_ARREARS_DUN.getCode());
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
@@ -381,20 +392,4 @@ public class OrderDunTask {
 	}
 	}
 
 
 
 
-
-
-	private void addNotic(String orderNo, TArrearsDun td, Integer code) {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-		StringBuffer str =new StringBuffer().append(b.getUserName()).append(", 合同编号-").append(b.getContractNo())
-				.append(", 订单编号-").append(orderNo).append(", 操作人: ").append(b.getSalesmanName()).append("。");
-		Notice n =new Notice();
-		n.setId(UUID.randomUUID().toString());
-		n.setAid(b.getSalesmanId());
-		n.setNoticeType(code);
-		n.setContent(str.toString());
-		n.setReaded(0);//未读
-		asyncUtils.addNotice(n);
-	}
-
-
 }
 }

+ 8 - 4
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -48,14 +48,18 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer dunStatus;
 	private Integer dunStatus;
 	private BigDecimal appropriationRatio;
 	private BigDecimal appropriationRatio;
 	private BigDecimal setUpAmount;
 	private BigDecimal setUpAmount;
-	
+
 	private List<?> dunList;
 	private List<?> dunList;
 	private List<?> taskList;
 	private List<?> taskList;
 	/**
 	/**
 	 * 是否变更 0否 1是
 	 * 是否变更 0否 1是
 	 */
 	 */
 	private Integer ischange;
 	private Integer ischange;
-	
+
+
+
+
+
 	public String getDunSubject() {
 	public String getDunSubject() {
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
@@ -135,7 +139,7 @@ public class TOrderNewBo extends TOrderNew{
 			return DateFormatUtils.format(super.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			return DateFormatUtils.format(super.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 		}
 	}
 	}
-	
+
 	public String getUpdateDate() {
 	public String getUpdateDate() {
 		if (super.getUpdateTime() == null) {
 		if (super.getUpdateTime() == null) {
 			return null;
 			return null;
@@ -368,5 +372,5 @@ public class TOrderNewBo extends TOrderNew{
 	public void setNickname(String nickname) {
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
 		this.nickname = nickname;
 	}
 	}
-	
+
 }
 }

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

@@ -34,7 +34,7 @@ import com.goafanti.order.service.OrderNewService;
 @RestController
 @RestController
 @RequestMapping(value = "/api/admin/newOrder")
 @RequestMapping(value = "/api/admin/newOrder")
 public class AdminNewOrderApiController extends CertifyApiController {
 public class AdminNewOrderApiController extends CertifyApiController {
-	
+
 	@Autowired
 	@Autowired
 	private OrderNewService orderNewService;
 	private OrderNewService orderNewService;
 	@Autowired
 	@Autowired
@@ -97,11 +97,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(orderNewService.updateOrderTask(t));
 		return res.data(orderNewService.updateOrderTask(t));
 	}
 	}
-	
-	
 
 
-	
-	
+
+
+
+
 	/**
 	/**
 	 * 删除订单项目
 	 * 删除订单项目
 	 * @return
 	 * @return
@@ -133,7 +133,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(i);
 		return res.data(i);
 	}
 	}
-	
+
 	/**
 	/**
 	 * 获取订单项目信息
 	 * 获取订单项目信息
 	 * @param orderNo
 	 * @param orderNo
@@ -147,7 +147,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			return res;
 			return res;
 		}
 		}
 		res.setData(orderNewService.selectOrderTask(orderNo));
 		res.setData(orderNewService.selectOrderTask(orderNo));
-		
+
 		return res;
 		return res;
 	}
 	}
 	/**
 	/**
@@ -195,8 +195,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(orderNewService.updateServiceOrder(t,i));
 		res.setData(orderNewService.updateServiceOrder(t,i));
 		return res;
 		return res;
 	}
 	}
-	
-	/** 
+
+	/**
 	 * 订单详情
 	 * 订单详情
 	 * @param orderNo
 	 * @param orderNo
 	 * @return
 	 * @return
@@ -239,7 +239,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	}
 	}
 	/**
 	/**
 	 * 订单列表
 	 * 订单列表
-	 * 
+	 *
 	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
 	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 *amountStatus 0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 *amountStatus 0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
@@ -247,14 +247,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
 	public Result orderNewList(String aid,String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer approval,
 	public Result orderNewList(String aid,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 distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer amountStatus,
-							   String contractStart,String contractEnd,String uid,Integer pageNo,Integer pageSize){
+							   String contractStart,String contractEnd,String uid,Integer projectType,Integer processStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
 		Result res=new Result();
 		res.data(orderNewService.orderNewList(aid,name, orderNo, starTime, endTime, specially ,approval, distribution,depId,
 		res.data(orderNewService.orderNewList(aid,name, orderNo, starTime, endTime, specially ,approval, distribution,depId,
-				contractNo,outsource, liquidationStatus,amountStatus,contractStart, contractEnd,uid,pageNo, pageSize));
+				contractNo,outsource, liquidationStatus,amountStatus,contractStart, contractEnd,uid, projectType,processStatus,pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
-	
+
+
 	/**
 	/**
 	 * 订单审核
 	 * 订单审核
 	 */
 	 */
@@ -276,8 +276,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason,0,null));
 		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason,0,null));
 	}
 	}
-	
-	
+
+
 	/**
 	/**
 	 * 催款统计列表
 	 * 催款统计列表
 	 * @param newStatus 0旧催款 1新催款
 	 * @param newStatus 0旧催款 1新催款
@@ -290,7 +290,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 催款统计列表
 	 * 催款统计列表
 	 */
 	 */
@@ -420,11 +420,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.orderRefundList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
 		res.data(orderNewService.orderRefundList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
 		return res;
 		return res;
 	}
 	}
-	
-	
-	
-	
-	
+
+
+
+
+
 	/**
 	/**
 	 * 订单结单
 	 * 订单结单
 	 */
 	 */
@@ -465,7 +465,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		orderNewService.updateFinance( orderNo, newFinance);
 		orderNewService.updateFinance( orderNo, newFinance);
 		return res;
 		return res;
 	}
 	}
-	
+
 	/**
 	/**
 	 * 查看订单日志
 	 * 查看订单日志
 	 */
 	 */
@@ -479,7 +479,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.data(orderNewService.selectOrderLog(orderNo));
 		res.data(orderNewService.selectOrderLog(orderNo));
 		return res;
 		return res;
 	}
 	}
-	
+
 	/** 退单文件上传 **/
 	/** 退单文件上传 **/
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
 	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
 	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
@@ -503,14 +503,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		}
 		return res;
 		return res;
 	}
 	}
-	
-	
 
 
-	
-	
+
+
+
+
 	/**
 	/**
-	 * 催款列表下载 
-	 * @throws IOException 
+	 * 催款列表下载
+	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
 	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
 	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
@@ -525,8 +525,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
  		return res;
  		return res;
 	}
 	}
 	/**
 	/**
-	 * 	项目列表下载 
-	 * @throws IOException 
+	 * 	项目列表下载
+	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
 	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
 	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
@@ -537,7 +537,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 
 
 
 	/**
 	/**
-	 * 	催款信息下载 
+	 * 	催款信息下载
 	 * @throws IOException
 	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportArrearsDunListData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportArrearsDunListData", method = RequestMethod.GET)

+ 11 - 7
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -9,6 +9,7 @@ import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 
 
+import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.model.*;
 import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
@@ -70,7 +71,7 @@ public interface OrderNewService {
 	 */
 	 */
 	Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially ,
 	Pagination<TOrderNewBo> orderNewList(String aid,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 approval,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-										 String contractStart, String contractEnd,String uid, Integer pageNo, Integer pageSize);
+										 String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus, Integer pageNo, Integer pageSize);
 	/**
 	/**
 	 * 订单审核
 	 * 订单审核
 	 * @param orderNo
 	 * @param orderNo
@@ -151,12 +152,6 @@ public interface OrderNewService {
 
 
 	int updatetechnicianBackOrder(String orderNo, String reason);
 	int updatetechnicianBackOrder(String orderNo, String reason);
 
 
-	List<OrderDunTaskBo> selectAllOrderDun();
-
-	void updateOrderDun(TOrderDun tDun);
-
-	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;
-
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 
 
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
 	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
@@ -203,4 +198,13 @@ public interface OrderNewService {
 	 */
 	 */
 	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
 	TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o);
 
 
+
+	/**
+	 *  发送邮件
+	 * @param type 消息类型
+	 * @param a  发送人信息
+	 * @param b 订单信息
+	 * @param projectType 项目类型 判断是否是会员
+	 */
+	void addNotic(Integer type, AdminListBo a, TOrderNewBo b);
 }
 }

+ 10 - 17
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.common.model.*;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -27,23 +28,6 @@ import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.NewOrderChangeMapper;
-import com.goafanti.common.dao.NewOrderDunMapper;
-import com.goafanti.common.dao.NewOrderRefundMapper;
-import com.goafanti.common.dao.OrderChangeLogMapper;
-import com.goafanti.common.dao.OrderExamineMapper;
-import com.goafanti.common.dao.OrderRefundInvoiceMapper;
-import com.goafanti.common.dao.OrganizationManagementMapper;
-import com.goafanti.common.dao.TChangeDunMapper;
-import com.goafanti.common.dao.TChangeTaskMapper;
-import com.goafanti.common.dao.TOrderBillNewMapper;
-import com.goafanti.common.dao.TOrderInvoiceMapper;
-import com.goafanti.common.dao.TOrderLogMapper;
-import com.goafanti.common.dao.TOrderNewMapper;
-import com.goafanti.common.dao.TOrderTaskMapper;
-import com.goafanti.common.dao.TTaskMidMapper;
-import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.DateUtils;
@@ -123,6 +107,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	private UserLockReleaseMapper	userLockReleaseMapper;
 	private UserLockReleaseMapper	userLockReleaseMapper;
 	@Autowired
 	@Autowired
 	private PushOrderService pushOrderService;
 	private PushOrderService pushOrderService;
+	@Autowired
+	private TOrderMidMapper tOrderMidMapper;
 
 
 	Logger							logger	= LoggerFactory.getLogger(OrderChangeServiceImpl.class);
 	Logger							logger	= LoggerFactory.getLogger(OrderChangeServiceImpl.class);
 
 
@@ -476,6 +462,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		orderNew.setOrderNo(nb.getOrderNo());
 		orderNew.setOrderNo(nb.getOrderNo());
 		orderNew.setDeleteSign(0);
 		orderNew.setDeleteSign(0);
 		orderNew.setPrimaryOrder(newOrderNo);
 		orderNew.setPrimaryOrder(newOrderNo);
+		int i =tOrderMidMapper.judgeProjectType(nb.getOrderNo());
+		if (i>0){
+			TOrderMid tm=new TOrderMid();
+			tm.setOrderNo(nb.getOrderNo());
+			tm.setProjectType(1);
+			tOrderMidMapper.updateByOrderNo(tm);
+		}
 		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 		tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 	}
 	}
 
 

+ 21 - 35
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.common.model.*;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
+import com.goafanti.order.enums.*;
 import com.goafanti.organization.bo.*;
 import com.goafanti.organization.bo.*;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 import groovy.transform.Synchronized;
 import groovy.transform.Synchronized;
@@ -57,16 +58,6 @@ import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.LockingReleaseBo;
-import com.goafanti.order.enums.ActiveState;
-import com.goafanti.order.enums.ApprovalNewState;
-import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.NewOrderDunType;
-import com.goafanti.order.enums.NewProjectStatus;
-import com.goafanti.order.enums.OrderDunSubject;
-import com.goafanti.order.enums.OrderNewState;
-import com.goafanti.order.enums.ProcessStatus;
-import com.goafanti.order.enums.TaskState;
-import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.patent.service.PatentNewService;
 import com.goafanti.patent.service.PatentNewService;
@@ -137,6 +128,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private PushOrderService pushOrderService;
 	private PushOrderService pushOrderService;
 	@Autowired
 	@Autowired
 	private BusinessProjectMapper businessProjectMapper;
 	private BusinessProjectMapper businessProjectMapper;
+	@Autowired
+	private BusinessCategoryMapper businessCategoryMapper;
 
 
 	Logger							logger	= LoggerFactory.getLogger(OrderNewServiceImpl.class);
 	Logger							logger	= LoggerFactory.getLogger(OrderNewServiceImpl.class);
 
 
@@ -194,6 +187,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (b.getType()==5){
 		if (b.getType()==5){
 			int i=tOrderTaskMapper.getHighNewRetrial(order.getOrderNo());
 			int i=tOrderTaskMapper.getHighNewRetrial(order.getOrderNo());
 			if (i>0) highNewRetrial =1;
 			if (i>0) highNewRetrial =1;
+			BusinessCategory bc =businessCategoryMapper.selectByPrimaryKey(b.getCid());
+			if (bc !=null && bc.getSort().equals(6)){
+				TOrderMid tom=new TOrderMid();
+				tom.setOrderNo(t.getOrderNo());
+				tom.setProjectType(1);
+				tOrderMidMapper.updateByOrderNo(tom);
+			}
 		}
 		}
 		tm.setHighNewRetrial(highNewRetrial);
 		tm.setHighNewRetrial(highNewRetrial);
 		tTaskMidMapper.insertSelective(tm);
 		tTaskMidMapper.insertSelective(tm);
@@ -388,6 +388,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
 		User u=userMapper.selectByPrimaryKey(t.getBuyerId());
 		User u=userMapper.selectByPrimaryKey(t.getBuyerId());
+
 		if (tm==null) tm=new TOrderMid();
 		if (tm==null) tm=new TOrderMid();
 			tm.setOrderNo(t.getOrderNo());
 			tm.setOrderNo(t.getOrderNo());
 		if (u!=null&&u.getNickname()!=null) {
 		if (u!=null&&u.getNickname()!=null) {
@@ -401,6 +402,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tm.setSalesmanId(a.getId());
 			tm.setSalesmanId(a.getId());
 			tm.setSalesmanName(a.getName());
 			tm.setSalesmanName(a.getName());
 		}
 		}
+		//判断订单是否为会员订单
+		int i =tOrderMidMapper.judgeProjectType(t.getOrderNo());
+		if (i>0){
+			tm.setProjectType(1);
+		}
 		tm.setDepName(tOrderMidMapper.selectDepNameByDepid(t.getOrderDep()));
 		tm.setDepName(tOrderMidMapper.selectDepNameByDepid(t.getOrderDep()));
 		if (tm.getId()!=null) {
 		if (tm.getId()!=null) {
 			tOrderMidMapper.updateByPrimaryKeySelective(tm);
 			tOrderMidMapper.updateByPrimaryKeySelective(tm);
@@ -535,7 +541,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	@Override
 	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
 	public Pagination<TOrderNewBo> orderNewList(String aid,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 distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
-												String contractStart, String contractEnd,String uid,  Integer pageNo, Integer pageSize) {
+												String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus,  Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -569,6 +575,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
 		if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
 		if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
 		if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
+		if(null != projectType)params.put("projectType",projectType);
+		if(null != processStatus)params.put("processStatus",processStatus);
 		params.put("outsource", outsource);
 		params.put("outsource", outsource);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		return p;
 		return p;
@@ -1137,34 +1145,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return t;
 		return t;
 	}
 	}
 
 
-	@Override
-	public List<OrderDunTaskBo> selectAllOrderDun() {
-		return tOrderDunMapper.getTaskAllOrderDun();
-	}
 
 
-	@Override
-	public void updateOrderDun(TOrderDun tDun) {
-		 tOrderDunMapper.updateByPrimaryKeySelective(tDun);
-	}
 
 
 	@Override
 	@Override
-	public void addNoticAndSendEmail(String orderNo,OrderDunTaskBo t,Integer type)
-			throws UnsupportedEncodingException, MessagingException {
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(type==NoticeStatus.ORDER_DUN.getCode()?t.getOrderNo():orderNo);
-		 String id="1";
-		if (type==NoticeStatus.ORDER_DUN.getCode())  id=b.getSalesmanId();
-		if (type==NoticeStatus.ORDER_BACK.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
-		if (type==NoticeStatus.ORDER_APPROVA_NO.getCode())  id=TokenManager.getAdminId()==null?"1":TokenManager.getAdminId();
-		AdminListBo a = adminMapper.getDeptNameByAid(id);
-		 sendEmail( t==null?null:t.getId(), a, b);
-
-		 addNotic(type,a, b);
-	}
-
-	public void addNotic(Integer type,AdminListBo a,TOrderNewBo b) {
+	public void addNotic(Integer type, AdminListBo a, TOrderNewBo b) {
 		StringBuffer sb=new StringBuffer();
 		StringBuffer sb=new StringBuffer();
-		sb=sb.append("客户名称[").append(b.getUserName()).append("], 合同编号[").append(b.getContractNo())
-				.append("] 订单编号[").append(b.getOrderNo()).append("] 操作人: ").append(a.getDepartmentName()).append("-").append(a.getName()).append("。");
+		sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 		Notice n =new Notice();
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setId(UUID.randomUUID().toString());
 		n.setAid(b.getSalesmanId());
 		n.setAid(b.getSalesmanId());

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

@@ -642,14 +642,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
-		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+pnb.getOrderNo()+", 操作人:平台超管中心-管理员。";
-		Notice n =new Notice();
-		n.setId(UUID.randomUUID().toString());
-		n.setAid(pnb.getSalesmanId());
-		n.setNoticeType(type);
-		n.setContent(str);
-		n.setReaded(0);//未读
-		asyncUtils.addNotice(n);
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
+		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		orderNewService.addNotic(type,a,b);
 		pn.setDunStatus(1);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称
 		//营销员名称、邮箱、订单编号、客户名称

+ 10 - 8
src/main/resources/props/config_local.properties

@@ -1,11 +1,12 @@
 dev.name=local
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft20220225?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20220225?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
 #jdbc.username=root
-#jdbc.password=aftdev
+#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
 jdbc.validationQuery=SELECT 'x'
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.initialSize=3
 jdbc.maxActive=20
 jdbc.maxActive=20
@@ -49,10 +50,11 @@ avatar.upload.host=//sb.jishutao.com/upload
 #static.host=//172.16.0.53/1.2.02
 #static.host=//172.16.0.53/1.2.02
 #avatar.host=//172.16.0.253
 #avatar.host=//172.16.0.253
 
 
-avatar.host=//static.jishutao.com
+#avatar.host=//static.jishutao.com
 static.host=//static.jishutao.com/1.2.04
 static.host=//static.jishutao.com/1.2.04
-#avatar.host=//172.16.0.255
-#static.host=//172.16.0.255/1.2.04
+avatar.host=//172.16.0.255:3000
+#static.host=//172.16.0.255:3000/1.2.04
+#static.host=http://172.16.1.187/prod/1.2.04
 
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7
 wx.appSecret=081744369d42405be58fe37f892631f7

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

@@ -43,7 +43,7 @@ user_remind_days=15
 #提前提醒天数
 #提前提醒天数
 user_channel_days=90
 user_channel_days=90
 
 
-static.host=//static.jishutao.com/1.2.04
+static.host=//static.jishutao.com/1.2.05
 portal.host=//static.jishutao.com/portal/2.0.6
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload
 avatar.upload.host=//static.jishutao.com/upload
@@ -71,4 +71,4 @@ easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE
 
 
 jiguang.appKey=dbcea43366e038073452a04e
 jiguang.appKey=dbcea43366e038073452a04e
 jiguang.masterSecret=59792298288e4f635c737def
 jiguang.masterSecret=59792298288e4f635c737def
-jiguang.pushUrl=https://api.jpush.cn/v3/push
+jiguang.pushUrl=https://api.jpush.cn/v3/push