Просмотр исходного кода

[用户][修改][修改管理员修改逻辑]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
4b68ebacb8
5 измененных файлов: 11 добавлений и 7 удалений
  1. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java
  2. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java
  4. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
  5. +5
    -0
      mallinkService/src/main/resources/mapper/WxTopicMapper.xml

+ 2
- 5
mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java Просмотреть файл

@@ -183,20 +183,17 @@ public class MallUserInfoController extends BaseController {
if (currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()) &&
currentUser.getId().equals(userInfo.getId())) {
// 超管
boolean bModify = false;
MallUserInfo adminUser = new MallUserInfo();
adminUser.setFlowPermission(userInfo.getFlowPermission());
adminUser.setEmail(userInfo.getEmail());
adminUser.setId(userInfo.getId());
if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) {
adminUser.setPassword(userInfo.getPassword());
bModify = true;
}
if (StringUtils.isNotBlank(userInfo.getUsername())) {
adminUser.setUsername(userInfo.getUsername());
}
if (bModify) {
userInfoService.saveOrUpdate(adminUser);
}
userInfoService.saveOrUpdate(adminUser);
} else {
userInfoService.saveOrUpdate(userInfo);
if (userInfo.getRoleId() != null) {


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java Просмотреть файл

@@ -54,6 +54,7 @@ public class WxTopicController extends BaseController {
@PostMapping("saveOrUpdate")
public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate");
wxTopic.setTenantId(super.getTenantId());
return wxTopicService.saveOrUpdate(wxTopic);
}



+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java Просмотреть файл

@@ -9,6 +9,8 @@ public interface WxTopicMapper extends CommonMapper<WxTopic, String> {

List<WxTopic> findList(WxTopic wxTopic);

List<WxTopic> findExist(WxTopic wxTopic);

WxTopic show(WxTopic record);

void updateStatus(WxTopic record);


+ 1
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java Просмотреть файл

@@ -67,7 +67,6 @@ public class WxTopicServiceImpl implements WxTopicService {
if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) {
WxTopic query = new WxTopic();
query.setTenantId(record.getTenantId());
query.setStatus(EnumWxTopicStatus.VAILD.getCode());
if(record.getId() != null){
WxTopic wt = wxTopicMapper.selectByPrimaryKey(record.getId());
query.setBeginTime(wt.getBeginTime());
@@ -76,7 +75,7 @@ public class WxTopicServiceImpl implements WxTopicService {
query.setBeginTime(record.getBeginTime());
query.setEndTime(record.getEndTime());
}
List<WxTopic> topicList = wxTopicMapper.findList(record);
List<WxTopic> topicList = wxTopicMapper.findExist(query);
if (CollectionUtils.isNotEmpty(topicList)) {
return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "["+topicList.get(0).getName()+"]正在活动中,截止至"+ DateUtils.date2String(topicList.get(0).getEndTime(),"yyyy-MM-dd"));
}


+ 5
- 0
mallinkService/src/main/resources/mapper/WxTopicMapper.xml Просмотреть файл

@@ -57,6 +57,11 @@
<include refid="dynamicWhereConditions" />
</select>

<select id="findExist" parameterType="com.iformall.domain.po.WxTopic" resultMap="BaseResultMap">
SELECT * FROM wx_topic WHERE wx_topic.tenant_id = #{tenantId}
AND (`begin_time` >= #{beginTime} or `end_time` &lt;= #{endTime}) AND `status` = 1
</select>

<select id="show" parameterType="com.iformall.domain.po.WxTopic" resultMap="BaseResultMap">
select t.*,cc.id as couponChannelId from wx_topic t left join wx_coupon_channel cc on(cc.sub_target_id = t.id)
where t.status = 1


Загрузка…
Отмена
Сохранить