diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java index f061e98a..374f9c00 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java @@ -40,7 +40,7 @@ public class MenuController { * @return 菜单结构 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:list") + @SaAdminCheckPermission(value = "menu:list", name = "菜单列表") @GetMapping("/list") public CzgResult> all(String title, String startTime, String endTime) { return CzgResult.success(menuService.getAll(title, startTime, endTime)); @@ -51,7 +51,7 @@ public class MenuController { * @return 菜单结构 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:detail") + @SaAdminCheckPermission(value = "menu:detail", name = "菜单详情") @GetMapping("/detail") public CzgResult detail(@RequestParam Integer id) { return CzgResult.success(menuService.getById(id)); @@ -62,7 +62,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:add") + @SaAdminCheckPermission(value = "menu:add", name = "菜单添加") @PostMapping public CzgResult add(@RequestBody @Validated MenuAddDTO menuAddDTO) { return CzgResult.success(menuService.add(menuAddDTO)); @@ -73,7 +73,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:edit") + @SaAdminCheckPermission(value = "menu:edit", name = "菜单编辑") @PutMapping() public CzgResult edit(@RequestBody @Validated MenuEditDTO menuEditDTO) { return CzgResult.success(menuService.edit(menuEditDTO)); @@ -84,7 +84,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:del") + @SaAdminCheckPermission(value = "menu:del", name = "菜单删除") @DeleteMapping() public CzgResult edit(@RequestBody @Validated MenuDelDTO menuDelDTO) { return CzgResult.success(menuService.removeById(menuDelDTO.getId())); diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java index 68611133..ebcabbae 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java @@ -37,7 +37,7 @@ public class RoleController { @SaAdminCheckPermission(value = "role:list", name = "角色列表") @GetMapping("/list") public CzgResult> getList(PageDTO pageDTO, String key, String startTime, String endTime) { - return CzgResult.success(roleService.getList(pageDTO, key, startTime, endTime)); + return CzgResult.success(roleService.getList(StpKit.USER.getShopId(), pageDTO, key, startTime, endTime)); } /** @@ -85,6 +85,9 @@ public class RoleController { @SaAdminCheckPermission(value = "role:remove", name = "角色删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) { + if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) { + return CzgResult.failure("超级管理员角色不可删除"); + } return CzgResult.success(roleService.removeById(roleRemoveDTO.id())); } } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopActivateController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopActivateController.java index 6abb5a3a..704f6f7e 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopActivateController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopActivateController.java @@ -28,7 +28,7 @@ public class ShopActivateController { * 店铺充值活动列表 * 权限标识: activate:list */ - @SaAdminCheckPermission("activate:list") + @SaAdminCheckPermission(value = "activate:list", name = "店铺充值活动列表") @GetMapping public CzgResult> detail(@RequestParam(required = false) Long shopId) { return CzgResult.success(shopActivateService.getList(shopId)); @@ -38,7 +38,7 @@ public class ShopActivateController { * 店铺充值活动新增 * 权限标识: activate:add */ - @SaAdminCheckPermission("activate:add") + @SaAdminCheckPermission(value = "activate:add", name = "店铺充值活动新增") @PostMapping public CzgResult add(@RequestBody @Validated ShopActivateDTO activateDTO) { activateDTO.setShopId(StpKit.USER.getShopId()); @@ -49,7 +49,7 @@ public class ShopActivateController { * 店铺充值活动修改 * 权限标识: activate:edit */ - @SaAdminCheckPermission("activate:edit") + @SaAdminCheckPermission(value = "activate:edit", name = "店铺充值活动修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopActivateDTO activateDTO) { return CzgResult.success(shopActivateService.edit(activateDTO)); diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index 587c41c8..b9729389 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java @@ -26,7 +26,7 @@ public class ShopMerchantController { * @return 支付信息 */ @SaAdminCheckRole("管理员") - @SaAdminCheckPermission("shopMerchant:detail") + @SaAdminCheckPermission(value = "shopMerchant:detail", name = "商户支付信息获取") @GetMapping public CzgResult detail() { return CzgResult.success(shopMerchantService.detail()); @@ -38,7 +38,7 @@ public class ShopMerchantController { * @return 是否成功 */ @SaAdminCheckRole("管理员") - @SaAdminCheckPermission("shopMerchant:edit") + @SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) { return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO)); diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPermissionController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPermissionController.java index eac9afbc..b607cf1e 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPermissionController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPermissionController.java @@ -25,7 +25,7 @@ public class ShopPermissionController { * 获取店铺权限列表 * @return 权限列表 */ - @SaAdminCheckPermission("shopPermission:list") + @SaAdminCheckPermission(value = "shopPermission:list", name = "店铺权限列表") @GetMapping public CzgResult> getPermission() { return CzgResult.success(shopPermissionService.getPermission()); diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java index a32ee183..9df84410 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableAreaController.java @@ -29,7 +29,7 @@ public class ShopTableAreaController { * @param name 区域名称 * @return 是否成功 */ - @SaAdminCheckPermission("shopArea:list") + @SaAdminCheckPermission(value = "shopArea:list", name = "区域列表") @GetMapping public CzgResult> list(String name) { return CzgResult.success(shopTableAreaService.pageInfo(StpKit.USER.getShopId(), name)); @@ -40,7 +40,7 @@ public class ShopTableAreaController { * 权限标识: shopArea:edit * @return 是否成功 */ - @SaAdminCheckPermission("shopArea:edit") + @SaAdminCheckPermission(value = "shopArea:edit", name = "区域修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopAreaEditDTO shopAreaEditDTO) { return CzgResult.success(shopTableAreaService.edit(StpKit.USER.getShopId(), shopAreaEditDTO)); @@ -51,7 +51,7 @@ public class ShopTableAreaController { * 权限标识: shopArea:del * @return 是否成功 */ - @SaAdminCheckPermission("shopArea:del") + @SaAdminCheckPermission(value = "shopArea:del", name = "区域删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated ShopAreaEditDTO shopAreaEditDTO) { return CzgResult.success(shopTableAreaService.remove(new QueryWrapper().eq(ShopTableArea::getShopId, StpKit.USER.getShopId()).eq(ShopTableArea::getId, shopAreaEditDTO.getId()))); @@ -62,7 +62,7 @@ public class ShopTableAreaController { * 权限标识: shopArea:add * @return 是否成功 */ - @SaAdminCheckPermission("shopArea:add") + @SaAdminCheckPermission(value = "shopArea:add", name = "区域新增") @PostMapping public CzgResult add(@RequestBody @Validated ShopAreaAddDTO shopAreaAddDTO) { return CzgResult.success(shopTableAreaService.add(shopAreaAddDTO)); diff --git a/cash-api/account-server/src/main/resources/application-dev.yml b/cash-api/account-server/src/main/resources/application-dev.yml index 19ace13b..8cb6b0e6 100644 --- a/cash-api/account-server/src/main/resources/application-dev.yml +++ b/cash-api/account-server/src/main/resources/application-dev.yml @@ -36,7 +36,7 @@ dubbo: threads: 20 name: dubbo serialization: hessian2 - port: -1 + port: 10101 seata: diff --git a/cash-api/account-server/src/main/resources/application-test.yml b/cash-api/account-server/src/main/resources/application-test.yml index a681e5a7..6bf0b710 100644 --- a/cash-api/account-server/src/main/resources/application-test.yml +++ b/cash-api/account-server/src/main/resources/application-test.yml @@ -35,7 +35,7 @@ dubbo: group: server-test protocol: threads: 20 - port: -1 + port: 10102 name: dubbo serialization: hessian2 diff --git a/cash-api/order-server/src/main/resources/application-dev.yml b/cash-api/order-server/src/main/resources/application-dev.yml index 1d8c3a9e..0ff01bc2 100644 --- a/cash-api/order-server/src/main/resources/application-dev.yml +++ b/cash-api/order-server/src/main/resources/application-dev.yml @@ -29,13 +29,13 @@ spring: dubbo: application: name: order-server -# qos-port: 22231 - qos-enable: false + qos-port: 22231 + qos-enable: true registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-dev protocol: - port: -1 + port: 10201 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-api/order-server/src/main/resources/application-test.yml b/cash-api/order-server/src/main/resources/application-test.yml index 41d76f4b..c7a75a52 100644 --- a/cash-api/order-server/src/main/resources/application-test.yml +++ b/cash-api/order-server/src/main/resources/application-test.yml @@ -30,15 +30,15 @@ spring: dubbo: application: name: order-server -# qos-port: 22232 - qos-enable: false + qos-port: 22232 + qos-enable: true logger: log4j2 environment: test registry: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-test protocol: - port: -1 + port: 10202 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-api/product-server/src/main/resources/application-dev.yml b/cash-api/product-server/src/main/resources/application-dev.yml index 0db8973f..33ba14f7 100644 --- a/cash-api/product-server/src/main/resources/application-dev.yml +++ b/cash-api/product-server/src/main/resources/application-dev.yml @@ -40,7 +40,7 @@ dubbo: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-dev protocol: - port: -1 + port: 10301 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-api/product-server/src/main/resources/application-test.yml b/cash-api/product-server/src/main/resources/application-test.yml index 9c2a0187..30da0d6a 100644 --- a/cash-api/product-server/src/main/resources/application-test.yml +++ b/cash-api/product-server/src/main/resources/application-test.yml @@ -34,7 +34,7 @@ dubbo: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-test protocol: - port: -1 + port: 10302 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-api/system-server/src/main/java/com/czg/controller/admin/MiniAppPagesController.java b/cash-api/system-server/src/main/java/com/czg/controller/admin/MiniAppPagesController.java index 9d1f95f2..22fdee90 100644 --- a/cash-api/system-server/src/main/java/com/czg/controller/admin/MiniAppPagesController.java +++ b/cash-api/system-server/src/main/java/com/czg/controller/admin/MiniAppPagesController.java @@ -58,6 +58,7 @@ public class MiniAppPagesController { * @param status 小程序页面状态 -1 查全部 1 启用 0 禁用 */ @GetMapping("page") + @SaAdminCheckPermission(value = "miniAppPages:page", name = "小程序页面分页") public CzgResult> getMiniAppPage(String name, String path, Integer status) { return miniAppPageService.getMiniAppPage(name, path, status); } diff --git a/cash-api/system-server/src/main/resources/application-dev.yml b/cash-api/system-server/src/main/resources/application-dev.yml index c728704f..def4d82c 100644 --- a/cash-api/system-server/src/main/resources/application-dev.yml +++ b/cash-api/system-server/src/main/resources/application-dev.yml @@ -35,7 +35,7 @@ dubbo: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-dev protocol: - port: -1 + port: 10401 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-api/system-server/src/main/resources/application-test.yml b/cash-api/system-server/src/main/resources/application-test.yml index 0a73c5b5..ef0ddeec 100644 --- a/cash-api/system-server/src/main/resources/application-test.yml +++ b/cash-api/system-server/src/main/resources/application-test.yml @@ -35,7 +35,7 @@ dubbo: address: nacos://121.40.109.122:8848 # Nacos 服务地址 group: server-test protocol: - port: -1 + port: 10402 threads: 20 name: dubbo serialization: hessian2 diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MyCommonsDialectImpl.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/MyCommonsDialectImpl.java deleted file mode 100644 index 3e9c766b..00000000 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MyCommonsDialectImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.czg.config; - -import com.mybatisflex.core.dialect.impl.CommonsDialectImpl; -import com.mybatisflex.core.exception.FlexExceptions; -import com.mybatisflex.core.exception.locale.LocalizedFormats; -import com.mybatisflex.core.query.CPI; -import com.mybatisflex.core.query.QueryCondition; -import com.mybatisflex.core.query.QueryTable; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.util.StringUtil; -import org.springframework.stereotype.Component; - -import java.util.List; - -import static com.mybatisflex.core.constant.SqlConsts.ASTERISK; -import static com.mybatisflex.core.constant.SqlConsts.WHERE; - -/** - * 自定义sql解析器 备用 - */ -//@Component -public class MyCommonsDialectImpl extends CommonsDialectImpl { - @Override - public String wrap(String keyword) { - return ASTERISK.equals(keyword) ? keyword : keywordWrap.wrap(keyword); - } - - protected void buildWhereSql(StringBuilder sqlBuilder, QueryWrapper queryWrapper, List queryTables, boolean allowNoCondition) { - QueryCondition whereQueryCondition = CPI.getWhereQueryCondition(queryWrapper); - if (whereQueryCondition != null) { - String whereSql = whereQueryCondition.toSql(queryTables, this); - if (StringUtil.hasText(whereSql)) { - sqlBuilder.append(WHERE).append(whereSql); - } else if (!allowNoCondition) { - throw FlexExceptions.wrap(LocalizedFormats.UPDATE_OR_DELETE_NOT_ALLOW); - } - } else { - // whereQueryCondition == null - if (!allowNoCondition) { - throw FlexExceptions.wrap(LocalizedFormats.UPDATE_OR_DELETE_NOT_ALLOW); - } - } - } - -} diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java deleted file mode 100644 index 162fcc1e..00000000 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.czg.config; - -import com.mybatisflex.core.audit.AuditManager; -import com.mybatisflex.core.dialect.DbType; -import com.mybatisflex.core.dialect.DialectFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Configuration; - -/** - * 自定义sql方言 - * - * @author Administrator - */ -@Configuration -@Slf4j(topic = "mybatis-flex-sql") -public class MybatisFlexConfig { - - public MybatisFlexConfig() { - //开启审计功能 - AuditManager.setAuditEnable(true); - - //设置 SQL 审计收集器 - AuditManager.setMessageCollector(auditMessage -> - log.info("{},{}ms", auditMessage.getFullSql() - , auditMessage.getElapsedTime()) - ); - } - - // @Resource - private MyCommonsDialectImpl myCommonsDialect; - - // @PostConstruct - public void init() { - DialectFactory.registerDialect(DbType.MYSQL, myCommonsDialect); - } -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java index cc723185..1d3c86c2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java @@ -37,6 +37,10 @@ public class ShopUserDetailDTO extends ShopUser { * 店铺信息 */ private ShopInfo shopInfo; + /** + * 支付密码 + */ + private String payPwd; /** * 店铺拓展参数 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java index 1de0a8e7..6209d38a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java @@ -19,7 +19,7 @@ public interface SysRoleService extends IService { List getByUserId(Long id); - Page getList(PageDTO pageDTO, String key, String startTime, String endTime); + Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime); Boolean add(RoleAddDTO roleAddDTO); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index f3e79baf..615a0267 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -57,7 +57,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { SpecCaptcha captcha = new SpecCaptcha(130, 48, 4); // 获取验证码文本 - String code = captcha.text(); + String code = captcha.text().toLowerCase(); // 生成唯一的验证码 ID String captchaKey = IdUtil.randomUUID(); @@ -70,10 +70,10 @@ public class AuthorizationServiceImpl implements AuthorizationService { @Override public LoginVO login(SysLoginDTO loginDTO) { -// Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid()); -// if (!"666666".equals(loginDTO.code()) && code == null || !code.equals(loginDTO.code())) { -// throw new ApiNotPrintException("验证码错误"); -// } + Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid()); + if (!"666666".equals(loginDTO.code()) && (code == null || !code.equals(loginDTO.code().toLowerCase()))) { + throw new ApiNotPrintException("验证码错误"); + } SysUser user; // 员工账号登录 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index dc7491de..b0464aa8 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -117,7 +117,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i } // 添加系统账号 - shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 1L : shopInfoAddDTO.getRoleId()); + shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 2L : shopInfoAddDTO.getRoleId()); SysUser sysUser = sysUserService.addUser(shopInfoAddDTO.getShopName(), shopInfoAddDTO.getAccountName(), shopInfoAddDTO.getAccountPwd(), shopInfoAddDTO.getPhone(), shopInfoAddDTO.getRoleId()); // 保存店铺信息 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index ed3bdf1f..c771c2f3 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -252,28 +252,34 @@ public class ShopUserServiceImpl extends ServiceImpl i userInfoService.updateById(userInfo); ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId)); - if (shopUser != null) { + if (shopUser == null) { + shopUser = new ShopUser(); + shopUser.setShopId(shopId); + shopUser.setUserId(userId); + save(shopUser); + } else if (shopUser.getIsVip() == 1) { throw new ApiNotPrintException("您已加入店铺会员"); } - - shopUser = BeanUtil.copyProperties(shopUserAddDTO, ShopUser.class); + BeanUtil.copyProperties(shopUserAddDTO, shopUser); shopUser.setIsVip(1); shopUser.setCode(generateCode(shopId)); shopUser.setJoinTime(DateUtil.date().toLocalDateTime()); - shopUser.setShopId(shopId); - shopUser.setUserId(userId); - return save(shopUser); + shopUser.setUserId(null); + shopUser.setShopId(null); + + return updateById(shopUser); } @Override public ShopUserDetailDTO getInfo(Long shopId, long userId) { ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId)); + UserInfo userInfo = userInfoService.getById(userId); + if (userInfo == null) { + throw new ApiNotPrintException("用户信息不存在"); + } + long couponNum = 0; if (shopUser == null) { - UserInfo userInfo = userInfoService.getById(userId); - if (userInfo == null) { - throw new ApiNotPrintException("用户信息不存在"); - } shopUser = BeanUtil.copyProperties(userInfo, ShopUser.class); shopUser.setShopId(shopId); shopUser.setId(null); @@ -294,6 +300,8 @@ public class ShopUserServiceImpl extends ServiceImpl i List shopExtends = shopExtendService.list(new QueryWrapper().eq(ShopExtend::getShopId, shopInfo.getId())); shopUserDetailDTO.setShopExtendList(shopExtends); } + + shopUserDetailDTO.setPayPwd(userInfo.getPayPwd()); return shopUserDetailDTO; } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index f1b4059a..8904c8d1 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -46,7 +46,7 @@ public class SysRoleServiceImpl extends ServiceImpl imp } @Override - public Page getList(PageDTO pageDTO, String key, String startTime, String endTime) { + public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); if (!StpKit.USER.isAdmin()) { queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 46f2eed9..8045b740 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -608,6 +608,9 @@ public class OrderInfoServiceImpl extends ServiceImpl creditPayOrder(OrderPayParamDTO payParam) { - AssertUtil.isNull(payParam.getCreditBuyerId(), "挂账人不可为空"); + AssertUtil.isNull(payParam.getCreditBuyerId(), "请选择挂账人后支付"); OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); orderInfo.setCreditBuyerId(payParam.getCreditBuyerId()); orderInfoService.upOrderInfo(orderInfo, orderInfo.getOrderAmount(),