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

更改文字，更改AppGuide字段，实名逻辑更改，收银点判断逻辑更改，RSA相关

Browse Source
This commit is contained in:
liuyingfang
2023-06-06 18:23:13 +08:00
parent eeffe90fc7
commit fd84e2d469
42 changed files with 1433 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ public class AgentStaffMainPageServiceImpl implements MainPageService {
Double promoteConsumeFee;
Integer totalOrderCount;
//快银收银
//银收客
Map<String, Object> queryMap = new HashMap<>();
queryMap.put("userId", queryUserApp.getParentId());
queryMap.put("agentStaffId", userId);

4
pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> implements Ca
RiskBlacklist entity = rbService.getOne(new QueryWrapper<>(condition));
if (entity != null) {
throw new MsgException("该账户存在重大违规行为，暂不支持提现，请联系快银收银客服申诉");
throw new MsgException("该账户存在重大违规行为，暂不支持提现，请联系银收客客服申诉");
}
}
@@ -516,7 +516,7 @@ public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> implements Ca
alipayService.remit(accountNo, accountName, cash.getVirRealCashAmt().toString());
// 发送分润打款通知
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "快银收银分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1");
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "银收客分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1");
}
@Override

4
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MercAuditListenerImpl.java
View File

@@ -119,7 +119,7 @@ public class MercAuditListenerImpl implements MercAuditListener {
public void onFail(String userId, MerchantChannelStatus mcs, String msg) {
MerchantBaseInfo mbi = mbiMapper.queryByMerchantCode(mcs.getMerchantCode());
String title2 = "快银收银审核通知";
String title2 = "银收客审核通知";
String msg2;
@@ -141,7 +141,7 @@ public class MercAuditListenerImpl implements MercAuditListener {
public void onSuccess(String userId, MerchantChannelStatus mcs) {
MerchantBaseInfo mbi = mbiMapper.queryByMerchantCode(mcs.getMerchantCode() + "");
String title = "快银收银审核通知";
String title = "银收客审核通知";
String msg;
if (Objects.equals(mcs.getChannel(), 4)) {
msg = "商户D0进件通过，完成支付宝及微信认证后即可支持相应渠道收款";

2
pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
View File

@@ -899,7 +899,7 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
UserApp userApp = userAppMapper.selectOne(qWrapper2);
String pushMsg = "D0通道" + flagName + typeName + "报备失败，请联系客服进行处理";
sxfMerAuditHandler.sendNotice(userApp, "快银收银审核通知", pushMsg, mcs.getApplicationId());
sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", pushMsg, mcs.getApplicationId());
}
if (Objects.equals("00", status)) {

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

@@ -190,6 +190,10 @@ public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> i
bankName = "浦东发展";
}
if("长安".equals(bankName)){
bankName="城市商业银行";
}
if (!bankCodeSxf.getBankName().contains(bankName) && !"其他".equals(bankName)) {
MsgException.throwException("开户行与支行信息不匹配，请检查银行卡信息");
}

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

@@ -46,13 +46,13 @@ public class PushServiceImpl extends ServiceImpl<PushAllMapper, PushAll> impleme
switch (type) {
case MAKE_ORDER:
generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "快银收银线上店订单来了请及时处理", "3");
generalPushUtil.sendAllPlatByAlias(alias, "银收客", "银收客线上店订单来了请及时处理", "3");
break;
case URGE_ORDER:
generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "您有一笔催单请及时处理", "3");
generalPushUtil.sendAllPlatByAlias(alias, "银收客", "您有一笔催单请及时处理", "3");
break;
case REQUEST_SERVICE:
generalPushUtil.sendAllPlatByAlias(alias, "快银收银", "您有一个新的呼叫服务请及时处理", "3");
generalPushUtil.sendAllPlatByAlias(alias, "银收客", "您有一个新的呼叫服务请及时处理", "3");
break;
case REFUND_ORDER:
generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔未接单的线上店订单，客户已申请退款。", "2");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java
View File

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* <p>
* 快银收银缴费通收款单 服务类
* 银收客缴费通收款单 服务类
* </p>
*
* @author crystal

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

@@ -230,7 +230,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
String unionid = jsonObject.getString("unionid");
String avatar = jsonObject.getString("avatar");
if(StringUtil.isEmpty(memberName) || memberName == "undefined"){
memberName = "快银收银会员"+StringUtil.genRandomNum(6);
memberName = "银收客会员"+StringUtil.genRandomNum(6);
}
if(StringUtil.isEmpty(avatar) || avatar == "undefined"){
avatar = default_avatar;

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

@@ -2008,7 +2008,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
try {
Notice notice = new Notice(2,98,userApp);
notice.setUniqueKey(order.getOrderNumber()+userApp.getUserId());
String content = "快银到账" + order.getConsumeFee() + "元";
String content = "银收客到账" + order.getConsumeFee() + "元";
notice.setConrtent(content);
noticeService.saveOrUpdate(notice);
// 会员充值播报

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

@@ -123,7 +123,7 @@ public class RyxPayServiceimpl implements RyxPayService {
if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
result.put("code",ResultCode.FAIL.code());
if(respMsg.contains("商户需补齐相关资料")){
result.put("msg","D0实时到账：商户未在快银收银APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
result.put("msg","D0实时到账：商户未在银收客APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
}
return result;
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
View File

@@ -160,7 +160,7 @@ public class SxfPayServiceImpl implements SxfPayService {
if (respData.get("bizMsg").toString().contains("使用微信支付")) {
result.put("msg", "云闪付/京东支付失败：同一支付通道下一张身份证最多注册一个小微商户");
} else if (respData.get("bizMsg").toString().contains("商户需补齐相关资料") || respData.get("bizMsg").toString().contains("微信实名认证")) {
result.put("msg", "D0实时到账：商户未在快银收银APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
result.put("msg", "D0实时到账：商户未在银收客APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
} else {
result.put("msg", respData.get("bizMsg"));
}

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/edit/YsChangeRateServiceImpl.java
View File

@@ -91,7 +91,7 @@ public class YsChangeRateServiceImpl extends BaseMchChannelRateNewService {
rateNewRecordService.save(mrnr);
// 上传一张空白图作为结算信息修改申请表
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources快银收银s/upload/blank.png", "B008", changeFlowId);
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources银收客s/upload/blank.png", "B008", changeFlowId);
}
@Override

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl.java
View File

@@ -318,7 +318,7 @@ public class YsAuditServiceImpl extends AbstractYsResultService {
} else {
param.put(YsConstant.BALANCE_ACC_TYPE, "11");
}
param.put(YsConstant.EXPANDING_MANAGER, "快银收银");
param.put(YsConstant.EXPANDING_MANAGER, "银收客");
// 这里在进件之前再加一次校验
preCheck(userId);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsCertServiceImpl.java
View File

@@ -250,7 +250,7 @@ public class YsCertServiceImpl implements MerchantCertService {
MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系快银收银客服修改资料并重新审核";
String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系银收客客服修改资料并重新审核";
pushMsg = pushMsg.replace("##", wxCertResult.getString("reject_reason"));
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), "商户微信认证通知", pushMsg, "1");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayOldServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class YsPayOldServiceImpl extends YsPayServiceImpl{
String sub_code = respData.getString("sub_code");
String sub_msg = respData.getString("sub_msg");
if("4335".equals(sub_code) && StringUtil.isNotEmpty(sub_msg) && sub_msg.contains("商户需补齐相关资料")){
MsgException.throwException("D0实时到账：商户未在快银收银APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
MsgException.throwException("D0实时到账：商户未在银收客APP-商户认证-微信认证（支付宝认证）内完成授权，暂时无法收款");
}else if("4335".equals(sub_code) && StringUtil.isNotEmpty(sub_msg) && sub_msg.contains("金额超限")){
MsgException.throwException("单笔交易金额超限");
}else{