wanghui лет назад: 8
Родитель
Сommit
37a84101c5
20 измененных файлов с 146 добавлено и 19 удалено
  1. 2 2
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  2. 2 2
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 2 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  4. 3 1
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  5. 2 0
      src/main/java/com/goafanti/common/dao/CustomerLogMapper.java
  6. 7 0
      src/main/java/com/goafanti/common/dao/CustomerMapper.java
  7. 7 0
      src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java
  8. 7 1
      src/main/java/com/goafanti/common/enums/CustomerIntentionFiled.java
  9. 24 0
      src/main/java/com/goafanti/common/mapper/CustomerMapper.xml
  10. 4 1
      src/main/java/com/goafanti/common/mapper/CustomerOrganizationInfoMapper.xml
  11. 12 0
      src/main/java/com/goafanti/customer/bo/CustomerOut.java
  12. 18 0
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  13. 5 0
      src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java
  14. 6 0
      src/main/java/com/goafanti/customer/service/CustomerService.java
  15. 4 0
      src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java
  16. 27 6
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  17. 1 1
      src/main/java/com/goafanti/demand/service/DemandService.java
  18. 1 1
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  19. 9 3
      src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java
  20. 3 1
      src/main/resources/props/error.properties

+ 2 - 2
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -79,8 +79,8 @@ public interface AchievementService {
 	
 	
 	/** 查询精品成果  **/
 	/** 查询精品成果  **/
 	public List<AchievementListBo> getAchievement(Integer boutique);
 	public List<AchievementListBo> getAchievement(Integer boutique);
-	 
-    /** 查询猜你喜欢  **/
+	 
+    /** 查询猜你喜欢  **/
     public List<AchievementListBo>  getPerhapLike();
     public List<AchievementListBo>  getPerhapLike();
     
     
     /**查询智者的科技成果**/
     /**查询智者的科技成果**/

+ 2 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -608,7 +608,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.updateByPrimaryKey(a);
 		return achievementMapper.updateByPrimaryKey(a);
 	}
 	}
 
 
-
+
 	@Override
 	@Override
 	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
 	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
 	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
 	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
@@ -658,5 +658,5 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	}
 	}
 
 
 	
 	
-	
+	
 }
 }

+ 2 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -73,5 +73,7 @@ public class AFTConstants {
 	
 	
 	public static final String CUSTOMER_TO_PUBLIC					= "转为公共客户";
 	public static final String CUSTOMER_TO_PUBLIC					= "转为公共客户";
 	
 	
+	public static final String CUSTOMER_FOLLOW						= "客户跟进";
+	
 	public static final String CUSTOMER_VIEW_ALL					= "customer_view_all";
 	public static final String CUSTOMER_VIEW_ALL					= "customer_view_all";
 }
 }

+ 3 - 1
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -104,5 +104,7 @@ public class ErrorConstants {
 
 
 	public static final String	M_CODE_ERROR						= "M_CODE_ERROR";
 	public static final String	M_CODE_ERROR						= "M_CODE_ERROR";
 	
 	
-	public static final String MARKET_BOOTH_MAX						= "MARKET_BOOTH_MAX";				
+	public static final String MARKET_BOOTH_MAX						= "MARKET_BOOTH_MAX";	
+	
+	public static final String CUSTOMER_ALREADY_EXIST				= "CUSTOMER_ALREADY_EXIST";
 }
 }

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

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 
 import com.goafanti.common.model.CustomerLog;
 import com.goafanti.common.model.CustomerLog;
 import com.goafanti.common.model.CustomerLogExample;
 import com.goafanti.common.model.CustomerLogExample;
+import com.goafanti.customer.bo.CustomerOut;
+
 import java.util.List;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 

+ 7 - 0
src/main/java/com/goafanti/common/dao/CustomerMapper.java

@@ -88,4 +88,11 @@ public interface CustomerMapper {
      */
      */
     List<Customer> selectByLadderId(@Param("ladderId")String ladderId);
     List<Customer> selectByLadderId(@Param("ladderId")String ladderId);
     
     
+    /**
+     * 客户详情-历史记录
+     * @param customerId
+     * @return
+     */
+    CustomerOut findCustomerHistory(@Param("id")String customerId);
+    
 }
 }

+ 7 - 0
src/main/java/com/goafanti/common/dao/CustomerOrganizationInfoMapper.java

@@ -80,4 +80,11 @@ public interface CustomerOrganizationInfoMapper {
 	 * 修改
 	 * 修改
 	 */
 	 */
 	int updateCustomerOrganizationByCid(CustomerOrganizationInfo coi);
 	int updateCustomerOrganizationByCid(CustomerOrganizationInfo coi);
+	
+	/**
+	 *  查询公司是否存在
+	 * @param companyName
+	 * @return
+	 */
+	int findCustomerOrganizationByName(String companyName);
 }
 }

