From 123f8dc6cc4ef86f26b4f058dd0046d7caeb5228 Mon Sep 17 00:00:00 2001 From: lmy1996-11 <1092404103@qq.com> Date: Sat, 14 May 2022 20:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../numone/web/controller/business/UserController.java | 2 +- numone-admin/src/main/resources/application-prod.yml | 7 +++++++ .../system/service/impl/AppRebateRecordServiceImpl.java | 9 +++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/numone-admin/src/main/java/com/numone/web/controller/business/UserController.java b/numone-admin/src/main/java/com/numone/web/controller/business/UserController.java index f834ac0..cd4a331 100644 --- a/numone-admin/src/main/java/com/numone/web/controller/business/UserController.java +++ b/numone-admin/src/main/java/com/numone/web/controller/business/UserController.java @@ -46,7 +46,7 @@ public class UserController extends BaseController { return getDataTable(list); } - @ApiOperation("用户信息查询") + @ApiOperation("发放用户信息查询") @GetMapping("/listFF") public TableDataInfo listFF(AppUserParams appUserParams) { diff --git a/numone-admin/src/main/resources/application-prod.yml b/numone-admin/src/main/resources/application-prod.yml index 2b1c021..1f2b014 100644 --- a/numone-admin/src/main/resources/application-prod.yml +++ b/numone-admin/src/main/resources/application-prod.yml @@ -147,6 +147,13 @@ wx: appid: wx3e9550d820bfa6b7 secret: 14df6704fdb2cbb6798a5a5c0fdb30f7 grant_type: authorization_code #默认值不用更改 + hb: + wxappid: wx3e9550d820bfa6b7 + mch_id: 1560062071 #商户号 + key: dybamayongquan370502197105197957 + send_name: 一号藏馆 + wishing: 祝您快乐！ + act_name: 红包活动 #红洞 diff --git a/numone-business/src/main/java/com/numone/system/service/impl/AppRebateRecordServiceImpl.java b/numone-business/src/main/java/com/numone/system/service/impl/AppRebateRecordServiceImpl.java index b79bb49..512931a 100644 --- a/numone-business/src/main/java/com/numone/system/service/impl/AppRebateRecordServiceImpl.java +++ b/numone-business/src/main/java/com/numone/system/service/impl/AppRebateRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.numone.system.service.impl; import java.math.BigDecimal; import java.util.Iterator; import java.util.List; +import java.util.StringJoiner; import com.numone.common.core.domain.entity.AppUserInfo; import com.numone.common.request.RebateRecordParams; @@ -136,7 +137,7 @@ public class AppRebateRecordServiceImpl implements IAppRebateRecordService @Transactional public String HtAward(AwardVo awardVo) { //返回数据 - StringBuilder Msg = new StringBuilder(); + StringJoiner Msg = new StringJoiner(","); for (Long userId : awardVo.getUserIds()) { //查询openid @@ -144,7 +145,7 @@ public class AppRebateRecordServiceImpl implements IAppRebateRecordService String openid = appUserInfo.getOpenid(); if (ObjectUtils.isEmpty(openid)){ //为空则跳过 - Msg.append("
" +"用户"+appUserInfo.getRealName()+ " 没有微信授权登录过, 无法发送"); + Msg.add("{用户"+appUserInfo.getRealName()+ " 没有微信授权登录过, 无法发送}"); continue; } //红包发送 @@ -173,9 +174,9 @@ public class AppRebateRecordServiceImpl implements IAppRebateRecordService appRebateRecord.setUserId(userId); appRebateRecord.setPriceNum(new BigDecimal(awardVo.getMoney())); appRebateRecordMapper.insertAppRebateRecord(appRebateRecord); - Msg.append("{用户"+appUserInfo.getRealName()+ " 发放成功},"); + Msg.add("{用户"+appUserInfo.getRealName()+ " 发放成功}"); }else if (element.getName().equals("result_code") && !element.getTextTrim().equals("SUCCESS")){ - Msg.append("{用户"+appUserInfo.getRealName()+ " 发放失败,"+"错误信息 "+element.getTextTrim()+"},"); + Msg.add("{用户"+appUserInfo.getRealName()+ " 发放失败,"+"错误信息 "+element.getTextTrim()+"}"); } } }