Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -22,7 +22,6 @@
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.util.WechatPayUtils;
import com.ruoyi.shop.util.WxShopUtils;
import com.ruoyi.shop.util.dto.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
@@ -114,9 +113,6 @@

    @Resource
    private RedisService redisService;

    @Resource
    private WechatPayUtils wechatPayUtils;

    /**
     * 获取商户详情
@@ -951,8 +947,7 @@
     * @return  void
     */
    @Override
    @Transactional
    public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws Exception{
    public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto){
        ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
        Shop shop = this.getByShopId(shopAuthentication.getShopId());
        String applyNumber = IdUtils.simpleUUID();