Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/constant/ImportClerkBatchResultEnum.java

+package com.gic.store.constant;
+
+/**
+ * 批处理导购返回信息
+ * @ClassName: ImportClerkBatchResultEnum

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/1/15 10:47 AM

+ */
+public enum ImportClerkBatchResultEnum {
+    A1("A1", "门店信息", "标记不导入", "门店域", "门店域为空"),
+    A2("A2", "门店信息", "标记不导入", "门店域", "该门店域不存在"),
+    A3("A3", "门店信息", "标记不导入", "所属门店", "导购所属门店code为空"),
+    A4("A4", "门店信息", "标记不导入", "所属门店", "导购所属门店code在GIC不存在"),
+    C1("C1", "导购", "标记不导入", "导购code", "导购code为空"),
+    C2("C2", "导购", "标记不导入", "导购code", "导购code重复"),
+    C3("C3", "导购", "标记不导入", "导购名称", "导购名称为空"),
+    D1("D1", "导购属性", "标记导入", "性别", "导购性别为空"),
+    D2("D2", "导购属性", "标记不导入", "性别", "导购性别错误"),
+    D3("D3", "导购属性", "标记不导入", "手机号", "导购手机号重复"),
+    D4("D4", "导购属性", "标记不导入", "手机号", "导购手机号为空"),
+    E1("E1", "商户信息", "标记不导入", "商户", "商户ID非法");
+
+    /**
+     * 错误码
+     */
+    private String code;
+    /**
+     * 规则分类
+     */
+    private String ruleClassfy;
+    /**
+     * 处理规则
+     */
+    private String processRule;
+    /**
+     * 字段信息
+     */
+    private String fieldInfo;
+    /**
+     * 返回信息
+     */
+    private String resultInfo;
+
+    private ImportClerkBatchResultEnum(String code, String ruleClassfy, String processRule, String fieldInfo, String resultInfo) {
+        this.code = code;
+        this.ruleClassfy = ruleClassfy;
+        this.processRule = processRule;
+        this.fieldInfo = fieldInfo;
+        this.resultInfo = resultInfo;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getRuleClassfy() {
+        return ruleClassfy;
+    }
+
+    public void setRuleClassfy(String ruleClassfy) {
+        this.ruleClassfy = ruleClassfy;
+    }
+
+    public String getProcessRule() {
+        return processRule;
+    }
+
+    public void setProcessRule(String processRule) {
+        this.processRule = processRule;
+    }
+
+    public String getFieldInfo() {
+        return fieldInfo;
+    }
+
+    public void setFieldInfo(String fieldInfo) {
+        this.fieldInfo = fieldInfo;
+    }
+
+    public String getResultInfo() {
+        return resultInfo;
+    }
+
+    public void setResultInfo(String resultInfo) {
+        this.resultInfo = resultInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "规则分类:" + ruleClassfy + ";处理规则:" + processRule + ";字段信息:" + fieldInfo + ";错误信息:" + resultInfo;
+    }
+}

gic-store-api/src/main/java/com/gic/store/dto/clerk/ProcessBatchClerkDTO.java

+package com.gic.store.dto.clerk;
+
+import java.io.Serializable;
+/**
+ * 批处理导购信息
+ * @ClassName: ProcessBatchClerkDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/1/15 10:51 AM

+ */
+public class ProcessBatchClerkDTO implements Serializable{
+    private static final long serialVersionUID = 2204414841126551169L;
+
+    /**
+     * 企业ID
+     */
+    private Integer enterpriseId;
+
+
+    /**
+     * 店员名称
+     */
+    private String clerkName;
+
+    /**
+     * 店员编码
+     */
+    private String clerkCode;
+
+    /**
+     * 职位名称（仅作展现）
+     */
+    private String positionName;
+
+    /**
+     * 性别  1：男  2：女
+     */
+    private Integer clerkGender;
+
+    /**
+     * 国际码
+     */
+    private String nationcode;
+
+    /**
+     * 电话号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 门店code
+     */
+    private String storeCode;
+
+    /**
+     * 域id
+     */
+    private Integer regionId;
+
+    /********************操作日志**********************/
+    /**
+     * 事由   1:web后台操作   2:外部触发   3:订单同步  4:会员同步  5:系统配置触发
+     */
+    private Integer reason;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建人ID
+     */
+    private Integer operatorId;
+    /**
+     * 创建人名称
+     */
+    private String operatorName;
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public Integer getClerkGender() {
+        return clerkGender;
+    }
+
+    public void setClerkGender(Integer clerkGender) {
+        this.clerkGender = clerkGender;
+    }
+
+    public String getNationcode() {
+        return nationcode;
+    }
+
+    public void setNationcode(String nationcode) {
+        this.nationcode = nationcode;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+}

gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java

@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.dto.ClerkSearchDTO;
 import com.gic.store.dto.ClerkStoreListDTO;
+import com.gic.store.dto.clerk.ProcessBatchClerkDTO;
 
 import java.util.List;
 
@@ -97,4 +98,14 @@ public interface ClerkApiService {
     ServiceResponse<ClerkDTO> getClerkById(Integer enterpriseId, Integer clerkId);
 
     ServiceResponse<List<ClerkDTO>> listClerk(Integer enterpriseId, String search);
+
+    /**
+     * 处理导购 实施运维调用批处理
+     * @Title: importClerkForOperation

+     * @Description:
+    
* @author guojuxing
+     * @param clerkInfo

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

+    
*/
+    ServiceResponse<String> importClerkForOperation(ProcessBatchClerkDTO clerkInfo);
 }

gic-store-service/src/main/java/com/gic/store/service/ClerkService.java

@@ -31,10 +31,11 @@ public interface ClerkService {
      * @param storeInfoId 门店id
      * @param phoneNumber 导购手机号
      * @param clerkId 导购id 如果传了，会剔除这个id去判断
+     * @param nationCode 手机号区号
      * @return boolean true:重复, false:不重复
      * @throws
      */
-    boolean isRepeatByPhoneNumber(Integer storeInfoId, String phoneNumber, Integer clerkId);
+    boolean isRepeatByPhoneNumber(Integer storeInfoId, String phoneNumber, Integer clerkId, String nationCode);
 
     /**
      * 导购名称不能重复

gic-store-service/src/main/java/com/gic/store/service/StoreService.java

@@ -97,6 +97,8 @@ public interface StoreService {
     
 */
     Integer validateStoreCodeIsExist(Integer enterpriseId, Integer regionId, String storeCode);
 
+    StoreDTO getStoreByRegionIdAndStoreCode(Integer enterpriseId, Integer regionId, String storeCode);
+
     boolean validateStoreNameIsExist(Integer enterpriseId, Integer regionId, String storeName, Integer storeId);
 
     int authAddStore(StoreDTO storeDTO);

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java

@@ -36,11 +36,12 @@ public class ClerkServiceImpl implements ClerkService {
     }
 
     @Override
-    public boolean isRepeatByPhoneNumber(Integer storeInfoId, String phoneNumber, Integer clerkId) {
+    public boolean isRepeatByPhoneNumber(Integer storeInfoId, String phoneNumber, Integer clerkId, String nationCode) {
         TabClerk tabClerk = new TabClerk();
         tabClerk.setClerkId(clerkId);
         tabClerk.setStoreInfoId(storeInfoId);
         tabClerk.setPhoneNumber(phoneNumber);
+        tabClerk.setNationcode(nationCode);
         return tabClerkMapper.getBySelective(tabClerk) != null;
     }
 

gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java

@@ -392,6 +392,15 @@ public class StoreServiceImpl implements StoreService {
     }
 
     @Override
+    public StoreDTO getStoreByRegionIdAndStoreCode(Integer enterpriseId, Integer regionId, String storeCode) {
+        StoreDTO store = new StoreDTO();
+        store.setEnterpriseId(enterpriseId);
+        store.setRegionId(regionId);
+        store.setStoreCode(storeCode);
+        return this.tabStoreInfoMapper.getDTOByStore(store);
+    }
+
+    @Override
     public boolean validateStoreNameIsExist(Integer enterpriseId, Integer regionId, String storeName, Integer storeId) {
         StoreDTO store = new StoreDTO();
         store.setEnterpriseId(enterpriseId);

gic-store-service/src/main/resources/mapper/TabClerkMapper.xml

@@ -263,6 +263,9 @@
       <if test="phoneNumber != null and phoneNumber != '' ">
           and phone_number = #{phoneNumber}
       </if>
+      <if test="nationcode != null and nationcode != '' ">
+        and nationcode = #{nationcode}
+      </if>
       <if test="clerkCode != null and clerkCode != '' ">
           and clerk_code = #{clerkCode}
       </if>