‘linchangsheng’ 5 months ago
parent
commit
01b462fc43

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/comlist/WorkerComListLogic.java

@@ -128,8 +128,8 @@ public class WorkerComListLogic {
         workerComList.setUpdateTime(new Date());
         workerComList.insert();
 
-        String url = ossUtil.getUrl(fileUrl);
-        InputStream inputStream = commonLogic.getFileInputStreamByUrl(url);
+       // String url = ossUtil.getUrl(fileUrl);
+        InputStream inputStream = commonLogic.getFileInputStreamByUrl(fileUrl);
         List<Object> objects = ExcelUtils.importExcel(inputStream);
         //添加师傅
         List<WorkerComListWorker> workerComListWorkers = new ArrayList<>();

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -320,10 +320,10 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
+            throw new RemoteServiceException("扫码支付失败,请刷新二维码,再次尝试扫码");
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确");
+            throw new RemoteServiceException("扫码支付失败,请刷新二维码,再次尝试扫码");
         }
         //记录流水
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(companyWechatId);