java/HongRuiTang.git

			@@ -5,6 +5,7 @@
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.binarywang.wxpay.exception.WxPayException;
			import com.ruoyi.common.core.constant.CacheConstants;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.DateUtils;
			@@ -22,6 +23,7 @@
			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;
			@@ -109,10 +111,16 @@
			private RemoteSysStaffService remoteSysStaffService;

			@Resource
			private RemoteFileService remoteFileService;

			@Resource
			private ShopTaskService shopTaskService;

			@Resource
			private RedisService redisService;

			@Resource
			private WechatPayUtils wechatPayUtils;

			/**
			* 获取商户详情
			@@ -302,6 +310,13 @@
			if(newShop){
			//生成商户关联记录
			initNewShop(shop,mgtEditShopDto.getUserId());
			CodeGetDto codeGetDto = new CodeGetDto();
			String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+shop.getShopId();
			codeGetDto.setUrl(url);
			codeGetDto.setFileName("shop-"+shop.getShopId());
			String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
			shop.setShopCode(codeUrl);
			this.saveOrUpdate(shop);
			}
			}

			@@ -947,7 +962,7 @@
			* @return void
			*/
			@Override
			public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto){
			public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException {
			ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
			Shop shop = this.getByShopId(shopAuthentication.getShopId());
			String applyNumber = IdUtils.simpleUUID();