From 10afff16848eafb6b24164360867311753cdfb9b Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 21:38:26 +0800 Subject: [PATCH] url --- .../main/java/com/iformall/controller/PosController.java | 4 ++-- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 6 +++--- .../iformall/service/impl/WxMallBuildingServiceImpl.java | 2 +- .../service/impl/WxMsgValidationcodeModelServiceImpl.java | 2 +- .../src/main/java/com/iformall/utils/Constant.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 499d0e5e2..3188c2903 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -46,9 +46,9 @@ public class PosController extends BaseController { "\"return_code\":\"SUCCESS\",\"return_msg\":\"\",\"result_code\":\"SUCCESS\"," + "\"tenant_id\":\"456\",\"mall_name\":\"富茂中心\"," + "\"merchant_id\":\"320833942159982592\",\"merchant_name\":\"东软合作\"," + - "\"merchant_img\":\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/234/WechatIMG5071.png\"," + + "\"merchant_img\":\"https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png\"," + "\"order_operation_id\":\"320834180694245376\"," + - "\"qrcode_url\":\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/456/formall_c.png\"," + + "\"qrcode_url\":\" https://formall.oss-accelerate.aliyuncs.com/456/formall_c.png\"," + "\"pos_qrcode_rule\":\"https://ctest.malls.iformall.com/order/(二维码规则: url + POS订单ID)\"," + "\"discount\":\"false(是否支持会员折扣,false:禁用,true:可用)\"," + "\"coupon\":\"0(会员优惠券是否开启,0-禁用,1-单选可用,2-多选可用)\",\"coupon_desc\":\"禁用(会员优惠券是否开启描述)\"," + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 334325451..f6b9fcbad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -531,7 +531,7 @@ public class WxFlowServiceImpl implements WxFlowService { if (record.getStatus().equals(EnumFlowRecordStatus.NEW.getCode())) { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
发起申请
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; @@ -544,7 +544,7 @@ public class WxFlowServiceImpl implements WxFlowService { } else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
待审批
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; @@ -557,7 +557,7 @@ public class WxFlowServiceImpl implements WxFlowService { } else { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
审批通过
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index d724c999d..85b4107bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -64,7 +64,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { wxMallFloor.setBuildingId(wxMallBuilding.getId()); wxMallFloor.setFloorName(cha); //默认图片---------------------------------------------------- - wxMallFloor.setBackgroundImg("https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"); + wxMallFloor.setBackgroundImg("https://formall.oss-accelerate.aliyuncs.com/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"); wxMallFloor.setCreateDate(new Date()); wxMallFloor.setUpdateDate(new Date()); wxMallFloorMapper.insert(wxMallFloor); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index a5b29b668..82105dbd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -57,7 +57,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM " ( '" + idWorker.nextId() + "', '" + tenantId + "', '16', '商户分账账户删除提醒', '" + signature + "', '{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户', '" + nowTimestr + "', '1', '0', null, null);" + "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`)" + "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '10', '审批通过通知', '富茂', " + - " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
\\n
\\n
\\n\\n\\n', " + + " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
\\n
\\n
\\n\\n\\n', " + " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "');" + "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`)" + "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '11', '待缴账单通知', '富茂', " + diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 879e2650b..ad21326a2 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -30,7 +30,7 @@ public class Constant { public static final String adminPage = "https://admin.malls.iformall.com"; - public static final String floor_back_img = "https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; + public static final String floor_back_img = " https://formall.oss-accelerate.aliyuncs.com/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; /// REDIS key Prev