czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

替换收银呗字样，更改创客错误状态,更改提现时手机号显示,分享注册，提现算法列表,后台推广员列表补充推送

Browse Source
This commit is contained in:
liuyingfang
2023-07-18 15:37:00 +08:00
parent 0a7da333b2
commit b92f72b53e
18 changed files with 139 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class PushServiceImpl extends ServiceImpl<PushAllMapper, PushAll> impleme
generalPushUtil.sendAllPlatByAlias(alias, "银收客", "您有一个新的呼叫服务请及时处理", "3");
break;
case REFUND_ORDER:
generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔未接单的线上店订单，客户已申请退款。", "2");
generalPushUtil.sendAllPlatByAlias(alias, "银收客", "您有一笔未接单的线上店订单，客户已申请退款。", "2");
break;
default:
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantPluginServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class MerchantPluginServiceImpl extends ServiceImpl<MerchantPluginMapper,
notice.setConrtent("商户插件进件驳回, " + errMsg);
noticeService.saveNotice(notice);
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "银收客审核通知", errMsg, "1");
// 机器人发送已处理的信息到群组
wxTalkService.sendPluginAuditResultAlert(userApp.getUserId() + "");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java
View File

@@ -241,7 +241,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
notice.setConrtent("商户进件驳回, " + errMsg);
noticeService.saveNotice(notice);
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "银收客审核通知", errMsg, "1");
// 机器人发送已处理的信息到群组
//wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/impl/MerchantStoreServiceImpl.java
View File

@@ -407,7 +407,7 @@ public class MerchantStoreServiceImpl extends ServiceImpl<MerchantStoreMapper, M
} else if ("rejected".equals(certStatus) || "freezed".equals(certStatus) || "canceled".equals(certStatus) || "unknow".equals(certStatus)) {
// 驳回或者未知状态标位已处理
Notice notice = new Notice(1, 1, userApp);
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系银收客客服修改资料并重新审核";
pushMsg = pushMsg.replace("##", subMerchApplyOrder.getRemark());
notice.setConrtent(pushMsg);
noticeMapper.saveNotice(notice);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxCertServiceImpl.java
View File

@@ -217,7 +217,7 @@ public class RyxCertServiceImpl implements MerchantCertService {
break;
case "未提交":
case "审核驳回":
pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系银收客客服修改资料并重新审核";
pushMsg = pushMsg.replace("##", subMerApplyOrder.getRemark());
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId().toString()), "商户微信认证通知", pushMsg, "1");
notice.setConrtent(pushMsg);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfCertServiceImpl.java
View File

@@ -425,7 +425,7 @@ public class SxfCertServiceImpl implements MerchantCertService {
if (StringUtils.isEmpty(certResult.getString("infoQrcode")) && StringUtils.isNotEmpty(certResult.getString("rejectInfo"))) {
Notice notice = new Notice(1, 1, userApp);
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系银收客客服修改资料并重新审核";
pushMsg = pushMsg.replace("##", certResult.getString("rejectInfo"));
notice.setConrtent(pushMsg);
noticeMapper.saveNotice(notice);

3
pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java
View File

@@ -5,6 +5,7 @@ import cn.pluss.platform.dto.MerchSearchDTO;
import cn.pluss.platform.dto.StaffDTO;
import cn.pluss.platform.entity.UserApp;
import cn.pluss.platform.enums.UserRoleEnum;
import cn.pluss.platform.exception.MsgException;
import cn.pluss.platform.leshua.ExpandDto;
import cn.pluss.platform.mapper.UserAppMapper;
import cn.pluss.platform.vo.*;
@@ -400,7 +401,7 @@ public interface UserAppService extends IService<UserApp> {
UserApp getUserAppByPhone(String phone, UserApp userApp);
void applyMarker(UserApp userApp,String code) throws Exception;
void applyMarker(UserApp userApp,String code);
}

14
pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
View File

@@ -236,14 +236,13 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
@Override
@SuppressWarnings("unchecked")
public Page<UserInfoVO> queryUserInfoVOPage(Map<String, Object> map) {
List<List<?>> queryResult = baseMapper.queryUserInfoVOPage(map);
List<UserInfoVO> result = (List<UserInfoVO>) queryResult.get(0);
List<UserInfoVO> result = baseMapper.queryUserInfoVOPage(map);
long page = ((Integer) map.get("offset")).longValue() + 1L;
long pageSize = ((Integer) map.get("pageSize")).longValue();
Page<UserInfoVO> pageResult = new Page<>(page, pageSize);
pageResult.setRecords(result);
Long count = (Long) queryResult.get(1).get(0);
Long count = baseMapper.queryUserAppPageCount(map).longValue();
pageResult.setTotal(count);
if (result.isEmpty()) {
@@ -1930,7 +1929,7 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
@Transactional(rollbackFor = Exception.class)
@Override
public void applyMarker(UserApp userApp,String code) throws Exception{
public void applyMarker(UserApp userApp,String code){
UserInfo userInfo=new UserInfo();
userInfo.setId(userApp.getUserId());
UserInfo userInfos = userInfoService.queryUserInfo(userInfo);
@@ -1947,9 +1946,14 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
}
if (!phoneValidateCode.getCode().equalsIgnoreCase(code)) {
throw new MsgException("无效的验证码！");
MsgException.throwException("无效的验证码！");
}
if(!phoneValidateCode.getCode().equals(code)){
MsgException.throwException("短信验证码有误！");
}
MerchantBaseInfo baseInfo= merchantBaseInfoService.getMerchantBaseInfoByUserId(userInfos.getId().toString());
if(ObjectUtil.isEmpty(baseInfo)){
MsgException.checkNull(null,"商户信息不存在");

8
pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java
View File

@@ -65,7 +65,7 @@ public class UserInfoServiceImpl extends BaseUserInfoService {
UserInfo ui = getById(agentUa.getUserId());
if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉");
}
} else {
if (!Objects.equals(parentApp.getStatus(), 3) || !Objects.equals(parentApp.getBankStatus(), 3) ) {
@@ -74,7 +74,7 @@ public class UserInfoServiceImpl extends BaseUserInfoService {
UserInfo ui = getById(parentApp.getUserId());
if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系银收客客服申诉");
}
//
// if (!"1".equals(parentApp.getSpreadFlag())) {
@@ -222,7 +222,7 @@ public class UserInfoServiceImpl extends BaseUserInfoService {
if(ObjectUtil.isNotEmpty(promotion)){
if("MG".equals(promotion.getTypeCode())||"FB".equals(promotion.getTypeCode())||
"SB".equals(promotion.getTypeCode())||"1".equals(promotion.getIsExtend())||
"2".equals(promotion.getIsExtend())){
"2".equals(promotion.getIsExtend()) ||"AG".equals(promotion.getTypeCode())){
return promotion;
}
@@ -230,6 +230,6 @@ public class UserInfoServiceImpl extends BaseUserInfoService {
}
getUserPromotionByUserId(promotion.getParentUserId());
return null;
return promotion;
}
}

4
pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java
View File

@@ -205,11 +205,11 @@ public class UserInfoServiceNewImpl extends BaseUserInfoService {
if(ObjectUtil.isNotEmpty(promotion)){
if("MG".equals(promotion.getTypeCode())||"FB".equals(promotion.getTypeCode())||
"SB".equals(promotion.getTypeCode())||"1".equals(promotion.getIsExtend())||
"2".equals(promotion.getIsExtend())){
"2".equals(promotion.getIsExtend())||"AG".equals(promotion.getTypeCode())){
return promotion;
}
}
getUserPromotionByUserId(promotion.getParentUserId());
return null;
return promotion;
}
}