xhxu 5 лет назад
Родитель
Сommit
5f0e87b63b
12 измененных файлов: 59 добавлений и 21 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java
  4. +21
    -3
      mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  5. +2
    -2
      mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  6. +5
    -3
      mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java
  7. +1
    -1
      mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java
  8. +15
    -0
      mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java
  9. +2
    -0
      mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java
  10. +6
    -5
      mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java
  11. +0
    -1
      mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java
  12. +3
    -2
      mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java

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

@@ -161,7 +161,7 @@ public class WechatLoginController extends BaseController {
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.protectInfos(); info.protectInfos();
String menus = mallUserRoleService.getPermissionsByUser(info); String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
if(StringUtils.isNotBlank(menus)) {
info.setMenus(menus); info.setMenus(menus);
} }
WxMall mall = mallService.getByTenantInfo(info); WxMall mall = mallService.getByTenantInfo(info);
@@ -331,7 +331,7 @@ public class WechatLoginController extends BaseController {
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.protectInfos(); info.protectInfos();
String menus = mallUserRoleService.getPermissionsByUser(info); String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
if(StringUtils.isNotBlank(menus)) {
info.setMenus(menus); info.setMenus(menus);
} }
Map<String, Object> ret = new HashMap<>(); Map<String, Object> ret = new HashMap<>();


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java Просмотреть файл

@@ -142,7 +142,7 @@ public class MallUserInfo extends TenantEntity {
if(StringUtils.isBlank(getTenantId())) { if(StringUtils.isBlank(getTenantId())) {
return false; return false;
} }
if(StringUtils.isBlank(getParentTenantId()) &&
if(StringUtils.isNotBlank(getParentTenantId()) &&
isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) { isAdmin.equals(EnumUserAdmin.ADMIN.getCode())) {
return true; return true;
} }


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

@@ -134,7 +134,7 @@ public class MallUserRoleServiceImpl implements MallUserRoleService {
} }
return menus; return menus;
} }
return null;
return "";
} }


+ 21
- 3
mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java Просмотреть файл

@@ -5,10 +5,12 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;