+ 7 - 1
src/main/java/com/goafanti/common/enums/CustomerIntentionFiled.java

@@ -22,8 +22,14 @@ public enum CustomerIntentionFiled {
 	INTENTION_DEMAND(7,"技术需求"),
 	INTENTION_DEMAND(7,"技术需求"),
 	/** 专家咨询  **/
 	/** 专家咨询  **/
 	INTENTION_CONSULTATION(8,"专家咨询"),
 	INTENTION_CONSULTATION(8,"专家咨询"),
+	/** 团单合作  **/
+	INTENTION_TEAM_COOPERATION(9,"团单合作"),
+	/** 商标 **/
+	INTENTION_BRAND(10,"商标"),
+	/** 系统集成  **/
+	INTENTION_INTEGRATION(11,"系统集成"),
 	/** 未知  **/
 	/** 未知  **/
-	OTHER(-1,"未知");
+	OTHER(null,"未知");
 	
 	
 	private static Map<Integer, CustomerIntentionFiled> status = new HashMap<Integer, CustomerIntentionFiled>();
 	private static Map<Integer, CustomerIntentionFiled> status = new HashMap<Integer, CustomerIntentionFiled>();
 
 

+ 24 - 0
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -529,4 +529,28 @@
     from customer
     from customer
     where aid = #{ladderId} or paid like concat('%',#{ladderId},'%')
     where aid = #{ladderId} or paid like concat('%',#{ladderId},'%')
   </select>
   </select>
+  
+  <select id="findCustomerHistory" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerOut">
+  	select 
+		a.id as cid,a.aid, a.create_time as createTime,
+		a.follow_situation as followSituation,a.customer_status as customerStatus,
+		b.company_name as customerName,
+		c.followCount,
+		d.follow_date as followDate,
+		e.name as contactName,
+		f.operatorTime,
+		g.name as adminName
+	from  customer  a 
+	left join customer_organization_info b on a.id = b.cid 
+	left join (select ifnull(0,count(0)) as followCount,r.aid,r.cid from follow_up_record r group by r.aid,r.cid) c 
+		on a.id = c.cid and a.aid = c.aid
+	left join follow_up_record d on a.follow_id = d.id
+	left join customer_user_info e on d.cuid = e.id
+	left join (select l1.cid,l1.operator_time as operatorTime from customer_log l1 ,
+		(select cid, max(operator_time) as operator_time from customer_log  group by cid ) l2 
+		where l1.cid = l2.cid and l1.operator_time = l2.operator_time)f 
+		on a.id = f.cid
+	left join admin g on a.aid = g.id 
+	where a.id = #{id,jdbcType=VARCHAR}
+  </select>
 </mapper>
 </mapper>

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

@@ -348,7 +348,7 @@
       remarks = #{remarks,jdbcType=VARCHAR}
       remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
-  <update id="updateCustomerOrganizationByCid">
+  <update id="updateCustomerOrganizationByCid" parameterType="com.goafanti.common.model.CustomerOrganizationInfo">
   	 update customer_organization_info
   	 update customer_organization_info
   	 <set>
   	 <set>
       <if test="companyName != null">
       <if test="companyName != null">
@@ -375,4 +375,7 @@
      </set>  
      </set>  
     where cid = #{cid,jdbcType=VARCHAR}
     where cid = #{cid,jdbcType=VARCHAR}
   </update>
   </update>
+  <select id="findCustomerOrganizationByName" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select count(0) from customer_organization_info  company_name = #{companyName,jdbcType=VARCHAR}
+  </select>
 </mapper>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/customer/bo/CustomerOut.java

@@ -133,12 +133,16 @@ public class CustomerOut {
 	
 	
 	/** 操作前跟进进度 **/
 	/** 操作前跟进进度 **/
 	private String beforeFollowSituation;
 	private String beforeFollowSituation;
+	
 	/** 跟单人 **/
 	/** 跟单人 **/
 	private String beforeAdminName;
 	private String beforeAdminName;
 	
 	
 	/** 公司标签 **/
 	/** 公司标签 **/
 	private String tag;
 	private String tag;
 	
 	
+	/** 操作时间 **/
+	private String operatorTime;
+	
 	public Integer getCustomerType() {
 	public Integer getCustomerType() {
 		return customerType;
 		return customerType;
 	}
 	}
@@ -443,6 +447,14 @@ public class CustomerOut {
 		this.tag = tag;
 		this.tag = tag;
 	}
 	}
 
 
+	public String getOperatorTime() {
+		return operatorTime;
+	}
+
+	public void setOperatorTime(String operatorTime) {
+		this.operatorTime = operatorTime;
+	}
+
 	@Override
 	@Override
 	public String toString() {
 	public String toString() {
 		return "CustomerOut [customerType=" + customerType + ", _customerType=" + _customerType + ", id=" + id
 		return "CustomerOut [customerType=" + customerType + ", _customerType=" + _customerType + ", id=" + id

+ 18 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -28,6 +28,7 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.Customer;
 import com.goafanti.common.model.CustomerOrganizationInfo;
 import com.goafanti.common.model.CustomerOrganizationInfo;
@@ -62,6 +63,11 @@ public class AdminCustomerApiController extends BaseApiController {
 	@RequestMapping(value = "/addCustomer", method = RequestMethod.POST)
 	@RequestMapping(value = "/addCustomer", method = RequestMethod.POST)
 	public Result addCustomer(CustomerIn cusIn,CustomerOrganizationInfo coi,CustomerUserInfo cui,FollowUpRecord fur) throws ParseException, IllegalAccessException, InvocationTargetException {
 	public Result addCustomer(CustomerIn cusIn,CustomerOrganizationInfo coi,CustomerUserInfo cui,FollowUpRecord fur) throws ParseException, IllegalAccessException, InvocationTargetException {
 		Result res=new Result();
 		Result res=new Result();
+		//查询客户是否已经存在
+		if(customerOrganizationService.findCustomerOrganizationByName(cusIn.getCompanyName())>0){
+			res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST));
+			return res;
+		}
 		//添加 customer
 		//添加 customer
 		String customerId = UUID.randomUUID().toString();//客户记录ID
 		String customerId = UUID.randomUUID().toString();//客户记录ID
 		String  customerUsrId= UUID.randomUUID().toString();//客户联系人ID
 		String  customerUsrId= UUID.randomUUID().toString();//客户联系人ID
@@ -309,6 +315,7 @@ public class AdminCustomerApiController extends BaseApiController {
 			e.printStackTrace();
 			e.printStackTrace();
 		}	
 		}	
 		customerService.updateCustomer(cus);
 		customerService.updateCustomer(cus);
+		customerService.saveCustomerLog(cusIn, AFTConstants.CUSTOMER_FOLLOW,cusIn.getId());
 		return res;
 		return res;
 	}
 	}
 	
 	
@@ -483,4 +490,15 @@ public class AdminCustomerApiController extends BaseApiController {
 		res.setData(customerService.listCustomerLog(customerId));
 		res.setData(customerService.listCustomerLog(customerId));
 		return res;
 		return res;
 	}
 	}
