Browse Source

催款截点编辑BUG修改

anderx 7 years ago
parent
commit
56db2f3326

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

@@ -105,4 +105,6 @@ public interface TOrderDunMapper {
 	List<TOrderNewBo> getOrderDunData(@Param("name")String name,@Param("orderNo") String orderNo, @Param("starTime")String starTime, @Param("endTime")String endTime);
 
 	List<OrderDunTaskBo> getTaskAllOrderDun();
+
+	int checkOrderDun(@Param("dunSubject")Integer dunSubject, @Param("orderNo")String orderNo);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderDunMapper.xml

@@ -367,6 +367,7 @@
   </update>
   <select id="selectByOrderNoDunSubject" resultType="com.goafanti.common.model.TOrderDun">
   	select id,dun_subject as dunSubject,money,order_no as orderNo from t_order_dun where order_no= #{orderNo,jdbcType=VARCHAR}
+  	order by dun_subject 
   </select>
   <select id="getOrderDunData" resultType="com.goafanti.order.bo.TOrderNewBo">
   select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
@@ -396,4 +397,9 @@
  	left join t_order_new b on a.order_no=b.order_no
  	where a.dun_status=0 and b.delete_sign=0
     </select>
+    <select id="checkOrderDun" resultType="java.lang.Integer">
+    select count(*) from t_order_dun
+    where order_no=  #{orderNo,jdbcType=VARCHAR}
+    and dun_subject= #{dunSubject,jdbcType=VARCHAR}
+    </select>
 </mapper>

+ 93 - 103
src/main/java/com/goafanti/common/model/TOrderBonus.java

@@ -6,94 +6,94 @@ public class TOrderBonus {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.id
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.create_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.order_no
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.bonus_subject
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private Integer bonusSubject;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_status
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private Integer grantStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_target
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private String grantTarget;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_by
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private String grantBy;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private Date grantTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bonus.grant_type
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	private Integer grantType;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.id
 	 * @return  the value of t_order_bonus.id
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public String getId() {
 		return id;
@@ -102,11 +102,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.id
 	 * @param id  the value for t_order_bonus.id
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -115,11 +115,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.create_time
 	 * @return  the value of t_order_bonus.create_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -128,11 +128,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.create_time
 	 * @param createTime  the value for t_order_bonus.create_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -141,11 +141,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.order_no
 	 * @return  the value of t_order_bonus.order_no
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -154,11 +154,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.order_no
 	 * @param orderNo  the value for t_order_bonus.order_no
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -167,11 +167,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.bonus_subject
 	 * @return  the value of t_order_bonus.bonus_subject
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public Integer getBonusSubject() {
 		return bonusSubject;
@@ -180,11 +180,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.bonus_subject
 	 * @param bonusSubject  the value for t_order_bonus.bonus_subject
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setBonusSubject(Integer bonusSubject) {
 		this.bonusSubject = bonusSubject;
@@ -193,11 +193,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_status
 	 * @return  the value of t_order_bonus.grant_status
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public Integer getGrantStatus() {
 		return grantStatus;
@@ -206,11 +206,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_status
 	 * @param grantStatus  the value for t_order_bonus.grant_status
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setGrantStatus(Integer grantStatus) {
 		this.grantStatus = grantStatus;
@@ -219,11 +219,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_target
 	 * @return  the value of t_order_bonus.grant_target
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public String getGrantTarget() {
 		return grantTarget;
@@ -232,11 +232,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_target
 	 * @param grantTarget  the value for t_order_bonus.grant_target
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setGrantTarget(String grantTarget) {
 		this.grantTarget = grantTarget;
@@ -245,11 +245,7 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_by
 	 * @return  the value of t_order_bonus.grant_by
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	public String getGrantBy() {
 		return grantBy;
@@ -258,11 +254,7 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_by
 	 * @param grantBy  the value for t_order_bonus.grant_by
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
 	 */
 	public void setGrantBy(String grantBy) {
 		this.grantBy = grantBy;
@@ -271,11 +263,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_time
 	 * @return  the value of t_order_bonus.grant_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public Date getGrantTime() {
 		return grantTime;
@@ -284,11 +276,11 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_time
 	 * @param grantTime  the value for t_order_bonus.grant_time
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
-=======
+
+	 
+
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setGrantTime(Date grantTime) {
 		this.grantTime = grantTime;
@@ -297,8 +289,6 @@ public class TOrderBonus {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_bonus.grant_type
 	 * @return  the value of t_order_bonus.grant_type
-<<<<<<< HEAD
-	 * @mbggenerated  Tue Nov 27 10:35:55 CST 2018
 	 */
 	public Integer getGrantType() {
 		return grantType;
@@ -309,7 +299,7 @@ public class TOrderBonus {
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_bonus.grant_type
 	 * @param grantType  the value for t_order_bonus.grant_type
 	 * @mbg.generated  Tue Nov 27 11:15:28 CST 2018
->>>>>>> branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
+
 	 */
 	public void setGrantType(Integer grantType) {
 		this.grantType = grantType;

+ 14 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -232,26 +232,37 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (l!=null&&!l.isEmpty()) {
 			for (TOrderDun t : l) {
 				if (t.getId()==null||t.getId().equals("")) {//Id为空新增
+					if (tOrderDunMapper.checkOrderDun(t.getDunSubject(),orderNo)>0) {
+						throw new BusinessException(new Error( "该截点已经存在","该截点已经存在"));
+					}
 					t.setId(UUID.randomUUID().toString());
 					t.setDunBy(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-					t.setDunStatus(0);//催款中
+					t.setDunStatus(0);//未启动
 					tOrderDunMapper.insertSelective(t);
 				}else {
 					tOrderDunMapper.updateByPrimaryKeySelective(t);
 				}
 				
 			}
-			boolean flag=true;
-			for (TOrderDun t2 : l2) {
+		}
+		boolean flag=true;
+		for (TOrderDun t2 : l2) {
+			if (l.isEmpty()) {
+				tOrderDunMapper.deleteByPrimaryKey(t2.getId());
+			}else {
 				for (TOrderDun t : l) {
 					if (t2.getId().equals(t.getId())) {//查询集合与返回集合比较查出删除项
 						flag=false;
+						System.out.println(t2.getId()+"----"+t.getId());
 					}
 				}
+				System.out.println(flag+"----"+t2.getMoney());
 				if (t2.getId()!=null&&flag) {
 					tOrderDunMapper.deleteByPrimaryKey(t2.getId());
 				}
+				flag=true;
 			}
+			
 		}
 		return 1;
 	}