From 16588b6d5bd68f9c1b05d1ba1acda65caa2737f9 Mon Sep 17 00:00:00 2001 From: "925116093-qq.com" <925116093@qq.com> Date: Mon, 18 Aug 2025 18:24:00 +0800 Subject: [PATCH] 2025008071805 --- .../controllerUtil/AppletControllerUtil.java | 10 ++--- .../controllerUtil/BenefitPointsUtil.java | 30 ++++++------- .../system/controllerUtil/InvoiceUtil.java | 45 +++++++++++-------- .../system/controllerUtil/WechatPayUtil.java | 2 +- .../controllerUtil/YunXinPhoneUtilAPI.java | 2 +- 5 files changed, 49 insertions(+), 40 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/AppletControllerUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/AppletControllerUtil.java index 5a1fbd6..4907ef7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/AppletControllerUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/AppletControllerUtil.java @@ -1164,7 +1164,7 @@ public class AppletControllerUtil { userInfo.put("userId", userRecord.getId()); userInfo.put("username", userRecord.getName()); userInfo.put("nickname", userRecord.getNickname()); - userInfo.put("avatar", userRecord.getAvatar()); + userInfo.put("avatar", buildImageUrl( userRecord.getAvatar())); userInfo.put("openid", userRecord.getOpenid()); // 状态信息 @@ -1243,7 +1243,7 @@ public class AppletControllerUtil { userInfo.put("userId", user.getId()); userInfo.put("username", user.getName()); userInfo.put("nickname", user.getNickname()); - userInfo.put("avatar", user.getAvatar()); + userInfo.put("avatar", buildImageUrl(user.getAvatar())); userInfo.put("openid", user.getOpenid()); userInfo.put("status", user.getStatus()); userInfo.put("userType", user.getType()); @@ -2103,7 +2103,7 @@ public class AppletControllerUtil { userData.put("nickname", user.getNickname()); userData.put("phone", user.getPhone()); userData.put("password", null); // 不返回密码 - userData.put("avatar", user.getAvatar()); + userData.put("avatar", buildImageUrl(user.getAvatar())); userData.put("commission", user.getCommission()); userData.put("created_at", user.getCreatedAt()); userData.put("integral", user.getIntegral()); @@ -3657,7 +3657,7 @@ public class AppletControllerUtil { JSONObject user = new JSONObject(); user.put("id", u.getId()); user.put("name", u.getName()); - user.put("avatar", u.getAvatar()); + user.put("avatar", buildImageUrl(u.getAvatar())); comment.put("user", user); } data.put("comment", comment); @@ -5647,7 +5647,7 @@ public class AppletControllerUtil { userGroupBuying.setOrderid(grouporderid); // 使用拼团单号作为订单号 userGroupBuying.setPtorderid(ptcode); userGroupBuying.setUid(user.getId()); - userGroupBuying.setImage(user.getAvatar()); + userGroupBuying.setImage(buildImageUrl(user.getAvatar())); userGroupBuying.setUname(user.getName()); userGroupBuying.setProductId(serviceGoods.getId()); userGroupBuying.setMoney(itemPrice); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/BenefitPointsUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/BenefitPointsUtil.java index 96caedd..4c158cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/BenefitPointsUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/BenefitPointsUtil.java @@ -1347,21 +1347,21 @@ public class BenefitPointsUtil { usersPayBeforService.updateUsersPayBefor(usersPayBeforData); remap.put("code",1); }else{ - user.setBalance(user.getBalance().subtract(money)); - // usersPayBeforData.setYemoney(money); - UserMemnerConsumptionLog userMemnerConsumptionLog=new UserMemnerConsumptionLog(); - userMemnerConsumptionLog.setUid(Math.toIntExact(user.getId())); - userMemnerConsumptionLog.setConsumptiontype(2); - userMemnerConsumptionLog.setConsumptiontime(new Date()); - userMemnerConsumptionLog.setConsumptionmoney(money); - userMemnerConsumptionLog.setReamk(reamk); - userMemnerConsumptionLog.setBeformoney(user.getBalance().add(money)); - userMemnerConsumptionLog.setAftermoney(user.getBalance()); - userMemnerConsumptionLog.setNowmoney(user.getBalance()); - userMemnerConsumptionLog.setType(2); - userMemnerConsumptionLog.setOrderid(usersPayBefor.getOrderid()); - userMemnerConsumptionLogService.insertUserMemnerConsumptionLog(userMemnerConsumptionLog); - usersService.updateUsers(user); +// user.setBalance(user.getBalance().subtract(money)); +// // usersPayBeforData.setYemoney(money); +// UserMemnerConsumptionLog userMemnerConsumptionLog=new UserMemnerConsumptionLog(); +// userMemnerConsumptionLog.setUid(Math.toIntExact(user.getId())); +// userMemnerConsumptionLog.setConsumptiontype(2); +// userMemnerConsumptionLog.setConsumptiontime(new Date()); +// userMemnerConsumptionLog.setConsumptionmoney(money); +// userMemnerConsumptionLog.setReamk(reamk); +// userMemnerConsumptionLog.setBeformoney(user.getBalance().add(money)); +// userMemnerConsumptionLog.setAftermoney(user.getBalance()); +// userMemnerConsumptionLog.setNowmoney(user.getBalance()); +// userMemnerConsumptionLog.setType(2); +// userMemnerConsumptionLog.setOrderid(usersPayBefor.getOrderid()); +// userMemnerConsumptionLogService.insertUserMemnerConsumptionLog(userMemnerConsumptionLog); +// usersService.updateUsers(user); // usersPayBeforService.updateUsersPayBefor(usersPayBeforData); remap.put("code",1); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/InvoiceUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/InvoiceUtil.java index f1eb51e..8513946 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/InvoiceUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/InvoiceUtil.java @@ -29,6 +29,7 @@ public class InvoiceUtil { private static final IGoodsOrderService goodsOrderService = SpringUtils.getBean(IGoodsOrderService.class); private static final IUserMemberRechargeLogService userMemberRechargeLogService = SpringUtils.getBean(IUserMemberRechargeLogService.class); private static final IUsersService usersService = SpringUtils.getBean(IUsersService.class); + private static final IUsersPayBeforService usersPayBeforServiceService = SpringUtils.getBean(IUsersPayBeforService.class); /** * 获取用户发票中心数据 @@ -87,15 +88,19 @@ public class InvoiceUtil { for (Order order : serviceOrders) { // 检查是否已开票 if (!isOrderInvoiced(order.getOrderId())) { - Map orderMap = new HashMap<>(); - orderMap.put("orderId", order.getOrderId()); - orderMap.put("orderType", "service"); // 服务订单 - orderMap.put("orderTypeText", "服务订单"); - orderMap.put("amount", order.getTotalPrice()); - orderMap.put("title", "服务订单"+order.getTotalPrice()+"元" ); - orderMap.put("createTime", order.getCreateTime()); - orderMap.put("canInvoice", true); - pendingOrders.add(orderMap); + BigDecimal amount = usersPayBeforServiceService.sumWxMoneyForInvoicingByOrderId(order.getOrderId()); + if (amount.compareTo(BigDecimal.ZERO) > 0) { + Map orderMap = new HashMap<>(); + orderMap.put("orderId", order.getOrderId()); + orderMap.put("orderType", "service"); // 服务订单 + orderMap.put("orderTypeText", "服务订单"); + orderMap.put("amount", amount); + orderMap.put("title", "服务订单"+order.getTotalPrice()+"元" ); + orderMap.put("createTime", order.getCreateTime()); + orderMap.put("canInvoice", true); + pendingOrders.add(orderMap); + } + } } @@ -108,15 +113,19 @@ public class InvoiceUtil { for (GoodsOrder goodsOrder : goodsOrders) { // 检查是否已开票 if (!isOrderInvoiced(goodsOrder.getOrderId())) { - Map orderMap = new HashMap<>(); - orderMap.put("orderId", goodsOrder.getOrderId()); - orderMap.put("orderType", "goods"); // 商品订单 - orderMap.put("orderTypeText", "商品订单"); - orderMap.put("amount", goodsOrder.getTotalPrice()); - orderMap.put("title", "购买商品"+goodsOrder.getTotalPrice()+"元"); - orderMap.put("createTime", goodsOrder.getCreateTime()); - orderMap.put("canInvoice", true); - pendingOrders.add(orderMap); + BigDecimal amount = usersPayBeforServiceService.sumWxMoneyForInvoicingByOrderId(goodsOrder.getMainOrderId()); + if (amount.compareTo(BigDecimal.ZERO) > 0) { + Map orderMap = new HashMap<>(); + orderMap.put("orderId", goodsOrder.getOrderId()); + orderMap.put("orderType", "goods"); // 商品订单 + orderMap.put("orderTypeText", "商品订单"); + orderMap.put("amount", amount); + orderMap.put("title", "购买商品"+goodsOrder.getTotalPrice()+"元"); + orderMap.put("createTime", goodsOrder.getCreateTime()); + orderMap.put("canInvoice", true); + pendingOrders.add(orderMap); + } + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java index d61e8e5..13dc336 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/WechatPayUtil.java @@ -82,7 +82,7 @@ public class WechatPayUtil { // public static final String PAY_FH = "https://www.huafurenjia.cn/"; - public static final String PAY_FH = "https://552e105d.r3.cpolar.top/"; + public static final String PAY_FH = "https://api.huafurenjia.cn/"; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/YunXinPhoneUtilAPI.java b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/YunXinPhoneUtilAPI.java index 0769163..9fff46c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/YunXinPhoneUtilAPI.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controllerUtil/YunXinPhoneUtilAPI.java @@ -37,7 +37,7 @@ public class YunXinPhoneUtilAPI { // 回调地址常量（可通过set方法动态设置） private static String AXB_CALLBACK_URL = ""; - private static String NOTIFY_CALLBACK_URL = "https://552e105d.r3.cpolar.top/api/YunXin/notify"; + private static String NOTIFY_CALLBACK_URL = "https://api.huafurenjia.cn/api/YunXin/notify"; // 回调地址常量（可通过set方法动态设置）