diff --git a/eride-admin/src/main/resources/application.yml b/eride-admin/src/main/resources/application.yml index 0d73741..8a49902 100644 --- a/eride-admin/src/main/resources/application.yml +++ b/eride-admin/src/main/resources/application.yml @@ -95,7 +95,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 65535000 ## MyBatis配置 #mybatis: diff --git a/eride-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/eride-common/src/main/java/com/ruoyi/common/annotation/DataScope.java index 2cb2887..8155545 100644 --- a/eride-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/eride-common/src/main/java/com/ruoyi/common/annotation/DataScope.java @@ -17,19 +17,19 @@ import java.lang.annotation.Target; public @interface DataScope { /** - * 代理商的别名 + * 商户的别名 */ - public String agentAlias() default ""; + public String merchantAlias() default ""; /** * 用户表的别名 */ public String userAlias() default ""; - /** - * 只是用户隔离 如果是1，则只查询当前用户的数据 - */ - public String onlyUser() default ""; +// /** +// * 只是用户隔离 如果是1，则只查询当前用户的数据 +// */ +// public String onlyUser() default ""; /** * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来 diff --git a/eride-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/eride-common/src/main/java/com/ruoyi/common/annotation/Excel.java index 27e587d..238a516 100644 --- a/eride-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/eride-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -11,7 +11,7 @@ import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 - * + * * @author ruoyi */ @Retention(RetentionPolicy.RUNTIME) @@ -189,4 +189,4 @@ public @interface Excel return this.value; } } -} \ No newline at end of file +} diff --git a/eride-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java b/eride-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java index 3a3b88e..84fb4bb 100644 --- a/eride-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java +++ b/eride-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java @@ -193,7 +193,12 @@ public class ServiceConstants { /** * 车辆状态: 1-正常 */ - public static final String VEHICLE_STATUS_NORMAL_STR = "1"; + public static final String VEHICLE_STATUS_NORMAL_STR = "待租"; + + /** + * 车辆状态: 2-已绑定 + */ + public static final String VEHICLE_STATUS__BOUND_STR = "已绑定"; /** * 车辆状态: 3-使用中 diff --git a/eride-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/eride-common/src/main/java/com/ruoyi/common/constant/UserConstants.java index 96b149c..894c903 100644 --- a/eride-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/eride-common/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -2,7 +2,7 @@ package com.ruoyi.common.constant; /** * 用户常量信息 - * + * * @author ruoyi */ public class UserConstants @@ -53,7 +53,7 @@ public class UserConstants /** Layout组件标识 */ public final static String LAYOUT = "Layout"; - + /** ParentView组件标识 */ public final static String PARENT_VIEW = "ParentView"; diff --git a/eride-common/src/main/java/com/ruoyi/common/core/domain/entity/EUser.java b/eride-common/src/main/java/com/ruoyi/common/core/domain/entity/EUser.java index edeb51f..a90b878 100644 --- a/eride-common/src/main/java/com/ruoyi/common/core/domain/entity/EUser.java +++ b/eride-common/src/main/java/com/ruoyi/common/core/domain/entity/EUser.java @@ -122,6 +122,9 @@ public class EUser extends BaseEntity /** 角色组 */ private Long[] roleIds; + /** 角色ID */ + private Long roleId; + /** 服务费比例 */ @Excel(name = "服务费比例") private BigDecimal serviceFeeProportion; diff --git a/eride-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/eride-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index cdbcaf9..b2faff7 100644 --- a/eride-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/eride-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -32,25 +32,15 @@ public class DataScopeAspect */ public static final String DATA_SCOPE_ALL = "1"; -// /** -// * 自定数据权限 -// */ -// public static final String DATA_SCOPE_CUSTOM = "2"; - /** - * 部门数据权限 + * 商家数据权限 */ public static final String DATA_SCOPE_DEPT = "3"; -// /** -// * 部门及以下数据权限 -// */ -// public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; - -// /** -// * 仅本人数据权限 -// */ -// public static final String DATA_SCOPE_SELF = "5"; + /** + * 仅本人数据权限 + */ + public static final String DATA_SCOPE_SELF = "5"; /** * 数据权限过滤关键字 @@ -75,8 +65,7 @@ public class DataScopeAspect if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) { String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext()); - dataScopeFilter(joinPoint, currentUser, controllerDataScope.agentAlias(), - controllerDataScope.userAlias(), controllerDataScope.onlyUser(),permission); + dataScopeFilter(joinPoint, currentUser, controllerDataScope.merchantAlias(), controllerDataScope.userAlias(), permission); } } } @@ -86,12 +75,10 @@ public class DataScopeAspect * * @param joinPoint 切点 * @param user 用户 - * @param agentAlias 部门别名 * @param userAlias 用户别名 - * @param onlyUser 只做用户隔离 * @param permission 权限字符 */ - public static void dataScopeFilter(JoinPoint joinPoint, EUserVO user, String agentAlias, String userAlias, String onlyUser, String permission) + public static void dataScopeFilter(JoinPoint joinPoint, EUserVO user, String merchantAlias, String userAlias, String permission) { StringBuilder sqlString = new StringBuilder(); List conditions = new ArrayList(); @@ -112,16 +99,20 @@ public class DataScopeAspect }else if (DATA_SCOPE_DEPT.equals(dataScope)){ // 如果是代理商则用 a 来查询 // 如果是商户则用 u 来查询 onlyUser.equals("1") + sqlString.append(StringUtils.format(" OR {}.user_id = {} ", merchantAlias, user.getUserId())); + }else if (DATA_SCOPE_SELF.equals(dataScope)){ + // 如果是本人权限 用不同的别名来表示 u2 + // 如果是商户则用 u 来查询 onlyUser.equals("1") sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); } conditions.add(dataScope); } // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据 - if (StringUtils.isEmpty(conditions)) - { - sqlString.append(StringUtils.format(" OR {}.user_id = 0 ", agentAlias)); - } +// if (StringUtils.isEmpty(conditions)) +// { +// sqlString.append(StringUtils.format(" OR {}.isolate_id = 0 ", agentAlias)); +// } if (StringUtils.isNotBlank(sqlString.toString())) { diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/eride-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java index 6e8c416..56662dd 100644 --- a/eride-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/eride-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -5,14 +5,14 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post - * + * * @author ruoyi */ public class SysUserPost { /** 用户ID */ private Long userId; - + /** 岗位ID */ private Long postId; diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/eride-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index 4d15810..8ae6d0c 100644 --- a/eride-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/eride-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -5,14 +5,14 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role - * + * * @author ruoyi */ public class SysUserRole { /** 用户ID */ private Long userId; - + /** 角色ID */ private Long roleId; diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/order/EOrder.java b/eride-system/src/main/java/com/ruoyi/system/domain/order/EOrder.java index 7f0c157..65d76c7 100644 --- a/eride-system/src/main/java/com/ruoyi/system/domain/order/EOrder.java +++ b/eride-system/src/main/java/com/ruoyi/system/domain/order/EOrder.java @@ -247,6 +247,12 @@ public class EOrder extends BaseEntity { @Excel(name = "支付渠道id") private Long payChannel; + /** + * 支付渠道名称 + */ + @Excel(name = "支付渠道名称") + private String channelName; + /** * 配送方式 */ diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EAccessoryServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EAccessoryServiceImpl.java index 69b4c10..fffb3c0 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EAccessoryServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EAccessoryServiceImpl.java @@ -42,7 +42,7 @@ public class EAccessoryServiceImpl implements IEAccessoryService * @return 配件 */ @Override - @DataScope(agentAlias = "ag",userAlias = "u") + @DataScope(merchantAlias = "m") public List selectRlAccessoryList(EAccessory rlAccessory) { return rlAccessoryMapper.selectRlAccessoryList(rlAccessory); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleClassifyServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleClassifyServiceImpl.java index e873c57..1b1f435 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleClassifyServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleClassifyServiceImpl.java @@ -38,7 +38,7 @@ public class EArticleClassifyServiceImpl implements IEArticleClassifyService * @return 分类信息集合 */ @Override - @DataScope(agentAlias = "a") +// @DataScope(agentAlias = "a") public List selectClassifyListWithIsolate(AsArticleClassify classify) { return articleClassifyMapper.selectClassifyList(classify); @@ -63,7 +63,7 @@ public class EArticleClassifyServiceImpl implements IEArticleClassifyService * @return 分类树信息集合 */ @Override - @DataScope(agentAlias = "a") +// @DataScope(agentAlias = "a") public List selectClassifyTreeList(AsArticleClassify classify) { List depts = selectClassifyListWithIsolate(classify); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleServiceImpl.java index 217008a..8e62b5b 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EArticleServiceImpl.java @@ -60,7 +60,7 @@ public class EArticleServiceImpl implements IEArticleService * @return 文章 */ @Override - @DataScope(agentAlias = "ag") + @DataScope(userAlias = "u") public List selectAsArticleListByIsolate(EtArticle etArticle) { List etArticles = rlArticleMapper.selectAsArticleList(etArticle); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EChangeBalanceServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EChangeBalanceServiceImpl.java index 6009142..2eafdf8 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EChangeBalanceServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EChangeBalanceServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.changeBalance.EChangeBalance; @@ -52,7 +53,7 @@ public class EChangeBalanceServiceImpl implements IEChangeBalanceService * @return 余额变动 */ @Override -// @DataScope(userAlias = "u",onlyUser = "1") + @DataScope(merchantAlias = "u") public List selectRlChangeBalanceList(EChangeBalance rlChangeBalance) { return rlChangeBalanceMapper.selectRlChangeBalanceList(rlChangeBalance); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java index 595d6d9..9c561cb 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java @@ -244,7 +244,7 @@ public class EDeviceServiceImpl extends ServiceImpl impl * @return 设备 */ @Override - @DataScope(agentAlias = "d") + @DataScope(merchantAlias = "m", userAlias = "u") public List selectEDeviceListWithIsolate(EDeviceQuery asDevice) { if(ServiceConstants.VEHICLE_STATUS_NOT_BAND.equals(asDevice.getStatus())){ diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EFeeRuleServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EFeeRuleServiceImpl.java index 91aa243..402aab6 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EFeeRuleServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EFeeRuleServiceImpl.java @@ -40,7 +40,7 @@ public class EFeeRuleServiceImpl implements IEFeeRuleService * @return 收费模板 */ @Override - @DataScope(agentAlias = "a",userAlias = "u") + @DataScope(merchantAlias = "m") public List selectRlFeeRuleList(EFeeRule rlFeeRule) { return rlFeeRuleMapper.selectRlFeeRuleList(rlFeeRule); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelServiceImpl.java index e79d793..4a50f9c 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.EFunction; import com.ruoyi.system.domain.device.EDevice; @@ -66,7 +67,7 @@ public class EModelServiceImpl implements IEModelService * @return 车辆型号 */ @Override -// @DataScope(deptAlias = "d") + @DataScope(merchantAlias = "m") public List selectEModelList(EModel eModel) { return eModelMapper.selectEModelList(eModel); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EOperatingAreaServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EOperatingAreaServiceImpl.java index a381959..c2f1de7 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EOperatingAreaServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EOperatingAreaServiceImpl.java @@ -54,7 +54,7 @@ public class EOperatingAreaServiceImpl implements IEOperatingAreaService * @return 运营区 */ @Override - @DataScope(agentAlias = "a",userAlias = "u") + @DataScope(merchantAlias = "m", userAlias = "u") public List selectRlOperatingAreaList(EOperatingArea rlOperatingArea) { return rlOperatingAreaMapper.selectRlOperatingAreaList(rlOperatingArea); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EOrderServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EOrderServiceImpl.java index e76ceb3..295933b 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EOrderServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EOrderServiceImpl.java @@ -252,7 +252,7 @@ public class EOrderServiceImpl implements IEOrderService * @return 订单 */ @Override -// @DataScope(userAlias = "u") + @DataScope(merchantAlias = "m", userAlias = "u") public List selectRlOrderList(EOrderQuery rlOrder) { return orderMapper.selectRlOrderList(rlOrder); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/ERefundServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/ERefundServiceImpl.java index bcb3cb2..df0c75f 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/ERefundServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/ERefundServiceImpl.java @@ -79,8 +79,8 @@ public class ERefundServiceImpl implements IERefundService * @param rlRefund 退款订单 * @return 退款订单 */ - @DataScope(agentAlias = "a") @Override + @DataScope(merchantAlias = "m", userAlias = "u") public List selectEtRefundListWithIsolate(ERefund rlRefund) { return etRefundMapper.selectEtRefundList(rlRefund); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EShareKeyServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EShareKeyServiceImpl.java index 3709dfe..b7a8382 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EShareKeyServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EShareKeyServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; import cn.hutool.core.util.StrUtil; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.ServiceConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,6 +45,7 @@ public class EShareKeyServiceImpl implements IEShareKeyService * @return 共享钥匙 */ @Override + @DataScope(merchantAlias = "m", userAlias = "u") public List selectEShareKeyList(EShareKey eShareKey) { return eShareKeyMapper.selectEShareKeyList(eShareKey); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EUserServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EUserServiceImpl.java index 8d75d4a..f2ab17c 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EUserServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EUserServiceImpl.java @@ -131,7 +131,7 @@ public class EUserServiceImpl implements IEUserService{ * @return 用户信息集合信息 */ @Override - @DataScope(agentAlias = "a",userAlias = "u") + @DataScope(userAlias = "u") public List selectUserList(EUserQuery user) { /** 获取设备绑定数量*/ @@ -158,7 +158,7 @@ public class EUserServiceImpl implements IEUserService{ * @return 用户信息集合信息 */ @Override -// @DataScope(deptAlias = "d", userAlias = "u") + @DataScope(userAlias = "u") public List selectAllocatedList(EUser user) { return userMapper.selectAllocatedList(user); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EWithdrawServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EWithdrawServiceImpl.java index cbab777..ddde109 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EWithdrawServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EWithdrawServiceImpl.java @@ -43,7 +43,7 @@ public class EWithdrawServiceImpl implements IEWithdrawService * @return 提现记录 */ @Override - @DataScope(userAlias = "u",onlyUser = "1") + @DataScope(merchantAlias = "u") public List selectRlWithdrawList(EWithdraw rlWithdraw) { return rlWithdrawMapper.selectRlWithdrawList(rlWithdraw); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 57a7bcd..c11fe58 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -43,7 +43,7 @@ public class SysDeptServiceImpl implements ISysDeptService * @return 部门信息集合 */ @Override - @DataScope(agentAlias = "d") + @DataScope(userAlias = "u") public List selectDeptList(SysDept dept) { return deptMapper.selectDeptList(dept); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index ca84fc5..a42f6e6 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -54,7 +54,7 @@ public class SysRoleServiceImpl implements ISysRoleService * @return 角色数据集合信息 */ @Override - @DataScope(agentAlias = "d") + @DataScope(userAlias = "u") public List selectRoleList(SysRole role) { return roleMapper.selectRoleList(role); diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java index dd2e80e..bd613b2 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java @@ -101,6 +101,7 @@ public class WxPayService implements IWxPayService { order1.setOrderId(order.getOrderId()); order1.setPayChannel(payChannel); + order1.setChannelName(channelVO.getName()); int updateEtOrder = orderService.updateRlOrder(order1); if(updateEtOrder == 0){ throw new ServiceException("更新订单outTradeNo失败"); diff --git a/eride-system/src/main/resources/mapper/system/EAccessoryMapper.xml b/eride-system/src/main/resources/mapper/system/EAccessoryMapper.xml index 1baee8e..671b41d 100644 --- a/eride-system/src/main/resources/mapper/system/EAccessoryMapper.xml +++ b/eride-system/src/main/resources/mapper/system/EAccessoryMapper.xml @@ -7,9 +7,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select a.accessory_id, a.name, a.status, a.create_by, a.create_time, a.update_time, m.model from e_accessory a + select a.accessory_id, a.name, a.status, a.create_by, a.create_time, a.update_time, mo.model,a.merchant_id from e_accessory a left join e_model_accessory ma on a.accessory_id = ma.accessory_id - left join e_model m on m.model_id = ma.model_id + left join e_model mo on mo.model_id = ma.model_id + left join e_user m on m.user_id = a.merchant_id - select r.rule_id, r.rental_unit, r.price, r.`explain`, r.instructions, r.out_unit, r.out_price, r.agent_id from e_fee_rule r - where del_flag = '0' + select r.rule_id, r.rental_unit, r.price, r.`explain`, r.instructions, r.out_unit, r.out_price, r.merchant_id from e_fee_rule r + left join e_user m on m.user_id = r.merchant_id + where r.del_flag = '0' and r.rental_unit = #{rentalUnit} and r.price = #{price} and r.`explain` = #{explain} @@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" instructions, out_unit, out_price, + merchant_id, #{rentalUnit}, @@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{instructions}, #{outUnit}, #{outPrice}, + #{merchantId}, @@ -71,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" out_unit = #{outUnit}, out_price = #{outPrice}, del_flag = #{delFlag}, + merchant_id = #{merchantId}, where rule_id = #{ruleId} diff --git a/eride-system/src/main/resources/mapper/system/EModelMapper.xml b/eride-system/src/main/resources/mapper/system/EModelMapper.xml index 0233412..0f04f99 100644 --- a/eride-system/src/main/resources/mapper/system/EModelMapper.xml +++ b/eride-system/src/main/resources/mapper/system/EModelMapper.xml @@ -8,40 +8,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select model_id, model, brand_id, brand_name, full_voltage, low_voltage, full_endurance, create_by, create_time, - update_by, update_time, remark, intro, deposit, picture, del_flag from e_model + update_by, update_time, remark, intro, deposit, merchant_id, picture, del_flag from e_model diff --git a/eride-system/src/main/resources/mapper/system/EOrderMapper.xml b/eride-system/src/main/resources/mapper/system/EOrderMapper.xml index e15b228..9ecbfda 100644 --- a/eride-system/src/main/resources/mapper/system/EOrderMapper.xml +++ b/eride-system/src/main/resources/mapper/system/EOrderMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select order_id, order_no, out_trade_no, user_id, user_name, real_name, phone, rule_id, device_mac, sn, pay_time, pay_type, paid, type, total_fee, pay_fee, deposit, overdue_fee, dispatch_fee,delivery_fee, lease_fee, mark, duration, status, create_time, return_time, deposit_deduction, deposit_order_no, deduction_amount, used_sn, change_reason, - auto_refund_deposit, rental_unit, handling_charge, platform_service_fee, operator_dividend, pay_channel, delivery_method, pickup_time, + auto_refund_deposit, rental_unit, handling_charge, platform_service_fee, operator_dividend, pay_channel, channel_name, delivery_method, pickup_time, , store_name, merchant_id, pickup_city, pickup_loc, pickup_lon, pickup_lat, model_id, model, expiry_time, original_order_no, num, price, `explain`, instructions, out_unit, out_price,return_type,return_method,return_address,auto_cancel_time,cost, is_overdue,is_send_msg from e_order @@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.platform_service_fee, o.operator_dividend, o.pay_channel, + o.channel_name, o.delivery_method, o.pickup_time, o.store_id, @@ -72,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" o.out_unit, o.out_price, u.user_name as userName, - m.model, + mo.model, r.rental_unit as rentalUnit, o.return_type, o.return_method, @@ -106,8 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM e_order o left join e_user u on o.user_id = u.user_id + left join e_user m on o.merchant_id = m.user_id left join e_fee_rule r on o.rule_id = r.rule_id - left join e_model m on o.model_id = m.model_id + left join e_model mo on o.model_id = mo.model_id select r.id, r.refund_no, r.order_no, r.user_id, u.user_name userName, r.amount, r.dispatch_fee, r.delivery_fee, - r.lease_fee, r.deposit, r.type, r.reason, r.create_time, r.item_desc,r.refund_result from e_refund r + r.lease_fee, r.deposit, r.type, r.reason, r.create_time, r.item_desc,r.refund_result,r.merchant_id from e_refund r INNER JOIN e_order o on o.order_no = r.order_no left join e_user u on u.user_id = r.user_id --- LEFT JOIN e_operating_area oa ON o.area_id = oa.area_id --- LEFT join et_area_dept ad on ad.area_id = oa.area_id --- LEFT join sys_dept d on d.dept_id = ad.dept_id + left join e_user m on m.user_id = r.merchant_id where 1 = 1 and r.refund_no = #{refundNo} and r.order_no like concat('%', #{orderNo}, '%') @@ -65,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, item_desc, refund_result, + merchant_id, #{id}, @@ -81,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{itemDesc}, #{refund_result}, + #{merchantId}, @@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, item_desc = #{itemDesc}, refund_result = #{refundResult}, + merchant_id = #{merchantId}, where id = #{id} @@ -117,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, item_desc = #{itemDesc}, refund_result = #{refundResult}, + merchant_id = #{merchantId}, where refund_no = #{refundNo} diff --git a/eride-system/src/main/resources/mapper/system/EShareKeyMapper.xml b/eride-system/src/main/resources/mapper/system/EShareKeyMapper.xml index ab41ec6..17f1663 100644 --- a/eride-system/src/main/resources/mapper/system/EShareKeyMapper.xml +++ b/eride-system/src/main/resources/mapper/system/EShareKeyMapper.xml @@ -23,7 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where d.del_flag = '0' @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} order by d.parent_id, d.order_num - + - + - + - + - + - + - + - + insert into sys_dept( dept_id, @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_dept @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_id = #{deptId} - + update sys_dept set ancestors = - + - update sys_dept set status = '0' where dept_id in + update sys_dept set status = '0' where dept_id in #{deptId} - + update sys_dept set del_flag = '2' where dept_id = #{deptId} - \ No newline at end of file + diff --git a/eride-system/src/main/resources/mapper/system/SysMenuMapper.xml b/eride-system/src/main/resources/mapper/system/SysMenuMapper.xml index 84e87c9..a10fff0 100644 --- a/eride-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/eride-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,10 +29,10 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time from sys_menu - + - + - + - + - + - + - + - + - + - + - + update sys_menu @@ -198,9 +198,9 @@ sysdate() ) - + delete from sys_menu where menu_id = #{menuId} - \ No newline at end of file + diff --git a/eride-system/src/main/resources/mapper/system/SysPostMapper.xml b/eride-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c459..f528268 100644 --- a/eride-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/eride-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -16,12 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark from sys_post - + - + - + - + - + - + - + - + update sys_post @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, @@ -107,16 +107,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + delete from sys_post where post_id = #{postId} - + delete from sys_post where post_id in #{postId} - + - \ No newline at end of file + diff --git a/eride-system/src/main/resources/mapper/system/SysRoleMapper.xml b/eride-system/src/main/resources/mapper/system/SysRoleMapper.xml index 955d4ee..4164399 100644 --- a/eride-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/eride-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -20,16 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark + r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + left join e_user u on u.user_id = ur.user_id - + - + - + - + - + - + - + - + - + insert into sys_role( role_id, @@ -120,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update sys_role @@ -137,16 +136,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where role_id = #{roleId} - + update sys_role set del_flag = '2' where role_id = #{roleId} - + update sys_role set del_flag = '2' where role_id in #{roleId} - + - - \ No newline at end of file + + diff --git a/eride-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/eride-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..912f9df 100644 --- a/eride-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/eride-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -12,23 +12,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_user_post where user_id=#{userId} - + - + delete from sys_user_post where user_id in #{userId} - + - + insert into sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId}) - - \ No newline at end of file + + diff --git a/eride-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/eride-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..71d8480 100644 --- a/eride-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/eride-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -12,33 +12,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_user_role where user_id=#{userId} - + - + delete from sys_user_role where user_id in #{userId} - + - + insert into sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId}) - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} - + delete from sys_user_role where role_id=#{roleId} and user_id in #{userId} - + - \ No newline at end of file + diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index a8647d2..6eaf282 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -698,4 +698,4 @@ create table gen_table_column ( update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', primary key (column_id) -) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; \ No newline at end of file +) engine=innodb auto_increment=1 comment = '代码生成业务表字段';