import com.iformall.common.ErrorCode;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.douyin.miniapp.api.TtMaService; import com.iformall.douyin.miniapp.api.TtMaService;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import com.iformall.shiro.UserSession; import com.iformall.shiro.UserSession;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -117,7 +119,7 @@ public class BaseController {


/** /**
* 处理集团新增修改所需租户信息(各广场和集团独立修改) * 处理集团新增修改所需租户信息(各广场和集团独立修改)
* ifParentUpdateTenantInfo
* ifParentUpdateAloneTenantInfo
*/ */
public TenantEntity ifParentUpdateAloneTenantInfo(){ public TenantEntity ifParentUpdateAloneTenantInfo(){
TenantEntity info = this.getTenantInfo(); TenantEntity info = this.getTenantInfo();
@@ -128,8 +130,24 @@ public class BaseController {
if(getUser().getTenantId().equals(info.getTenantId())){ if(getUser().getTenantId().equals(info.getTenantId())){
return info; return info;
} }
new Exception("权限不足,只能独立操作");
return null;
throw new MallinkException(ErrorCode.USER_NO_PERMISSION);
}

/**
* 只有集团能操作
* ifParentTenantInfoAlone
*/
public TenantEntity ifParentTenantInfoAlone(){
TenantEntity info = this.getTenantInfo();
if(StringUtils.isBlank(info.getTenantId())){
info.setTenantId(info.getParentTenantId());
info.setParentTenantId(null);

if(getUser().getParentTenantId().equals(info.getTenantId())){
return info;
}
}
throw new MallinkException(ErrorCode.USER_NO_PERMISSION);
} }


/** /**


+ 2
- 2
mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -161,7 +161,7 @@ public class WechatLoginController extends BaseController {
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.protectInfos(); info.protectInfos();
String menus = mallUserRoleService.getPermissionsByUser(info); String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
if(StringUtils.isNotBlank(menus)) {
info.setMenus(menus); info.setMenus(menus);
} }
WxMall mall = mallService.getByTenantInfo(info); WxMall mall = mallService.getByTenantInfo(info);
@@ -331,7 +331,7 @@ public class WechatLoginController extends BaseController {
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.protectInfos(); info.protectInfos();
String menus = mallUserRoleService.getPermissionsByUser(info); String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
if(StringUtils.isNotBlank(menus)) {
info.setMenus(menus); info.setMenus(menus);
} }
Map<String, Object> ret = new HashMap<>(); Map<String, Object> ret = new HashMap<>();


+ 5
- 3
mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java Просмотреть файл

@@ -69,7 +69,7 @@ public class TtCouponController extends BaseController {
public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize, Integer dataType) { public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize, Integer dataType) {
logger.debug("[" + getIpAddr() + "] TtCouponController::list"); logger.debug("[" + getIpAddr() + "] TtCouponController::list");
if (record == null) record = new TtCoupon(); if (record == null) record = new TtCoupon();
record.updateTenantInfo(getTenantInfo());
record.updateTenantInfo(ifParentUpdateTenantInfo());
// if(record.getType() == null || record.getType().equals(EnumTtCouponType.COUPON_SINGLE.getCode())){ // if(record.getType() == null || record.getType().equals(EnumTtCouponType.COUPON_SINGLE.getCode())){
// record.setType(EnumTtCouponType.COUPON_SINGLE.getCode()); // record.setType(EnumTtCouponType.COUPON_SINGLE.getCode());
// }else{ // }else{
@@ -93,7 +93,7 @@ public class TtCouponController extends BaseController {
if(record == null){ if(record == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }
TenantEntity tenantEntity = getTenantInfo();
TenantEntity tenantEntity = ifParentUpdateAloneTenantInfo();
record.updateTenantInfo(tenantEntity); record.updateTenantInfo(tenantEntity);


if(record.getId() != null){ if(record.getId() != null){
@@ -198,7 +198,7 @@ public class TtCouponController extends BaseController {
if (record.getId() == null) { if (record.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
TenantEntity tenantEntity = getTenantInfo();
TenantEntity tenantEntity = ifParentUpdateAloneTenantInfo();
record.updateTenantInfo(tenantEntity); record.updateTenantInfo(tenantEntity);


TtCoupon coupon = ttCouponService.getById(record.getId()); TtCoupon coupon = ttCouponService.getById(record.getId());
@@ -317,6 +317,7 @@ public class TtCouponController extends BaseController {
if (id == null) { if (id == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
ifParentTenantInfoAlone();
return ttCouponService.auditPass(id); return ttCouponService.auditPass(id);
} }


@@ -329,6 +330,7 @@ public class TtCouponController extends BaseController {
if (record.getId() == null) { if (record.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
ifParentTenantInfoAlone();
return ttCouponService.auditRejected(record.getId()); return ttCouponService.auditRejected(record.getId());
} }




+ 1
- 1
mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtOrderController.java Просмотреть файл

@@ -51,7 +51,7 @@ public class TtOrderController extends BaseController {
if (order == null){ if (order == null){
order = new TtOrder(); order = new TtOrder();
} }
order.updateTenantInfo(getTenantInfo());
order.updateTenantInfo(ifParentUpdateTenantInfo());
return new ResultData(ttOrderService.listAsPage(order, pageNum, pageSize)); return new ResultData(ttOrderService.listAsPage(order, pageNum, pageSize));
} }




+ 15
- 0
mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -74,6 +74,10 @@ public class BaseController {
}); });
} }


/**
* 用于用户
* @return
*/
public TenantEntity getTenantInfo() { public TenantEntity getTenantInfo() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String tenantId = (String) request.getAttribute(Constant.TENANT_ID); String tenantId = (String) request.getAttribute(Constant.TENANT_ID);
@@ -84,6 +88,17 @@ public class BaseController {
return tenantEntity; return tenantEntity;
} }


/**
* 用于查询内容(集团)
* @return
*/
public TenantEntity getParentTenantInfo() {
TenantEntity tenantInfo = this.getTenantInfo();
TenantEntity tenantEntity = new TenantEntity() ;
tenantEntity.setParentTenantId(tenantInfo.getTenantId());
return tenantEntity;
}

public TtMaService getWeappServiceByAppInfo(WxAppinfo appinfo) { public TtMaService getWeappServiceByAppInfo(WxAppinfo appinfo) {
TtMaService ttMaService = MaUtil.getTtappService(appinfo); TtMaService ttMaService = MaUtil.getTtappService(appinfo);
if (StringUtils.isBlank(appinfo.getAccessToken())) { if (StringUtils.isBlank(appinfo.getAccessToken())) {


+ 2
- 0
mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java Просмотреть файл

@@ -53,6 +53,7 @@ public class TtCouponController extends BaseController {
public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] TtCouponController::list"); logger.debug("[" + getIpAddr() + "] TtCouponController::list");
if (record == null) record = new TtCoupon(); if (record == null) record = new TtCoupon();
record.updateTenantInfo(getParentTenantInfo());
record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode());
if(StringUtils.isNotBlank(record.getSortColumn())){ if(StringUtils.isNotBlank(record.getSortColumn())){
String coryColumn = "c."+record.getSortColumns(); String coryColumn = "c."+record.getSortColumns();
@@ -161,6 +162,7 @@ public class TtCouponController extends BaseController {
public ResultData collectList(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) { public ResultData collectList(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] TtCouponController::collectList"); logger.debug("[" + getIpAddr() + "] TtCouponController::collectList");
if (record == null) record = new TtCoupon(); if (record == null) record = new TtCoupon();
record.updateTenantInfo(getParentTenantInfo());
Long memberId; Long memberId;
try { try {
memberId = getMemberId(); memberId = getMemberId();


+ 6
- 5
mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java Просмотреть файл

@@ -45,19 +45,20 @@ public class TtOrderController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
}) })
public ResultData list(@ModelAttribute TtOrder order, Integer pageNum, Integer pageSize) {
public ResultData list(@ModelAttribute TtOrder record, Integer pageNum, Integer pageSize) {
// c端用户应该只能看到自己的订单 // c端用户应该只能看到自己的订单
if (order == null){
order = new TtOrder();
if (record == null){
record = new TtOrder();
} }
record.updateTenantInfo(getParentTenantInfo());
Long memberId; Long memberId;
try { try {
memberId = getMemberId(); memberId = getMemberId();
} catch (MallinkException e) { } catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage());
} }
order.setCUserId(memberId);
return new ResultData(ttOrderService.listCAsPage(order, pageNum, pageSize));
record.setCUserId(memberId);
return new ResultData(ttOrderService.listCAsPage(record, pageNum, pageSize));
} }


@ApiOperation(value = "下订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") @ApiOperation(value = "下订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")


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

@@ -320,7 +320,6 @@ public class TtUserGrantController extends BaseController {
@ApiOperation(value = "授权后获取用户的手机号", notes = "{\"encryptedData\":\"string\",\"iv\":\"string\"}") @ApiOperation(value = "授权后获取用户的手机号", notes = "{\"encryptedData\":\"string\",\"iv\":\"string\"}")
public ResultData getUserPhone(@RequestBody Map<String, String> map) { public ResultData getUserPhone(@RequestBody Map<String, String> map) {
logger.info(map.toString()); logger.info(map.toString());
TenantEntity tenantEntity = getTenantInfo();


String encryptedData = map.get("encryptedData"); String encryptedData = map.get("encryptedData");
String iv = map.get("iv"); String iv = map.get("iv");


+ 3
- 2
mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -43,7 +43,7 @@ public class WxMerchantController extends BaseController {
public ResultData list(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxMerchantDto wxMerchantDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); logger.debug("[" + getIpAddr() + "] WxMerchantController::list");
if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto(); if (null == wxMerchantDto) wxMerchantDto = new WxMerchantDto();
// wxMerchantDto.updateTenantInfo(getTenantInfo());
wxMerchantDto.updateTenantInfo(getParentTenantInfo());
wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); wxMerchantDto.setMerchantStatus(EnumMerchantStatus.VALID.getCode());
wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); wxMerchantDto.setIsPublic(EnumMerchantPublic.PUBLIC.getCode());
return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize)); return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize));
@@ -57,7 +57,7 @@ public class WxMerchantController extends BaseController {
public ResultData listV1(@ModelAttribute WxMerchant merchant, Integer pageNum, Integer pageSize) { public ResultData listV1(@ModelAttribute WxMerchant merchant, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); logger.debug("[" + getIpAddr() + "] WxMerchantController::list");
if (null == merchant) merchant = new WxMerchant(); if (null == merchant) merchant = new WxMerchant();
// merchant.updateTenantInfo(getTenantInfo());
merchant.updateTenantInfo(getParentTenantInfo());
merchant.setStatus(EnumMerchantStatus.VALID.getCode()); merchant.setStatus(EnumMerchantStatus.VALID.getCode());
merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode()); merchant.setIsPublic(EnumMerchantPublic.PUBLIC.getCode());
return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize)); return new ResultData(wxMerchantService.listAsPage(merchant, pageNum, pageSize));
@@ -128,6 +128,7 @@ public class WxMerchantController extends BaseController {
public ResultData followList(@ModelAttribute WxMerchant record, Integer pageNum, Integer pageSize) { public ResultData followList(@ModelAttribute WxMerchant record, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::followList"); logger.debug("[" + getIpAddr() + "] WxMerchantController::followList");
if (record == null) record = new WxMerchant(); if (record == null) record = new WxMerchant();
record.updateTenantInfo(getParentTenantInfo());
Long memberId; Long memberId;
try { try {
memberId = getMemberId(); memberId = getMemberId();


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