+	
+	/**
+	 * 客户详情-操作记录
+	 * @return
+	 */
+	@RequestMapping(value = "/findCustomerHistory",method = RequestMethod.GET)
+	public Result findCustomerHistory(String customerId){
+		Result res = new Result();
+		res.setData(customerService.findCustomerHistory(customerId));
+		return res;
+	}
 }
 }

+ 5 - 0
src/main/java/com/goafanti/customer/service/CustomerOrganizationService.java

@@ -16,4 +16,9 @@ public interface CustomerOrganizationService {
 	 * @return
 	 * @return
 	 */
 	 */
 	int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi);
 	int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi);
+	
+	/**
+	 * 查看客户是否已经存在
+	 */
+	int findCustomerOrganizationByName(String companyName);
 }
 }

+ 6 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -94,4 +94,10 @@ public interface CustomerService {
 	 */
 	 */
 	public List<CustomerLog> listCustomerLog(String customerId);
 	public List<CustomerLog> listCustomerLog(String customerId);
 	
 	
+	/**
+	 *  客户详情-历史记录
+	 * @param customerId
+	 * @return
+	 */
+	public CustomerOut findCustomerHistory(String customerId);
 }
 }

+ 4 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerOrganizationServiceImp.java

@@ -26,6 +26,10 @@ public class CustomerOrganizationServiceImp extends BaseMybatisDao<CustomerOrgan
 	public int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi) {
 	public int updateCustomerOrganizationInfo(CustomerOrganizationInfo coi) {
 		return customerOrganizationInfoMapper.updateCustomerOrganizationByCid(coi);
 		return customerOrganizationInfoMapper.updateCustomerOrganizationByCid(coi);
 	}
 	}
+	@Override
+	public int findCustomerOrganizationByName(String companyName) {
+		return customerOrganizationInfoMapper.findCustomerOrganizationByName(companyName);
+	}
 
 
 
 
 }
 }

