From db6e2170e351746681e05a1e40cc8ea046b54903 Mon Sep 17 00:00:00 2001 From: huchuansai Date: Wed, 2 Jul 2025 18:48:01 +0800 Subject: [PATCH] fix: article list bug fix --- .../controller/WxArticleController.java | 2 +- .../weichat/service/WxCustomMpService.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java index 8068129..c631bc5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java @@ -146,7 +146,7 @@ public class WxArticleController { PlayClerkUserInfoEntity entity = playClerkUserInfoService.selectById(id); PlayClerkArticleCustomQueryVo vo = new PlayClerkArticleCustomQueryVo(); vo.setClerkId(entity.getId()); - return R.ok(playClerkArticleInfoService.customSelectByPage(new PlayClerkArticleCustomQueryVo(), customUserService.getLoginUserId())); + return R.ok(playClerkArticleInfoService.customSelectByPage(vo, customUserService.getLoginUserId())); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java index 37094d5..3608d42 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java @@ -112,7 +112,7 @@ public class WxCustomMpService { public void sendBalanceMessage(PlayOrderInfoEntity order) { PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy()); SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getChongzhichenggongTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time4", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("amount2", order.getOrderMoney().toString())); @@ -140,7 +140,7 @@ public class WxCustomMpService { public void sendCreateOrderMessage(String tenantId, String openId, String orderNo, String money, String commodityName) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), openId, "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getXindingdanshoulitongzhiTemplateId(), openId, "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time6", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("character_string9", orderNo)); @@ -168,7 +168,7 @@ public class WxCustomMpService { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy()); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), clerkUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getJiedanchenggongtongzhiTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string1", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); @@ -180,7 +180,7 @@ public class WxCustomMpService { } templateMessage.setToUser(customUserInfo.getOpenid()); - templateMessage.setUrl("https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); + templateMessage.setUrl("http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); try { proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); } catch (WxErrorException e) { @@ -195,7 +195,7 @@ public class WxCustomMpService { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(userInfo.getTenantId()); String template_id = tenant.getRzsqshtxTemplateId(); String tenantKey = tenant.getTenantKey(); - String url = "https://" + tenantKey + ".julyharbor.com/clerk/"; + String url = "http://" + tenantKey + ".julyharbor.com/clerk/"; WxMpTemplateMessage templateMessage = new WxMpTemplateMessage(); templateMessage.setTemplateId(template_id); @@ -220,7 +220,7 @@ public class WxCustomMpService { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); String template_id = tenant.getRzsqAdminTemplateId(); String tenantKey = tenant.getTenantKey(); - String url = "https://" + tenantKey + ".julyharbor.com/clerk/#/admin/clerk-apply-list"; + String url = "http://" + tenantKey + ".julyharbor.com/clerk/#/admin/clerk-apply-list"; List adminInfoEntityList = playPersonnelAdminInfoService.list(Wrappers.lambdaQuery(PlayPersonnelAdminInfoEntity.class).select(PlayPersonnelAdminInfoEntity::getSysUserId)); for (PlayPersonnelAdminInfoEntity adminInfoEntity : adminInfoEntityList) { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, adminInfoEntity.getSysUserId()), false); @@ -273,7 +273,7 @@ public class WxCustomMpService { if (Objects.isNull(clerkUserInfo)) { continue; } - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), clerkUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/admin/order/complain-list"); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdantousuchuliTemplateId(), clerkUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/admin/order/complain-list"); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("time2", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); @@ -292,7 +292,7 @@ public class WxCustomMpService { if (order.getPlaceType().equals("1") || order.getPlaceType().equals("2")) { SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(order.getTenantId()); PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(order.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + order.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getDingdanwanchengtongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + order.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("time18", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"))); data.add(new WxMpTemplateData("character_string8", order.getOrderNo())); @@ -312,7 +312,7 @@ public class WxCustomMpService { PlayCustomUserInfoEntity customUserInfo = customUserInfoService.selectById(orderInfo.getPurchaserBy()); - WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "https://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); + WxMpTemplateMessage templateMessage = getWxMpTemplateMessage(tenant.getQuxiaodingdantongzhiTemplateId(), customUserInfo.getOpenid(), "http://" + tenant.getTenantKey() + ".julyharbor.com/user/#/orderDetail/" + orderInfo.getId()); List data = new ArrayList<>(); data.add(new WxMpTemplateData("character_string2", orderInfo.getOrderNo())); data.add(new WxMpTemplateData("thing5", StringUtils.isEmpty(refundReason) ? "已取消" : refundReason)); @@ -328,7 +328,7 @@ public class WxCustomMpService { PlayClerkUserInfoEntity clerkUserInfo = clerkUserInfoService.selectById(orderInfo.getAcceptBy()); templateMessage.setToUser(clerkUserInfo.getOpenid()); - templateMessage.setUrl("https://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); + templateMessage.setUrl("http://" + tenant.getTenantKey() + ".julyharbor.com/clerk/#/orderDetail/" + orderInfo.getId()); try { proxyWxMpService().getTemplateMsgService().sendTemplateMsg(templateMessage); } catch (WxErrorException e) {