|
|
@@ -2,9 +2,7 @@ package com.gree.mall.manager.logic.admin;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.google.common.collect.Lists;
|
|
|
import com.gree.mall.manager.bean.admin.AdminUserCom;
|
|
|
import com.gree.mall.manager.bean.admin.reqDto.AdminCompanyWechatReqBean;
|
|
|
import com.gree.mall.manager.bean.admin.reqDto.AdminUserAddReqBean;
|
|
|
@@ -16,14 +14,15 @@ import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
|
|
|
import com.gree.mall.manager.exception.RemoteServiceException;
|
|
|
import com.gree.mall.manager.logic.StorageLogic;
|
|
|
import com.gree.mall.manager.logic.common.CommonLogic;
|
|
|
-import com.gree.mall.manager.plus.entity.*;
|
|
|
-import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
|
|
|
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
|
|
|
+import com.gree.mall.manager.plus.entity.AdminRole;
|
|
|
+import com.gree.mall.manager.plus.entity.AdminUser;
|
|
|
+import com.gree.mall.manager.plus.entity.AdminWebsit;
|
|
|
import com.gree.mall.manager.plus.service.AdminRoleService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -65,6 +64,10 @@ public class AdminCompanyWechatLogic {
|
|
|
adminCompanyWechat.setExpireTime(DateUtil.offsetDay(DateUtil.date(), 6));
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isBlank(adminCompanyWechat.getLng()) || StringUtils.isBlank(adminCompanyWechat.getLat())) {
|
|
|
+ throw new RemoteServiceException("请选择地址");
|
|
|
+ }
|
|
|
+
|
|
|
if(StringUtils.isBlank(adminCompanyWechat.getBillTitle())){
|
|
|
adminCompanyWechat.setBillTitle(adminCompanyWechat.getCompanyName());
|
|
|
}
|
