Skip to content

G
gic-store
Commit d36f3cfa by zhiwj
Options

导购角色

parent d0c9eabc
Showing with 104 additions and 113 deletions
gic-store-api/src/main/java/com/gic/store/constant/Constants.java
......@@ -21,4 +21,8 @@ public interface Constants {
String NATION_CODE_DICT = "NATION_CODE";
Integer CLERK_LEADER_POSITION_ID = 1;
Integer CLERK_POSITION_ID = 2;
}
gic-store-api/src/main/java/com/gic/store/dto/ClerkDTO.java
......@@ -34,6 +34,7 @@ public class ClerkDTO implements Serializable {
*/
private Integer storeInfoId;
private Integer positionId;
/**
* 职位名称（仅作展现）
*/
......@@ -65,11 +66,6 @@ public class ClerkDTO implements Serializable {
private Integer status;
/**
* 1店长 0店员
*/
private Integer clerkType;
/**
* 头像
*/
private String headImg;
......@@ -221,12 +217,12 @@ public class ClerkDTO implements Serializable {
return haobanStatusName;
}
public Integer getClerkType() {
return clerkType;
public Integer getPositionId() {
return positionId;
}
public void setClerkType(Integer clerkType) {
this.clerkType = clerkType;
public void setPositionId(Integer positionId) {
this.positionId = positionId;
}
public String getHeadImg() {
......
gic-store-api/src/main/java/com/gic/store/service/ClerkPositionApiService.java
......@@ -88,4 +88,14 @@ public interface ClerkPositionApiService {
* @throws
*/
ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq);
/**
* @Title: getByName
* @Description:
* @author zhiwj
* @param enterpriseId
* @param positionName@return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ClerkPositionDTO>
* @throws
*/
ServiceResponse<ClerkPositionDTO> getByName(Integer enterpriseId, String positionName);
}
gic-store-service/src/main/java/com/gic/store/entity/TabClerk.java
......@@ -32,6 +32,11 @@ public class TabClerk {
private Integer storeInfoId;
/**
*
*/
private Integer positionId;
/**
* 职位名称（仅作展现）
*/
private String positionName;
......@@ -72,11 +77,6 @@ public class TabClerk {
private Integer status;
/**
* 1店长 0店员
*/
private Integer clerkType;
/**
* 头像
*/
private String headImg;
......@@ -121,6 +121,14 @@ public class TabClerk {
this.storeInfoId = storeInfoId;
}
public Integer getPositionId() {
return positionId;
}
public void setPositionId(Integer positionId) {
this.positionId = positionId;
}
public String getPositionName() {
return positionName;
}
......@@ -185,14 +193,6 @@ public class TabClerk {
this.status = status;
}
public Integer getClerkType() {
return clerkType;
}
public void setClerkType(Integer clerkType) {
this.clerkType = clerkType;
}
public String getHeadImg() {
return headImg;
}
......
gic-store-service/src/main/java/com/gic/store/entity/TabClerkTmp.java
......@@ -57,11 +57,6 @@ public class TabClerkTmp {
private String phoneNumber;
/**
* 是否店长
*/
private String clerkType;
/**
*
*/
private Date createTime;
......@@ -171,14 +166,6 @@ public class TabClerkTmp {
this.phoneNumber = phoneNumber;
}
public String getClerkType() {
return clerkType;
}
public void setClerkType(String clerkType) {
this.clerkType = clerkType;
}
public Date getCreateTime() {
return createTime;
}
......
gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java
......@@ -64,11 +64,11 @@ public class ClerkServiceImpl implements ClerkService {
tabClerk.setClerkCode(copy.getClerkCode());
tabClerk.setEnterpriseId(copy.getEnterpriseId());
tabClerk.setStoreInfoId(copy.getStoreInfoId());
tabClerk.setPositionId(copy.getPositionId());
tabClerk.setPositionName(copy.getPositionName());
tabClerk.setClerkGender(copy.getClerkGender());
tabClerk.setNationcode(copy.getNationcode());
tabClerk.setPhoneNumber(copy.getPhoneNumber());
tabClerk.setClerkType(copy.getClerkType());
tabClerk.setHeadImg(copy.getHeadImg());
tabClerk.setCreateTime(new Date());
tabClerk.setStatus(StoreEnableOrDisAbleEnum.ENABLE.getCode());
......@@ -85,7 +85,7 @@ public class ClerkServiceImpl implements ClerkService {
tabClerk.setClerkGender(copy.getClerkGender());
tabClerk.setNationcode(copy.getNationcode());
tabClerk.setPhoneNumber(copy.getPhoneNumber());
tabClerk.setClerkType(copy.getClerkType());
tabClerk.setPositionId(copy.getPositionId());
// tabClerk.setStatus(StoreEnableOrDisAbleEnum.ENABLE.getCode());
return tabClerkMapper.updateByPrimaryKeySelective(tabClerk);
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
......@@ -101,12 +101,12 @@ public class ClerkApiServiceImpl implements ClerkApiService {
// 如果门店下已经存在有导购是店长， 并且当前导购是店长 则做替换
// 如果门店下没有导购是店长，将当前导购设置成店长
TabClerk clerkLeader = clerkService.getClerkLeaderByStoreInfoId(clerkDTO.getEnterpriseId(), clerkDTO.getStoreInfoId());
if (clerkLeader != null && Integer.valueOf(1).equals(clerkDTO.getClerkType())) {
clerkLeader.setClerkType(0);
if (clerkLeader != null && com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkDTO.getPositionId())) {
clerkLeader.setPositionId(com.gic.store.constant.Constants.CLERK_POSITION_ID);
clerkService.update(clerkLeader);
clerkDTO.setClerkType(1);
clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
} else if (clerkLeader == null) {
clerkDTO.setClerkType(1);
clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
}
if (clerkDTO.getClerkId() == null) {
......@@ -333,14 +333,6 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
List<TabClerk> clerkList = clerkService.listClerkByStoreInfoId(enterpriseId, storeInfoIds,
clerkSearchDTO.getSearch(), clerkSearchDTO.getClerkType());
if (CollectionUtils.isNotEmpty(clerkList)) {
for (TabClerk clerk : clerkList) {
if (Integer.valueOf(1).equals(clerk.getClerkType())) {
clerk.setPositionName("店长");
}
}
}
Map<Integer, List<TabClerk>> storeIdMap = CollectionUtil.group(clerkList, "storeInfoId");
for (ClerkStoreListDTO clerkStoreListDTO : storeClerkDTOList) {
List<TabClerk> tabClerks = storeIdMap.get(clerkStoreListDTO.getStoreInfoId());
......@@ -659,9 +651,9 @@ public class ClerkApiServiceImpl implements ClerkApiService {
@Override
public ServiceResponse updateClerkLeader(Integer clerkId) {
TabClerk clerk = this.clerkService.getById(clerkId);
clerk.setClerkType(1);
clerk.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
TabClerk oldClerk = this.clerkService.getClerkLeaderByStoreInfoId(clerk.getEnterpriseId(), clerk.getStoreInfoId());
oldClerk.setClerkType(0);
oldClerk.setPositionId(com.gic.store.constant.Constants.CLERK_POSITION_ID);
this.clerkService.update(clerk);
this.clerkService.update(oldClerk);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkTaskServiceImpl.java
......@@ -15,7 +15,6 @@ import com.task.allocation.api.AbstractTaskAllocationOperation;
import com.task.allocation.exception.TaskAllocationException;
import com.task.allocation.qo.InitTaskQO;
import com.task.allocation.util.TaskAllocationSdkClient;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -107,7 +106,8 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
clerkDTO.setNationcode(t.getNationcode().trim());
clerkDTO.setPhoneNumber(t.getPhoneNumber().trim());
clerkDTO.setPositionName(t.getPositionName().trim());
clerkDTO.setClerkType(StringUtils.equals(t.getClerkType(), "是")? 1 : 0);
// todo
// clerkDTO.setClerkType(StringUtils.equals(t.getClerkType(), "是")? 1 : 0);
clerkDTO.setReason(ClerkLogReasonEnum.WEB.getCode());
clerkDTO.setRemark("批量导入");
......
gic-store-service/src/main/resources/mapper/TabClerkMapper.xml
......@@ -7,6 +7,7 @@
<result column="clerk_code" jdbcType="VARCHAR" property="clerkCode" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="store_info_id" jdbcType="INTEGER" property="storeInfoId" />
<result column="position_id" jdbcType="INTEGER" property="positionId" />
<result column="position_name" jdbcType="VARCHAR" property="positionName" />
<result column="clerk_gender" jdbcType="INTEGER" property="clerkGender" />
<result column="nationcode" jdbcType="VARCHAR" property="nationcode" />
......@@ -15,13 +16,12 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="clerk_type" jdbcType="INTEGER" property="clerkType" />
<result column="head_img" jdbcType="VARCHAR" property="headImg" />
</resultMap>
<sql id="Base_Column_List">
clerk_id, clerk_name, clerk_code, enterprise_id, store_info_id, position_name, clerk_gender,
nationcode, phone_number, haoban_status, create_time, update_time, status, clerk_type,
head_img
clerk_id, clerk_name, clerk_code, enterprise_id, store_info_id, position_id, position_name,
clerk_gender, nationcode, phone_number, haoban_status, create_time, update_time,
status, head_img
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -35,22 +35,19 @@
</delete>
<insert id="insert" parameterType="com.gic.store.entity.TabClerk">
insert into tab_clerk (clerk_id, clerk_name, clerk_code,
enterprise_id, store_info_id, position_name,
clerk_gender, nationcode, phone_number,
haoban_status, create_time, update_time,
status, clerk_type, head_img
enterprise_id, store_info_id, position_id,
position_name, clerk_gender, nationcode,
phone_number, haoban_status, create_time,
update_time, status, head_img
)
values (#{clerkId,jdbcType=INTEGER}, #{clerkName,jdbcType=VARCHAR}, #{clerkCode,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{positionName,jdbcType=VARCHAR},
#{clerkGender,jdbcType=INTEGER}, #{nationcode,jdbcType=VARCHAR}, #{phoneNumber,jdbcType=VARCHAR},
#{haobanStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{status,jdbcType=INTEGER}, #{clerkType,jdbcType=INTEGER}, #{headImg,jdbcType=VARCHAR}
#{enterpriseId,jdbcType=INTEGER}, #{storeInfoId,jdbcType=INTEGER}, #{positionId,jdbcType=INTEGER},
#{positionName,jdbcType=VARCHAR}, #{clerkGender,jdbcType=INTEGER}, #{nationcode,jdbcType=VARCHAR},
#{phoneNumber,jdbcType=VARCHAR}, #{haobanStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{headImg,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabClerk">
<selectKey keyProperty="clerkId" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into tab_clerk
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="clerkId != null">
......@@ -68,6 +65,9 @@
<if test="storeInfoId != null">
store_info_id,
</if>
<if test="positionId != null">
position_id,
</if>
<if test="positionName != null">
position_name,
</if>
......@@ -92,9 +92,6 @@
<if test="status != null">
status,
</if>
<if test="clerkType != null">
clerk_type,
</if>
<if test="headImg != null">
head_img,
</if>
......@@ -115,6 +112,9 @@
<if test="storeInfoId != null">
#{storeInfoId,jdbcType=INTEGER},
</if>
<if test="positionId != null">
#{positionId,jdbcType=INTEGER},
</if>
<if test="positionName != null">
#{positionName,jdbcType=VARCHAR},
</if>
......@@ -139,9 +139,6 @@
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="clerkType != null">
#{clerkType,jdbcType=INTEGER},
</if>
<if test="headImg != null">
#{headImg,jdbcType=VARCHAR},
</if>
......@@ -162,6 +159,9 @@
<if test="storeInfoId != null">
store_info_id = #{storeInfoId,jdbcType=INTEGER},
</if>
<if test="positionId != null">
position_id = #{positionId,jdbcType=INTEGER},
</if>
<if test="positionName != null">
position_name = #{positionName,jdbcType=VARCHAR},
</if>
......@@ -186,9 +186,6 @@
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="clerkType != null">
clerk_type = #{clerkType,jdbcType=INTEGER},
</if>
<if test="headImg != null">
head_img = #{headImg,jdbcType=VARCHAR},
</if>
......@@ -201,6 +198,7 @@
clerk_code = #{clerkCode,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
store_info_id = #{storeInfoId,jdbcType=INTEGER},
position_id = #{positionId,jdbcType=INTEGER},
position_name = #{positionName,jdbcType=VARCHAR},
clerk_gender = #{clerkGender,jdbcType=INTEGER},
nationcode = #{nationcode,jdbcType=VARCHAR},
......@@ -209,7 +207,6 @@
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
clerk_type = #{clerkType,jdbcType=INTEGER},
head_img = #{headImg,jdbcType=VARCHAR}
where clerk_id = #{clerkId,jdbcType=INTEGER}
</update>
......@@ -347,7 +344,7 @@
from tab_clerk
where enterprise_id = #{enterpriseId}
and store_info_id = #{storeInfoId}
and clerk_type = 1
and position_id = 1
limit 1
</select>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabClerkTmpMapper.xml
......@@ -12,7 +12,6 @@
<result column="clerk_gender" jdbcType="VARCHAR" property="clerkGender" />
<result column="nationcode" jdbcType="VARCHAR" property="nationcode" />
<result column="phone_number" jdbcType="VARCHAR" property="phoneNumber" />
<result column="clerk_type" jdbcType="VARCHAR" property="clerkType" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="error_message" jdbcType="VARCHAR" property="errorMessage" />
......@@ -22,7 +21,7 @@
</resultMap>
<sql id="Base_Column_List">
clerk_tmp_id, enterprise_id, clerk_name, clerk_code, store_name, store_code, position_name,
clerk_gender, nationcode, phone_number, clerk_type, create_time, update_time, error_message,
clerk_gender, nationcode, phone_number, create_time, update_time, error_message,
sign_key, operator_id, operator_name
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -39,15 +38,15 @@
insert into tab_clerk_tmp (clerk_tmp_id, enterprise_id, clerk_name,
clerk_code, store_name, store_code,
position_name, clerk_gender, nationcode,
phone_number, clerk_type, create_time,
update_time, error_message, sign_key,
operator_id, operator_name)
phone_number, create_time, update_time,
error_message, sign_key, operator_id,
operator_name)
values (#{clerkTmpId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{clerkName,jdbcType=VARCHAR},
#{clerkCode,jdbcType=VARCHAR}, #{storeName,jdbcType=VARCHAR}, #{storeCode,jdbcType=VARCHAR},
#{positionName,jdbcType=VARCHAR}, #{clerkGender,jdbcType=VARCHAR}, #{nationcode,jdbcType=VARCHAR},
#{phoneNumber,jdbcType=VARCHAR}, #{clerkType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{errorMessage,jdbcType=VARCHAR}, #{signKey,jdbcType=VARCHAR},
#{operatorId,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR})
#{phoneNumber,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{errorMessage,jdbcType=VARCHAR}, #{signKey,jdbcType=VARCHAR}, #{operatorId,jdbcType=INTEGER},
#{operatorName,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabClerkTmp">
insert into tab_clerk_tmp
......@@ -82,9 +81,6 @@
<if test="phoneNumber != null">
phone_number,
</if>
<if test="clerkType != null">
clerk_type,
</if>
<if test="createTime != null">
create_time,
</if>
......@@ -135,9 +131,6 @@
<if test="phoneNumber != null">
#{phoneNumber,jdbcType=VARCHAR},
</if>
<if test="clerkType != null">
#{clerkType,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -188,9 +181,6 @@
<if test="phoneNumber != null">
phone_number = #{phoneNumber,jdbcType=VARCHAR},
</if>
<if test="clerkType != null">
clerk_type = #{clerkType,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -223,7 +213,6 @@
clerk_gender = #{clerkGender,jdbcType=VARCHAR},
nationcode = #{nationcode,jdbcType=VARCHAR},
phone_number = #{phoneNumber,jdbcType=VARCHAR},
clerk_type = #{clerkType,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
error_message = #{errorMessage,jdbcType=VARCHAR},
......
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java
......@@ -10,10 +10,12 @@ import com.gic.store.constant.Constants;
import com.gic.store.constant.GenderEnum;
import com.gic.store.constant.StoreImportEnum;
import com.gic.store.constant.StoreOwnTypeEnum;
import com.gic.store.dto.ClerkPositionDTO;
import com.gic.store.dto.ClerkTmpDTO;
import com.gic.store.dto.GicDictDTO;
import com.gic.store.dto.StoreDTO;
import com.gic.store.service.ClerkImportApiService;
import com.gic.store.service.ClerkPositionApiService;
import com.gic.store.service.DictApiService;
import com.gic.store.service.StoreApiService;
import com.gic.store.web.qo.PageQO;
......@@ -52,6 +54,8 @@ public class ClerkImportController {
private StoreApiService storeApiService;
@Autowired
private DictApiService dictApiService;
@Autowired
private ClerkPositionApiService clerkPositionApiService;
/**
* 下载模板
......@@ -121,7 +125,7 @@ public class ClerkImportController {
try {
Workbook workbook = ExcelUtils.getWorkbookFromUpload(file.getInputStream(), fileName);
List<Map<Integer, String>> data = ExcelUtils.readExcel(6, fileName.substring(fileName.lastIndexOf(".") + 1), workbook, null);
if (CollectionUtils.isNotEmpty(data) && data.get(0).size() != 10) {
if (CollectionUtils.isNotEmpty(data) && data.get(0).size() != 9) {
return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "总列数与模板不一致");
}
clerkImportApiService.delClerkTmp(enterpriseId);
......@@ -343,6 +347,17 @@ public class ClerkImportController {
}
}
positionName = positionName.trim();
ServiceResponse<ClerkPositionDTO> positionResp = clerkPositionApiService.getByName(enterpriseId, positionName);
if (validate) {
ClerkPositionDTO positionDTO = positionResp.getResult();
if (positionDTO == null) {
bean.setErrorMessage("职位不存在");
validate = false;
}
}
bean.setPositionName(positionName);
// 验证性别
String gender = row.get(6);
......@@ -391,21 +406,21 @@ public class ClerkImportController {
}
bean.setPhoneNumber(phoneNumber.trim());
// 验证是否店长
String clerkType = row.get(9);
bean.setClerkType(clerkType);
if (validate) {
if (StringUtils.isBlank(clerkType)) {
bean.setErrorMessage("是否店长不能为空");
validate = false;
}
}
if (validate) {
if (StringUtils.equals("是", clerkType) && StringUtils.equals("否", clerkType)) {
bean.setErrorMessage("是否店长类型不存在");
validate = false;
}
}
// // 验证是否店长
// String clerkType = row.get(9);
// bean.setClerkType(clerkType);
// if (validate) {
// if (StringUtils.isBlank(clerkType)) {
// bean.setErrorMessage("是否店长不能为空");
// validate = false;
// }
// }
// if (validate) {
// if (StringUtils.equals("是", clerkType) && StringUtils.equals("否", clerkType)) {
// bean.setErrorMessage("是否店长类型不存在");
// validate = false;
// }
// }
return bean;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment