Browse Source

技术员奖金中任务负责人bug修复 退款邮件通知发送给技术员 订单任务没有分配给技术员不能收全款限制

limin 7 years ago
parent
commit
befeba2bd3

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

@@ -357,7 +357,7 @@
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
   		from t_order_bonus b
   		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and t.main=1
+  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		left join admin ga on ga.id = b.grant_by 
@@ -396,7 +396,7 @@
   select count(*)
   from t_order_bonus b
   		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and t.main=1
+  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		where b.grant_type = 1
@@ -536,7 +536,7 @@
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
   		from t_order_bonus b
   		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and t.main=1
+  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		left join admin ga on ga.id = b.grant_by 

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

@@ -28,6 +28,8 @@
     <result column="review_time" jdbcType="DATE" property="reviewTime" />
     <result column="publicity_time" jdbcType="DATE" property="publicityTime" />
     <result column="licence_time" jdbcType="DATE" property="licenceTime" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
@@ -870,7 +872,8 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   </select>
   	<!-- 根据订单编号获得所有的任务负责人 -->
   	<select id="getReceiverByOid" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	select distinct task_receiver from t_order_task 
-	where order_no = #{orderNo,jdbcType=VARCHAR}
+  	select distinct task_receiver, a.name, a.email from t_order_task t
+	inner join admin a on t.task_receiver = a.id
+	where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0
   	</select>
 </mapper>

+ 19 - 2
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -192,10 +192,11 @@ public class TOrderTask {
      * @mbg.generated Mon Nov 19 11:03:38 CST 2018
      */
     private String attachmentUrl;
-    
-    
+    private String name;
+    private String email;
     
     private Integer main;
+    
 
     /**
      * This method was generated by MyBatis Generator.
@@ -708,4 +709,20 @@ public class TOrderTask {
 	public void setMain(Integer main) {
 		this.main = main;
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
 }

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

@@ -143,6 +143,10 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew);
 		if(i>0){
 			res.setData("新增收款记录成功!");
+		}else if(i == -3){
+			res.getError().add(buildError("", "该订单的任务还没有分配给咨询师不能收完全款!"));
+		}else if(i == -2){
+			res.getError().add(buildError("", "订单编号错误!"));
 		}else{
 			res.getError().add(buildError("", "本次收款金额大于应收金额!"));
 		}

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

@@ -19,7 +19,7 @@ public enum OrderNewState {
 	/** 退单中 **/
 	TDZ(6, "退单中"),
 	/** 已退单 **/
-	YTD(6, "已退单");
+	YTD(7, "已退单");
 	
 	private OrderNewState(Integer code, String desc) {
 		this.code = code;

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


+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -145,8 +145,10 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			}
 			for (int i = 0; i < dlist.size(); i++) {
 				TOrderBonusBo ob = dlist.get(i);
-				bonusBo.setDepartmentId(ob.getDepartmentId());
-				map.put(ob.getDepartmentName(), bonusMapper.getBonusData(bonusBo));
+				if(null != ob && null!= ob.getDepartmentId()){
+					bonusBo.setDepartmentId(ob.getDepartmentId());
+					map.put(ob.getDepartmentName(), bonusMapper.getBonusData(bonusBo));
+				}
 			}
 		}else{
 			map.put(bonusBo.getDepartmentName(), bonusMapper.getBonusData(bonusBo));