From 2d20929b57b4562959f355d20a09a474d46939dd Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 08 八月 2023 21:53:32 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java index d50df4b..7d282f6 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java @@ -310,7 +310,7 @@ //生成商户关联记录 initNewShop(shop,mgtEditShopDto.getUserId()); CodeGetDto codeGetDto = new CodeGetDto(); - String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+shop.getShopId(); + String url = "https://wxapp.hhhrt.cn/mini/shop?shopId="+shop.getShopId(); codeGetDto.setUrl(url); codeGetDto.setFileName("shop-"+shop.getShopId()); String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData(); @@ -967,6 +967,9 @@ ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId()); Shop shop = this.getByShopId(shopAuthentication.getShopId()); String applyNumber = IdUtils.simpleUUID(); + if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){ + mgtShopAuthDto.setBlBusinessDeanline("长期"); + } BeanUtils.copyProperties(mgtShopAuthDto , shopAuthentication); shopAuthentication.setApplyNumber(applyNumber); shopAuthentication.setAuditStatus(3); @@ -1091,6 +1094,11 @@ MgtShopAuthGetVo shopAuthGetVo = new MgtShopAuthGetVo(); ShopAuthentication shopAuthentication = shopAuthenticationService.getById(authId); BeanUtils.copyProperties(shopAuthentication, shopAuthGetVo); + if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){ + shopAuthGetVo.setBlBusinessFoeverFlag(1); + }else{ + shopAuthGetVo.setBlBusinessFoeverFlag(0); + } return shopAuthGetVo; } -- Gitblit v1.7.1