+ 27 - 6
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -160,6 +160,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		switch(co.getCustomerType()){
 		switch(co.getCustomerType()){
 			case 0 : co.set_customerType("个人客户") ;break;
 			case 0 : co.set_customerType("个人客户") ;break;
 			case 1 : co.set_customerType("公司客户") ;break;
 			case 1 : co.set_customerType("公司客户") ;break;
+			case 2 : co.set_customerType("团体单位") ;break;
 		}
 		}
 		switch(co.getCustomerStatus()){
 		switch(co.getCustomerStatus()){
 			case 0 : co.set_customerStatus("新客户") ;break;
 			case 0 : co.set_customerStatus("新客户") ;break;
@@ -195,6 +196,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 				if(s.equals("4")) _companyIntention += "知识产权贯标-";
 				if(s.equals("4")) _companyIntention += "知识产权贯标-";
 				if(s.equals("5")) _companyIntention += "高企认定-";
 				if(s.equals("5")) _companyIntention += "高企认定-";
 				if(s.equals("6")) _companyIntention += "技术成果-";
 				if(s.equals("6")) _companyIntention += "技术成果-";
+				if(s.equals("7")) _companyIntention += "技术需求-";
+				if(s.equals("8")) _companyIntention += "专家咨询-";
+				if(s.equals("9")) _companyIntention += "团单合作-";
+				if(s.equals("10")) _companyIntention += "商标-";
+				if(s.equals("10")) _companyIntention += "系统集成-";
 			}
 			}
 			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-1);
 			_companyIntention = _companyIntention.substring(0, _companyIntention.length()-1);
 		}		
 		}		
@@ -237,14 +243,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //跟进状态
 			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //跟进状态
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //跟进意向
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //跟进意向
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //客户状态
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //客户状态
-			log.setAfterAdminName(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName());
+			log.setAfterAdminName(TokenManager.getAdminToken().getName());
 			log.setOperatorType(AFTConstants.CUSTOMER_CREATE);
 			log.setOperatorType(AFTConstants.CUSTOMER_CREATE);
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_MODIFY)){ //修改用户
 		}else if(operatorType.equals(AFTConstants.CUSTOMER_MODIFY)){ //修改用户
 			log.setBeforeAdminName(cus.getBeforeAdminName());//修改前操作人
 			log.setBeforeAdminName(cus.getBeforeAdminName());//修改前操作人
 			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
-			log.setAfterFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc()); //修改后跟进状态
+			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //修改后跟进状态
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //修改后跟进意向
 			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //修改后跟进意向
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //修改后客户状态
 			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //修改后客户状态
 			log.setOperatorType(AFTConstants.CUSTOMER_MODIFY);
 			log.setOperatorType(AFTConstants.CUSTOMER_MODIFY);
@@ -268,12 +274,21 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //领取前跟进状态
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //领取前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//领取前跟进进度
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//领取前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_RECEIVE);
 			log.setOperatorType(AFTConstants.CUSTOMER_RECEIVE);
-		}else if(operatorType.equals(AFTConstants.CUSTOMER_TO_PUBLIC)){
+		}else if(operatorType.equals(AFTConstants.CUSTOMER_TO_PUBLIC)){ //转为公共客户
 			log.setBeforeAdminName(cus.getBeforeAdminName());//转为公共客户前跟进人
 			log.setBeforeAdminName(cus.getBeforeAdminName());//转为公共客户前跟进人
 			log.setBeforeCustomerIntention(getCompanyIntention(cus.getBeforeCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerIntention(getCompanyIntention(cus.getBeforeCompanyIntention())); //修改前跟进意向
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //修改前跟进状态
 			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getBeforeCustomerStatus())).getDesc()); //修改前跟进状态
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//修改前跟进进度
 			log.setBeforeFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getBeforeFollowSituation())).getDesc());//修改前跟进进度
 			log.setOperatorType(AFTConstants.CUSTOMER_TO_PUBLIC);
 			log.setOperatorType(AFTConstants.CUSTOMER_TO_PUBLIC);
