feat:迁移

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/response/SendSmsResponse.java

+package com.gic.haoban.manage.api.response;
+
+import java.io.Serializable;
+
+public class SendSmsResponse implements Serializable {
+
+
+    /**
+     * 是否成功
+     */
+    private boolean isSuccess;
+    /**
+     * 错误信息
+     */
+    private String message;
+
+
+    public boolean isSuccess() {
+        return isSuccess;
+    }
+
+
+    public void setSuccess(boolean isSuccess) {
+        this.isSuccess = isSuccess;
+    }
+
+
+    public String getMessage() {
+        return message;
+    }
+
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java

+package com.gic.haoban.manage.api.service;
+
+public interface SyncHaobanToGicApiService {
+
+	/**
+	 * 删除gicClerkId
+	 * @param gicClerkId
+	 */
+	public void delGicClerk(String gicClerkId);
+	
+	/**
+	 * 同步gicClerkName
+	 * @param gicClerkId
+	 * @param name
+	 */
+	public void updateGicClerk(String gicClerkId,String name);
+	
+	/**
+	 * 判断gicClerk是否能新增
+	 * @param gicEnterpriseId
+	 * @param phoneNumber
+	 * @param code
+	 * @param gicStoreId
+	 * @return
+	 */
+	public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
+	
+	/**
+	 * 
+	 * @param gicClerkId
+	 * @param gicOldStoreId
+	 * @param gicNewStoreId
+	 * @param clerkChangeReason 1后台操作2订单操作3企业操作4app转岗
+	 * @param memberChangeReason 1会员自行转移2后台手动选择3企业转移会员4店员删除5订单操作6开卡扫描二维码7企业号认领8企业号分配9app转岗移除
+	 * @param operId
+	 */
+	public boolean gicClerkMove(String gicClerkId,String gicOldStoreId,String gicNewStoreId,int clerkChangeReason,int memberChangeReason,String operId);
+	
+	
+	/**
+	 * 切换店长
+	 * @param gicEnterpriseId
+	 * @param gicStoreId
+	 * @param gicClerkId
+	 * @return
+	 */
+	public boolean setStoreManager(String gicEnterpriseId,String gicStoreId,String gicClerkId);
+
+	boolean syncClerkToGicClerkAdd(String storeId, String clerkCode, Integer sex, String name, String phoneNumber,
+								   String nationCode, String postionName);
+
+	String syncClerkToGicClerkAddNew(String storeId, String clerkCode, Integer sex, String name, String phoneNumber,
+			String nationCode, String postionName);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ValidationCodeApiService.java

+package com.gic.haoban.manage.api.service;
+
+
+import com.gic.haoban.manage.api.response.SendSmsResponse;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+public interface ValidationCodeApiService {
+    /**
+     * 短信验证码
+     *
+     * @param phoneNumber
+     * @param code
+     */
+    int smsValidationCode(String phoneNumber, String code);
+
+    /**
+     * 短信验证码
+     *
+     * @param nationCode
+     * @param phoneNumber
+     * @param code
+     */
+    int smsValidationCode(String nationCode,String phoneNumber, String code);
+
+    SendSmsResponse sendValidationCode(String nationCode, String phoneNumber, String code);
+
+    /**
+     * 语音验证码
+     *
+     * @param phoneNumber
+     * @param code
+     * @return
+     */
+    int verifyValidationCode(String phoneNumber, String code);
+    
+   /**
+    * 
+    * @param nationCode
+    * @param phoneNumber
+    * @param unReadPeople
+    * @param unReadCount
+    * @return
+    */
+	int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
+
+    /**
+     * 发送验证码
+     *
+     * @param nationCode
+     * @param phoneNumber
+     * @param code
+     * @param enterpriseId
+     * @param storeId
+     * @param clerkId
+     * @return
+     */
+    SendSmsResponse sendValidationCodeHb3(String nationCode, String phoneNumber, String code, String enterpriseId, String storeId, String clerkId, boolean payFlag);
+}

haoban-manage3-service/pom.xml

@@ -90,11 +90,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>haoban-communicate-api</artifactId>
-            <version>${haoban-communicate-api}</version>
-        </dependency>
+
         <dependency>
             <groupId>com.gic</groupId>
             <artifactId>gic-wechat-api</artifactId>
@@ -128,6 +124,12 @@
 
         <dependency>
             <groupId>com.gic</groupId>
+            <artifactId>gic-marketing-api</artifactId>
+            <version>${gic-marketing-api}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
             <artifactId>haoban-app-customer-api</artifactId>
             <version>${haoban-app-customer-api}</version>
         </dependency>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -15,12 +15,12 @@ import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.UuidUtil;
-import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.SyncHaobanToGicApiService;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanAuditMapper;
@@ -61,7 +61,7 @@ public class AuditApiServiceImpl implements AuditApiService {
     @Autowired
     private EnterpriseService enterpriseService;
     @Autowired
-    private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
+    private SyncHaobanToGicApiService syncHaobanToGicApiService;
     @Autowired
     private StaffClerkRelationApiService staffClerkRelationApiService;
     @Autowired
@@ -176,7 +176,7 @@ public class AuditApiServiceImpl implements AuditApiService {
             //门店导购新增
             String oldValue = tab.getOldValue();
             AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
-            String flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
+            String flag = syncHaobanToGicApiService.syncClerkToGicClerkAddNew(tab.getCommitStoreId(), obj.getClerkCode(), obj.getSex(), obj.getClerkName(), obj.getPhoneNumber(), obj.getNationCode(), null);
             if (!"1".equals(flag)) {
                 //失败
                 tab.setAuditStatus(5);
@@ -198,7 +198,7 @@ public class AuditApiServiceImpl implements AuditApiService {
             //门店导购删除
             String oldValue = tab.getOldValue();
             AuditStaffDTO obj = JSONObject.parseObject(oldValue, AuditStaffDTO.class);
-            syncHaobanToGicServiceApi.delGicClerk(obj.getClerkId());
+            syncHaobanToGicApiService.delGicClerk(obj.getClerkId());
             if (StringUtils.isNotBlank(batchId)) {
                 insertBatchLog(batchId, AuditRsultType.success.getCode(), tab);
             }
@@ -455,7 +455,8 @@ public class AuditApiServiceImpl implements AuditApiService {
         return !CollectionUtil.isEmpty(list);
     }
     
-    public int getAuditCount(String wxEnterpriseId,String enterpriseId , String clerkId) {
+    @Override
+    public int getAuditCount(String wxEnterpriseId, String enterpriseId , String clerkId) {
         // 如果null,说明是所有门店
         List<String> storeIdList = this.getStoreIdList(enterpriseId, clerkId) ;
         return this.auditMapper.getAuditCount(wxEnterpriseId,enterpriseId, storeIdList) ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java

+package com.gic.haoban.manage.service.service.out.impl;
+
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.clerk.api.service.PowerService;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.manage.api.service.SyncHaobanToGicApiService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SyncHaobanToGicApiServiceImpl implements SyncHaobanToGicApiService {
+	
+	private static Logger logger  = LoggerFactory.getLogger(SyncHaobanToGicApiServiceImpl.class);
+	
+	@Autowired
+	private StoreService storeService;
+	
+	@Autowired
+	private ClerkService clerkService;
+
+	@Autowired
+	private PowerService powerService;
+
+
+	@Override
+	public void delGicClerk(String gicClerkId) {
+		logger.info("【删除gicClerk】clerkID={}",gicClerkId);
+		clerkService.delClerk(gicClerkId);
+	}
+
+	@Override
+	public void updateGicClerk(String gicClerkId, String name) {
+		logger.info("【删除gicClerk】clerkID={},name={}",gicClerkId,name);
+		ClerkDTO clerkDto = new ClerkDTO();
+		ClerkDTO clerk = clerkService.getClerkByClerkId(gicClerkId);
+		if(clerk == null || clerk.getClerkName().equals(name)){
+			return;
+		}else{
+			logger.info("【更新gicClerk】clerkID={},name={}",gicClerkId,name);
+			clerkDto.setClerkId(gicClerkId);
+			clerkDto.setClerkName(name);
+			clerkService.updateClerk(clerkDto);
+		}
+		
+	}
+
+	@Override
+	public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId) {
+		logger.info("【店员新增校验】gicEnterpriseId={},phoneNumber={},code={}",gicEnterpriseId,phoneNumber,code);
+		ClerkDTO clerk = clerkService.getClerkByCodeNoDel(gicEnterpriseId, code);
+		//检验code是否唯一,并且手机号不为空
+		if (null!=clerk && StringUtils.isNotBlank(clerk.getPhoneNumber())) {
+			return false;
+		//检验code唯一，并且手机为空，并且门店id不同
+		}else if(null!=clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && !gicStoreId.equals(clerk.getStoreId())){
+			return false;
+		}else if(null != clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && gicStoreId.equals(clerk.getStoreId())){
+			String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, clerk.getClerkId());
+			logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
+			if(StringUtils.isNotBlank(message)){
+				return false;
+			}
+		}else{
+			//code不存在的情况下 判断是否能新增
+			String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, "");
+			logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
+			if(StringUtils.isNotBlank(message)){
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean gicClerkMove(String gicClerkId, String gicOldStoreId, String gicNewStoreId, int clerkChangeReason,
+			int memberChangeReason, String operId) {
+		logger.info("【门店转移】gicClerkId={},gicOldStoreId={},gicNewStoreId={},clerkChangeReason={},memberChangeReason={},operId={}",
+				gicClerkId,gicOldStoreId,gicNewStoreId,clerkChangeReason,memberChangeReason,operId);
+		if(StringUtils.isAnyBlank(gicClerkId,gicOldStoreId,gicNewStoreId,operId)){
+			return false;
+		}
+		clerkService.clerkMove(gicClerkId, gicOldStoreId, gicNewStoreId, clerkChangeReason, memberChangeReason, operId);
+		return true;
+	}
+
+	@Override
+	public boolean setStoreManager(String gicEnterpriseId, String gicStoreId, String gicClerkId) {
+		powerService.setStoreManager(gicEnterpriseId, gicStoreId, gicClerkId);
+		return true;
+	}
+
+	@Override
+	public boolean syncClerkToGicClerkAdd(String storeId,String clerkCode,Integer sex,String name,
+										  String phoneNumber,String nationCode,String postionName) {
+		logger.info("【新增gicClerk】storeId={},clerkCode={},name={},phoneNumber={},nationCode={}",storeId,clerkCode,name,phoneNumber,nationCode);
+
+		com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
+		//校验手机是否唯一
+		if (store == null) {
+			return false;
+		}
+		String enterpriseId = store.getEnterpriseId();
+		ClerkDTO clerk = clerkService.getClerkByCodeNoDel(enterpriseId, clerkCode);
+		if(clerk != null){
+			logger.info("【同步店员新增校验】flag={}",StringUtils.isBlank(clerk.getPhoneNumber()) || "--".equals(clerk.getPhoneNumber()));
+		}
+		//检验code是否唯一
+		if (null!=clerk && StringUtils.isNotBlank(clerk.getPhoneNumber()) && !"--".equals(clerk.getPhoneNumber())) {
+			return false;
+			//如果code存在,并且在相同门店并且手机号为空，则更新手机号
+		}else if(null != clerk && (StringUtils.isBlank(clerk.getPhoneNumber()) || "--".equals(clerk.getPhoneNumber())) && storeId.equals(clerk.getStoreId())){
+			String message = clerkService.validatePhoneNumber(enterpriseId, storeId, phoneNumber, clerk.getClerkId());
+			logger.info("【同步店员新增校验】message={}",message);
+			if(StringUtils.isBlank(message)){
+				clerk.setClerkName(name);
+				clerk.setPhoneNumber(phoneNumber);
+				clerkService.updateClerk(clerk);
+				return true;
+			}
+		}
+
+		ClerkDTO clerkDTO = new ClerkDTO();
+		clerkDTO.setClerkName(name);
+		clerkDTO.setClerkCode(clerkCode);
+		clerkDTO.setStoreId(storeId);
+		clerkDTO.setStoreName(store.getStoreName());
+		clerkDTO.setDepartId(store.getStoreGroupId());
+		clerkDTO.setDeptName(store.getStoreGroupName());
+		clerkDTO.setClerkType(0);
+		clerkDTO.setStatus(1);
+		clerkDTO.setPhoneNumber(phoneNumber);
+		clerkDTO.setPositionName("店员");
+		clerkDTO.setEnterpriseId(enterpriseId);
+
+		String s = clerkService.saveHaobanClerk(enterpriseId, clerkCode, name, storeId, nationCode, phoneNumber, 1);
+		logger.info("【同步店员新增返回参数】s={}",s);
+		if(StringUtils.isBlank(s)){
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String syncClerkToGicClerkAddNew(String storeId,String clerkCode,Integer sex,String name,
+			String phoneNumber,String nationCode,String postionName) {
+		logger.info("【新增gicClerk】storeId={},clerkCode={},name={},phoneNumber={},nationCode={}",storeId,clerkCode,name,phoneNumber,nationCode);
+		
+		com.gic.enterprise.api.dto.StoreDTO store = storeService.getStoreByIdNoStatus(storeId);
+		//校验手机是否唯一
+		if (store == null) {
+			logger.info("门店不存在，导购新增失败");
+			return "门店不存在，导购新增失败";
+		}
+		String enterpriseId = store.getEnterpriseId();
+		ClerkDTO clerk = clerkService.getClerkByCodeNoDel(enterpriseId, clerkCode);
+		if(clerk != null){
+			logger.info("【同步店员新增校验】flag={}",StringUtils.isBlank(clerk.getPhoneNumber()) || "--".equals(clerk.getPhoneNumber()));
+		}
+		//检验code是否唯一
+		if (null!=clerk && StringUtils.isNotBlank(clerk.getPhoneNumber()) && !"--".equals(clerk.getPhoneNumber())) {
+			logger.info("导购已存在且手机号不为空");
+			return "导购已存在且手机号不为空";
+		//如果code存在,并且在相同门店并且手机号为空，则更新手机号
+		}else if(null != clerk && (StringUtils.isBlank(clerk.getPhoneNumber()) || "--".equals(clerk.getPhoneNumber())) && storeId.equals(clerk.getStoreId())){
+			String message = clerkService.validatePhoneNumber(enterpriseId, storeId, phoneNumber, clerk.getClerkId());
+			logger.info("【同步店员新增校验】message={}",message);
+			if(StringUtils.isBlank(message)){
+				clerk.setClerkName(name);
+				clerk.setPhoneNumber(phoneNumber);
+				clerkService.updateClerk(clerk);
+				logger.info("校验成功");
+				return "1";
+			}
+		}
+		
+		ClerkDTO clerkDTO = new ClerkDTO();
+		clerkDTO.setClerkName(name);
+		clerkDTO.setClerkCode(clerkCode);
+		clerkDTO.setStoreId(storeId);
+		clerkDTO.setStoreName(store.getStoreName());
+		clerkDTO.setDepartId(store.getStoreGroupId());
+		clerkDTO.setDeptName(store.getStoreGroupName());
+		clerkDTO.setClerkType(0);
+		clerkDTO.setStatus(1);
+		clerkDTO.setPhoneNumber(phoneNumber);
+		clerkDTO.setPositionName("店员");
+		clerkDTO.setEnterpriseId(enterpriseId);
+
+		String s = clerkService.saveHaobanClerk(enterpriseId, clerkCode, name, storeId, nationCode, phoneNumber, 1);
+		logger.info("【同步店员新增返回参数】s={}",s);
+		if(StringUtils.isBlank(s)){
+			return "新增失败，可能原因：GIC已存在相同手机号或code";
+		}
+		return "1";
+		
+	}
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ValidationCodeApiServiceImpl.java

+package com.gic.haoban.manage.service.service.out.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.gic.commons.util.StringUtil;
+import com.gic.haoban.manage.api.response.SendSmsResponse;
+import com.gic.haoban.manage.api.service.ValidationCodeApiService;
+import com.gic.marketing.api.dto.SmsSendResponseDTO;
+import com.gic.marketing.api.service.AccountOverdueSmsSendService;
+import com.gic.thirdparty.api.constant.YTXErrCode;
+import com.gic.thirdparty.api.dto.CommunicationLogDTO;
+import com.gic.thirdparty.api.dto.TelResDTO;
+import com.gic.thirdparty.api.service.CommunicationService;
+import com.gic.thirdparty.api.service.VoiceService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2018/3/22.
+ */
+@Service
+public class ValidationCodeApiServiceImpl implements ValidationCodeApiService {
+
+    private Logger logger = LoggerFactory.getLogger(ValidationCodeApiServiceImpl.class);
+
+    @Autowired
+    private VoiceService voiceService;
+
+    @Autowired
+    private CommunicationService communicationService;
+
+    @Autowired
+    private AccountOverdueSmsSendService accountOverdueSmsSendService;
+
+    private static final String SUCCESS = "0";
+
+
+    /**
+     * 短信验证码
+     *
+     * @param nationCode
+     * @param phoneNumber
+     * @param code
+     */
+    @Override
+    public SendSmsResponse sendValidationCode(String nationCode, String phoneNumber, String code) {
+        SendSmsResponse response = new SendSmsResponse();
+        logger.info("短信验证码:nationCode：{} phoneNumber:{} 验证码：{} ", nationCode, phoneNumber, code);
+        if (StringUtils.isBlank(phoneNumber)) {
+            response.setSuccess(false);
+            response.setMessage("手机号码不能空");
+        }
+
+        Map<String, String> map = new HashMap<>();
+        map.put("1", code);
+        map.put("2", "15");
+        SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, nationCode, 2, map);
+
+
+        if (SUCCESS.equals(responseDTO.getErrCode())) {
+            logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
+            response.setSuccess(true);
+        } else {
+            logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
+        }
+
+        response.setMessage(responseDTO.getErrMessage());
+        return response;
+    }
+
+
+    /**
+     * 短信验证码
+     *
+     * @param nationCode
+     * @param phoneNumber
+     * @param code
+     */
+    @Override
+    public int smsValidationCode(String nationCode, String phoneNumber, String code) {
+        logger.info("短信验证码:nationCode：{} phoneNumber:{} 验证码：{} ", nationCode, phoneNumber, code);
+        if (StringUtils.isBlank(phoneNumber)) {
+            return 3;
+        }
+
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("1", code);
+        map.put("2", "15");
+        SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, nationCode, 2, map);
+        if (SUCCESS.equals(responseDTO.getErrCode())) {
+            logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
+            return 1;
+        } else {
+            logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
+            return 2;
+        }
+    }
+
+    /**
+     * 短信验证码
+     *
+     * @param nationCode
+     * @param phoneNumber
+     */
+    @Override
+    public int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unRendPeople, String unReadCount, String enterpriseId) {
+        logger.info("短信验证码:nationCode：{} phoneNumber:{} 未读人数：{},未读数:{} ", nationCode, phoneNumber, unRendPeople, unReadCount);
+        if (StringUtils.isBlank(phoneNumber)) {
+            return 3;
+        }
+
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("1", unRendPeople);
+        map.put("2", unReadCount);
+        SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend(enterpriseId, phoneNumber, nationCode, 3, map);
+        if (SUCCESS.equals(responseDTO.getErrCode())) {
+            logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
+            return 1;
+        } else {
+            logger.info("手机号码：" + phoneNumber + "短信提醒发送失败：" + responseDTO.getErrMessage());
+            return 2;
+        }
+    }
+
+    @Override
+    public int smsValidationCode(String phoneNumber, String code) {
+        logger.info("短信验证码:phoneNumber:" + phoneNumber + "code:" + code);
+        if (StringUtil.isNotNullStr(phoneNumber, true)) {
+
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("1", code);
+            map.put("2", "15");
+            SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, "86", 2, map);
+            if (responseDTO.getErrCode().equals("0")) {
+                logger.info("发送成功！" + phoneNumber);
+                return 1;
+            } else {
+
+                logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
+                return 2;
+            }
+        }
+        logger.info("手机号吗为空" + phoneNumber);
+        return 3;
+    }
+
+    @Override
+    public int verifyValidationCode(String phoneNumber, String code) {
+        TelResDTO res = voiceService.voiceVerify(phoneNumber, code, 2, null);
+        if (null != res && YTXErrCode.ERR_000000 == res.getCode()) {
+            logger.info("成功+" + phoneNumber);
+
+        } else {
+            logger.info("发送失败" + phoneNumber);
+            return 0;
+        }
+
+        // 保存通讯记录
+        CommunicationLogDTO communicationLog = null;
+        try {
+            communicationLog = new CommunicationLogDTO();
+            communicationLog.setCreateTime(new Date());
+            communicationLog.setOperationType(1);
+            communicationLog.setParamInfo(code);
+            communicationLog.setReceivePhone(phoneNumber);
+            communicationLog.setStatus(1);
+            if (null != res) {
+                YTXErrCode errcode = res.getCode();
+                if (!errcode.getCode().equals(
+                        YTXErrCode.ERR_000000.getCode())) {
+                    communicationLog.setStatus(0);
+                    communicationLog.setErrMsg(errcode.getValue());
+                    communicationLog.setFee(0);
+                }
+            } else {
+                communicationLog.setStatus(0);
+                communicationLog.setErrMsg("无返回结果");
+                communicationLog.setFee(0);
+            }
+            communicationService.saveCommunication(communicationLog,
+                    "voice");
+        } catch (Exception e) {
+            logger.info("调用服务模块异常，保存通讯日志记录出错:"
+                    + JSON.toJSONString(communicationLog));
+        }
+        return 1;
+    }
+
+    @Override
+    public SendSmsResponse sendValidationCodeHb3(String nationCode, String phoneNumber, String code, String enterpriseId, String storeId, String clerkId, boolean payFlag) {
+        SendSmsResponse response = new SendSmsResponse();
+        logger.info("短信验证码:nationCode：{} phoneNumber:{} 验证码：{} ", nationCode, phoneNumber, code);
+        if (StringUtils.isBlank(phoneNumber)) {
+            response.setSuccess(false);
+            response.setMessage("手机号码不能空");
+        }
+
+        Map<String, String> map = new HashMap<>();
+        map.put("1", code);
+        map.put("2", "15");
+        if (StringUtils.isNotBlank(storeId) && StringUtils.isNotBlank(clerkId)) {
+            map.put("clerkId", clerkId);
+            map.put("storeId", storeId);
+        }
+        if (!payFlag) {
+            map.put("needPay", "0");
+        } else {
+            map.put("needPay", "1");
+        }
+        SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend(enterpriseId, phoneNumber, nationCode, 2, map);
+
+        if (SUCCESS.equals(responseDTO.getErrCode())) {
+            logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
+            response.setSuccess(true);
+        } else {
+            logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
+        }
+
+        response.setMessage(responseDTO.getErrMessage());
+        return response;
+    }
+}

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -124,10 +124,14 @@
     <dubbo:service interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" ref="haobanQywxFeeApiService"
                    timeout="10000"/>
 
-
     <dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService"
                    ref="hmClerkRelationApiService" timeout="10000" />
 
+    <dubbo:service interface="com.gic.haoban.manage.api.service.SyncHaobanToGicApiService" ref="syncHaobanToGicApiServiceImpl"
+                   timeout="10000"/>
+    <dubbo:service interface="com.gic.haoban.manage.api.service.ValidationCodeApiService" ref="validationCodeApiServiceImpl"/>
+
+
     <dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="gicDepartmentService"/>
     <dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxDepartmentApiService"
                      id="qywxDepartmentApiService"/>
@@ -165,8 +169,6 @@
 
     <dubbo:reference id="enterpriseService" interface="com.gic.enterprise.api.service.EnterpriseService" timeout="10000"
                      retries="0" check="false"/>
-    <dubbo:reference interface="com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi"
-                     id="syncHaobanToGicServiceApi"/>
 
     <dubbo:reference interface="com.gic.member.api.service.MemberTagService" id="memberTagService"/>
     <dubbo:reference interface="com.gic.member.tag.api.service.MemberTagApiService" id="memberTagApiService"/>
@@ -186,4 +188,9 @@
                      retries="0" check="false"/>
    <dubbo:reference id="memberTagOpenApiService" interface="com.gic.member.tag.api.service.MemberTagOpenApiService" timeout="10000" retries="0" check="false"/>
 
+    <dubbo:reference interface="com.gic.marketing.api.service.SmsService" id="smsService" timeout="10000" retries="0"/>
+    <dubbo:reference interface="com.gic.marketing.api.service.AccountOverdueSmsSendService" id="accountOverdueSmsSendService" timeout="10000" retries="0"/>
+    <dubbo:reference interface="com.gic.thirdparty.api.service.VoiceService" id="voiceService" timeout="10000" retries="0"/>
+    <dubbo:reference interface="com.gic.thirdparty.api.service.CommunicationService" id="communicationService" timeout="10000" retries="0"/>
+
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -36,7 +36,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_staff
-        where staff_id = #{staffId,jdbcType=VARCHAR}
+        where staff_id = #{staffId,jdbcType=VARCHAR} and status_flag = 1
     </select>
     
 

haoban-manage3-web/pom.xml

@@ -147,12 +147,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>haoban-communicate-api</artifactId>
-            <version>${haoban-communicate-api}</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.gic.operation</groupId>
             <artifactId>gic-operation-api</artifactId>
             <version>${gic-operation-api}</version>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SendCodeController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.gic.haoban.common.utils.CheckSmsCodeUtil;
+import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.response.SendSmsResponse;
+import com.gic.haoban.manage.api.service.ValidationCodeApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,28 +16,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSON;
-import com.gic.haoban.common.utils.CheckSmsCodeUtil;
-import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
-import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.communicate.api.service.valid.ValidationCodeService;
-//import com.gic.haoban.manage.api.dto.StaffDTO;
-//import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.redis.data.util.RedisUtil;
-import com.gic.reponse.SendSmsResponse;
-
 @RestController
 @Deprecated
 public class SendCodeController extends WebBaseController{
 	
 private static Logger logger = LoggerFactory.getLogger(SendCodeController.class);
-	
-//	@Autowired
-//	private StaffApiService staffApiService;
-//	
+
 	@Autowired
-	private ValidationCodeService validationCodeService;
+	private ValidationCodeApiService validationCodeService;
 	/**
      * 验证码发送
      *

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -54,9 +54,6 @@
 	<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxUserApiService" id="qywxUserApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.WxApplicationApiService" id="wxApplicationApiService"/>
 
-	<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService"
-					 id="validationCodeService"/>
-
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationSettingApiService"
 					 id="applicationSettingApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditApiService" id="auditApiService"/>
@@ -122,4 +119,5 @@
 
 	<dubbo:reference id="logSearchApiService" interface="com.gic.log.record.service.LogSearchApiService" timeout="10000" retries="0" check="false" />
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" id="haobanQywxFeeApiService"/>
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.ValidationCodeApiService" id="validationCodeApiService"/>
 </beans>

haoban-manage3-wx/pom.xml

@@ -129,11 +129,7 @@
             <artifactId>gic-member-api</artifactId>
             <version>${gic-member-api}</version>
         </dependency>
-        <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>haoban-communicate-api</artifactId>
-            <version>${haoban-communicate-api}</version>
-        </dependency>
+
         <dependency>
             <groupId>com.gic</groupId>
             <artifactId>gic-thirdparty-sdk</artifactId>

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java

 package com.gic.haoban.manage.web.controller;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -23,21 +12,27 @@ import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.common.anno.HttpLimit;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.AuditDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.enums.AuditType;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
-import com.gic.haoban.manage.api.service.AuditApiService;
-import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
-import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.AuditVO;
 import com.gic.haoban.manage.web.vo.StaffClerkBindLogDetailVO;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 @RestController
@@ -52,7 +47,7 @@ public class AuditController extends WebBaseController {
     @Autowired
     private StaffApiService staffApiService;
     @Autowired
-    private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
+    private SyncHaobanToGicApiService syncHaobanToGicApiService;
     @Autowired
     private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
     @Autowired
@@ -287,7 +282,7 @@ public class AuditController extends WebBaseController {
             }
             if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()) {
                 //导购新增
-                boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, clerkName, phoneNumber, nationCode, null);
+                boolean flag = syncHaobanToGicApiService.syncClerkToGicClerkAdd(storeId, clerkCode, sex, clerkName, phoneNumber, nationCode, null);
                 if (!flag) {
                     return resultResponse(HaoBanErrCode.ERR_10010);
                 }
@@ -298,7 +293,7 @@ public class AuditController extends WebBaseController {
             }
             if (audit.getAuditType() == AuditType.CLERK_DEL.getCode()) {
                 //导购删除
-                syncHaobanToGicServiceApi.delGicClerk(clerkId);
+                syncHaobanToGicApiService.delGicClerk(clerkId);
                 audit.setAuditStatus(1);
                 staffDepartmentRelatedApiService.sendClerkDel(clerkName, clerkCode, storeId, auditStatus, auditReason);
             }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -25,7 +25,6 @@ import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.*;
@@ -61,7 +60,7 @@ public class ClerkController extends WebBaseController {
     @Autowired
     private StoreService storeService;
     @Autowired
-    private SyncHaobanToGicServiceApi syncHaobanToGicServiceApi;
+    private SyncHaobanToGicApiService syncHaobanToGicApiService;
     @Autowired
     private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
     @Autowired
@@ -373,7 +372,7 @@ public class ClerkController extends WebBaseController {
             auditApiService.insert(audit);
         }
         //只新增gic那边的，不新增好办这边
-        boolean flag = syncHaobanToGicServiceApi.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
+        boolean flag = syncHaobanToGicApiService.syncClerkToGicClerkAdd(storeId, clerkCode, sex, staffName, phoneNumber, nationcode, postion);
         if (!flag) {
             return resultResponse(HaoBanErrCode.ERR_10010);
         }
@@ -470,7 +469,7 @@ public class ClerkController extends WebBaseController {
                 audit.setAuditType(AuditType.CLERK_DEL.getCode());
                 auditApiService.insert(audit);
 
-                syncHaobanToGicServiceApi.delGicClerk(clerkId);
+                syncHaobanToGicApiService.delGicClerk(clerkId);
             }
         }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/SendCodeController.java

@@ -6,10 +6,10 @@ import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.CheckSmsCodeUtil;
 import com.gic.haoban.common.utils.GooglePhoneNumberUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.communicate.api.service.valid.ValidationCodeService;
+import com.gic.haoban.manage.api.response.SendSmsResponse;
+import com.gic.haoban.manage.api.service.ValidationCodeApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
-import com.gic.reponse.SendSmsResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +23,7 @@ public class SendCodeController extends WebBaseController {
     private static Logger logger = LoggerFactory.getLogger(SendCodeController.class);
 
     @Autowired
-    private ValidationCodeService validationCodeService;
+    private ValidationCodeApiService validationCodeService;
 
     @Autowired
     private StoreService storeService;