xiaohanzi 5 лет назад
Родитель
Сommit
cc808a4655
4 измененных файлов: 13 добавлений и 1 удалений
  1. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  3. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  4. +1
    -1
      mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java

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

@@ -142,6 +142,7 @@ public class WxCouponSendController extends BaseController {
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params.put("parentTenantId", tenantEntity.getParentTenantId()); params.put("parentTenantId", tenantEntity.getParentTenantId());
} }
params.put("finalTenantId", tenantEntity.getFinalTenantId());
params.put("channelType", channelType); params.put("channelType", channelType);
params.put("merchantId", getLoginBUser().getMerchantId()); params.put("merchantId", getLoginBUser().getMerchantId());
PageInfo<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize); PageInfo<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize);


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

@@ -58,6 +58,7 @@ public class WxMerchantBUserController extends BaseController {


@Autowired @Autowired
private WxScoreRulesService wxScoreRulesService; private WxScoreRulesService wxScoreRulesService;


@RedisCache @RedisCache
@ApiOperation("查寻当bUser详情接口") @ApiOperation("查寻当bUser详情接口")


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

@@ -20,12 +20,17 @@ public class TenantEntity extends BaseEntity {


@io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId") @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId")
protected String parentTenantId; protected String parentTenantId;
@io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId")
@TableField(exist = false)
protected String finalTenantId;


public void updateTenantInfo(TenantEntity info) { public void updateTenantInfo(TenantEntity info) {
setTenantId(info.getTenantId()); setTenantId(info.getTenantId());
if (StringUtils.isNotBlank(info.getParentTenantId())) { if (StringUtils.isNotBlank(info.getParentTenantId())) {
setParentTenantId(info.getParentTenantId()); setParentTenantId(info.getParentTenantId());
} }
setFinalTenantId(getFinalTenantId());
} }


public void updateTenantInfo(BaseTenantEntity info) { public void updateTenantInfo(BaseTenantEntity info) {
@@ -33,6 +38,7 @@ public class TenantEntity extends BaseEntity {
if (StringUtils.isNotBlank(info.getParentTenantId())) { if (StringUtils.isNotBlank(info.getParentTenantId())) {
setParentTenantId(info.getParentTenantId()); setParentTenantId(info.getParentTenantId());
} }
setFinalTenantId(getFinalTenantId());
} }


public String getFinalTenantId() { public String getFinalTenantId() {
@@ -58,4 +64,8 @@ public class TenantEntity extends BaseEntity {
public void setParentTenantId(String parentTenantId) { public void setParentTenantId(String parentTenantId) {
this.parentTenantId = parentTenantId; this.parentTenantId = parentTenantId;
} }

public void setFinalTenantId(String finalTenantId) {
this.finalTenantId = finalTenantId;
}
} }

+ 1
- 1
mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java Просмотреть файл

@@ -239,7 +239,7 @@ public class ShardingSpherePlugin implements MyBatisPlus {
return o; return o;
}catch(Exception e) { }catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
return null;
throw new RuntimeException(e);
} }
} }


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