From 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 28 十一月 2022 11:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java | 39 ++++++++++++++++++++++++++++++++-------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java | 2 +-
2 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
index 3fe4e19..924cbe1 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.mapper.ReplyTemplateMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IReplyTemplateService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -34,14 +35,38 @@
public ReplyTemplateEntity selectConfigData(String Id) {
ReplyTemplateEntity replyTemplateEntity = baseMapper.selectConfigData(Id);
if (replyTemplateEntity!=null)
- { String[] split;
- if (replyTemplateEntity.getAccessoryId()!=null){
- split = replyTemplateEntity.getAccessoryId().split(",");
- replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ {
+ if(!StringUtils.isEmpty(replyTemplateEntity.getAccessoryId()))
+ {
+ if(replyTemplateEntity.getAccessoryId().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getAccessoryId()};
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getAccessoryId().split(",");
+ replyTemplateEntity.setElseAccessoryEntityList( elseAccessoryMapper.selectListByIds(split));
+ }
}
- if (replyTemplateEntity.getGuidance()!=null){
- split=replyTemplateEntity.getGuidance().split(",");
- replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+
+
+ if (!StringUtils.isEmpty(replyTemplateEntity.getGuidance())){
+
+ if(replyTemplateEntity.getGuidance().indexOf(",")<0)
+ {
+ String[] split=new String[]{replyTemplateEntity.getGuidance()};
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+ else
+ {
+ String[] split;
+ split = replyTemplateEntity.getGuidance().split(",");
+ replyTemplateEntity.setTransactionEventList(transactionEventMapper.selectListByIds(split));
+ }
+
+
}
return replyTemplateEntity;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
index 32529e4..dca4ae7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxPayUtils.java
@@ -157,7 +157,7 @@
//接收请求返回值
String content = HttpClientUtil.doRefund(url,WXPayUtil.mapToXml(paramMap),mchId,isTest);
log.info("微信退款返回字符串：{}",content);
- Map<String, String> resultMap = WXPayUtil.xmlToMap(content);
+ Map<String, String> resultMap = PayUtil.doXMLParse(content);
if (PayCpmstant.RETURN_CODE.equals(resultMap.get(PayCpmstant.RETURN_CODE_CODE))
&& PayCpmstant.RETURN_CODE.equals(resultMap.get(PayCpmstant.RESULT_CODE_CODE))) {
log.info("调用微信退款申请接口成功");
--
Gitblit v1.7.1