+		}else if(operatorType.equals(AFTConstants.CUSTOMER_FOLLOW)){ //跟进客户
+			log.setAfterAdminName(TokenManager.getAdminToken().getName());//跟进前操作人
+			log.setBeforeCustomerIntention(getCompanyIntention(c.getCompanyIntention())); //修改前跟进意向
+			log.setBeforeCustomerStatus(CustomerStatusFiled.getField(c.getCustomerStatus()).getDesc()); //修改前跟进状态
+			log.setBeforeFollowSituation(CustomerFollowFiled.getField(c.getFollowSituation()).getDesc());//修改前跟进进度
+			log.setAfterAdminName(TokenManager.getAdminToken().getName());
+			log.setAfterFollowSituation(CustomerFollowFiled.getField(Integer.parseInt(cus.getFollowSituation())).getDesc()); //修改后跟进状态
+			log.setAfterCustomerIntention(getCompanyIntention(cus.getCompanyIntention())); //修改后跟进意向
+			log.setAfterCustomerStatus(CustomerStatusFiled.getField(Integer.parseInt(cus.getCustomerStatus())).getDesc()); //修改后客户状态
 		}
 		}
 		customerLogMapper.insert(log);
 		customerLogMapper.insert(log);
 	}
 	}
@@ -322,9 +337,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 	 */
 	 */
 	private List<CustomerOut> descResult(List<CustomerOut> outList){
 	private List<CustomerOut> descResult(List<CustomerOut> outList){
 		for(CustomerOut out : outList){
 		for(CustomerOut out : outList){
-			out.setAdminName("***");
-			out.set_followSituation("***");
-			out.set_companyIntention("***");
+			//out.setAdminName("***");
+			//out.set_followSituation("***");
+			//out.set_companyIntention("***");
 			out.setContactName("***");
 			out.setContactName("***");
 			out.setMobile("***");
 			out.setMobile("***");
 			out.setTelNum("***");
 			out.setTelNum("***");
@@ -337,4 +352,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		
 		
 		return customerLogMapper.listCustomerLog(customerId);
 		return customerLogMapper.listCustomerLog(customerId);
 	}
 	}
+
+	@Override
+	public CustomerOut findCustomerHistory(String customerId) {
+		
+		return customerMapper.findCustomerHistory(customerId);
+	}
 }
 }

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -84,4 +84,4 @@ public interface DemandService {
 	
 	
 	/**猜你喜欢**/
 	/**猜你喜欢**/
 	List<DemandListBo> selectCsutomerLike();
 	List<DemandListBo> selectCsutomerLike();
-}
+}

+ 1 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -757,4 +757,4 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectCsutomerLike(TokenManager.getUserId());
 		return demandMapper.selectCsutomerLike(TokenManager.getUserId());
 	}
 	}
 
 
-}
+}

+ 9 - 3
src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java

@@ -13,9 +13,10 @@ public class BoutiqueListBo {
 	private String industryCatalog;
 	private String industryCatalog;
 	private String pictureUrl;
 	private String pictureUrl;
 	private String technicalpictureurl;
 	private String technicalpictureurl;
+	private Integer boutiqueFlag;
 	/** 拥有者类别 0 - 个人, 1 - 组织 **/
 	/** 拥有者类别 0 - 个人, 1 - 组织 **/
 	private Integer ownerType;
 	private Integer ownerType;
-
+	
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
 	}
 	}
@@ -76,6 +77,11 @@ public class BoutiqueListBo {
 	public void setOwnerType(Integer ownerType) {
 	public void setOwnerType(Integer ownerType) {
 		this.ownerType = ownerType;
 		this.ownerType = ownerType;
 	}
 	}
-	
-	
+	public Integer getBoutiqueFlag() {
+		return boutiqueFlag;
+	}
+	public void setBoutiqueFlag(Integer boutiqueFlag) {
+		this.boutiqueFlag = boutiqueFlag;
+	}
+
 }
 }

+ 3 - 1
src/main/resources/props/error.properties

@@ -93,4 +93,6 @@ M_CODE_ERROR=\u624B\u673A\u9A8C\u8BC1\u7801\u83B7\u53D6\u5F02\u5E38\uFF0C\u8BF7\
 
 
 MOBILE_SAME_ERROR=\u65B0\u624B\u673A\u53F7\u5FC5\u987B\u548C\u539F\u624B\u673A\u53F7\u4E0D\u540C\uFF01
 MOBILE_SAME_ERROR=\u65B0\u624B\u673A\u53F7\u5FC5\u987B\u548C\u539F\u624B\u673A\u53F7\u4E0D\u540C\uFF01
 
 
-MARKET_BOOTH_MAX = \u8425\u9500\u6D3B\u52A8\u5C55\u4F4D\u5DF2\u6EE1{0}\u4E2A
+MARKET_BOOTH_MAX = \u8425\u9500\u6D3B\u52A8\u5C55\u4F4D\u5DF2\u6EE1{0}\u4E2A
+
+CUSTOMER_ALREADY_EXIST = \u5BA2\u6237\u5DF2\u5B58\u5728