Browse Source

客户业务转交BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
39e68fea1b

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -398,7 +398,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		String aid=TokenManager.getAdminId();
 		int i=userLockReleaseMapper.updatePrivateBusinessTransfer( inputId,  uid,  pid,aid);
 		if (i>0) {
-			List<BusinessListBo> l=userBusinessMapper.selectBusinessProjectByUAPid(uid, aid, pid);
+			List<BusinessListBo> l=userBusinessMapper.selectBusinessProjectByUAPid(uid, inputId, pid);
 			if (!l.isEmpty()) {
 				UserBusiness ub=new UserBusiness();
 				ub.setId(UUID.randomUUID().toString());

+ 16 - 0
src/main/java/com/goafanti/common/mapper/UserBusinessMapper.xml

@@ -467,4 +467,20 @@
 	set aid= #{transferId,jdbcType=VARCHAR}
 	where aid= #{aid,jdbcType=VARCHAR}
   </update>
+  <select id="selectBusinessProjectByUAPid" resultType="com.goafanti.customer.bo.BusinessListBo">
+  select 
+		a.id as businessId,
+		a.uid,
+		a.business_project_id as businessProjectId,
+		a.follow_situation as followSituation,
+		a.customer_status as customerStatus,
+		a.remarks,
+		b.bname as businessProjectName,
+		c.cname as businessvarietiesName
+	from user_business a
+	left join business_project b on a.business_project_id = b.id
+	left join business_category c on b.cid = c.id
+	where  a.uid = #{uid,jdbcType=VARCHAR} and a.aid = #{aid,jdbcType=VARCHAR} 
+	and a.business_project_id= #{pid} and  a.customer_status != 6
+  </select>
 </mapper>

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

@@ -1133,7 +1133,7 @@
   
   <select id="selectBusinessCount" parameterType="com.goafanti.customer.bo.BusinessListBo" resultType="java.lang.Integer">
   	select
-  		count(0)
+  		count(*)
   	from
 		user_business a inner join user b on
 		a.uid = b.id left join business_project c on

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -154,6 +154,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//获取总金额
 			TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
 			//订单匹配不到
+			
 			if(t==null||t.getOrderNo()==null) {
 				tr.setStatus(ReceivablesStatus.DCYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);