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

Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui into ys

Browse Source 
Signed-off-by: liuyingfang <8517512+liuyingfang@user.noreply.gitee.com>
This commit is contained in:
liuyingfang
2023-04-12 02:33:07 +00:00
committed by Gitee
parent 403df2b287 9c0608c42d
commit 665a7bc8a6
14 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,6 +188,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
userApp = userAppService.queryUserApp(userApp);
//TODO 微信机器人消息推送暂时干掉
//wxTalkService.sendAuditAlert(userApp.getUserId() + "");
}
@@ -233,7 +234,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
// 机器人发送已处理的信息到群组
wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");
//wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");
}
@Override

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

@@ -1964,7 +1964,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);
// 会员充值播报
@@ -1976,7 +1976,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
}
}else{
if(UserVoice.ENABLE.equals(voice.getPaySuccess())){
generalPushUtil.sendAllPlatByAlias(alias, "收银呗到账通知", content, extrasparam);
generalPushUtil.sendAllPlatByAliasExt(alias, content, content, extrasparam);
}
}
//发送模板消息

5
pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
View File

@@ -120,9 +120,10 @@ public abstract class BaseMerAuditHandler<T extends IMerAuditHandler> implements
QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
.eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
//String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
StringBuffer sb = new StringBuffer(baseUrl);
sb.append("&title=").append(merchantBaseInfo.getAlias());
sb.append("?title=").append(merchantBaseInfo.getAlias());
sb.append("&password=").append(userInfo.getPassword().toLowerCase());
sb.append("&mobile=").append(userInfo.getLoginName());
sb.append("&syb_m_id=").append(merchantStore.getId());

5
pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java
View File

@@ -277,9 +277,10 @@ public class RyxMerAuditHandler {
QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
.eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
//String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
StringBuffer sb = new StringBuffer(baseUrl);
sb.append("&title=").append(merchantBaseInfo.getAlias());
sb.append("?title=").append(merchantBaseInfo.getAlias());
sb.append("&password=").append(userInfo.getPassword().toLowerCase());
sb.append("&mobile=").append(userInfo.getLoginName());
sb.append("&syb_m_id=").append(merchantStore.getId());

5
pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
View File

@@ -350,9 +350,10 @@ public class SxfMerAuditHandler {
QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
.eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
//String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
StringBuilder sb = new StringBuilder(baseUrl);
sb.append("&title=").append(merchantBaseInfo.getAlias());
sb.append("?title=").append(merchantBaseInfo.getAlias());
sb.append("&password=").append(userInfo.getPassword().toLowerCase());
sb.append("&mobile=").append(userInfo.getLoginName());
sb.append("&syb_m_id=").append(merchantStore.getId());

13
pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
View File

@@ -68,7 +68,18 @@ public class GeneralPushUtil implements IPush {
mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam);
userPushService.push(alias, notificationTitle, msgContent, extrasParam);*/
MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}");
//MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}");
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
try {
MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}");
} catch (Exception e) {
e.printStackTrace();