diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java index fa88088e..2e12ad17 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java @@ -19,6 +19,7 @@ import com.mdd.common.mapper.RefundLogMapper; import com.mdd.common.mapper.RefundRecordMapper; import com.mdd.common.util.StringUtils; import com.mdd.common.util.TimeUtils; +import com.mdd.common.util.UrlUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -85,6 +86,7 @@ public class FinanceRefundServiceImpl implements IFinanceRefundService { vo.setRefundStatusText(RefundEnum.getRefundStatusMsg(vo.getRefundStatus())); vo.setRefundWayText(PaymentEnum.getPayWayMsg(vo.getRefundWay())); vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); } Map extend = new LinkedHashMap<>(); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java index db08cc69..adfb187c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java @@ -46,13 +46,10 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { for (NoticeSetting n : noticeSettings) { SettingNoticeListedVo vo = new SettingNoticeListedVo(); BeanUtils.copyProperties(n, vo); - - JSONObject systemNotice = JSONObject.parse(n.getSystemNotice()); JSONObject smsNotice = JSONObject.parse(n.getSmsNotice()); JSONObject oaNotice = JSONObject.parse(n.getOaNotice()); JSONObject mnpNotice = JSONObject.parse(n.getMnpNotice()); - if (systemNotice != null && "1".equals(systemNotice.getString("status"))) { vo.setSmsNotice(systemNotice); } @@ -68,7 +65,7 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { if (mnpNotice != null && "1".equals(mnpNotice.getString("status"))) { vo.setSmsNotice(mnpNotice); } - vo.setType(n.getType()==1?"业务通知":"验证码"); + vo.setTypeDesc(n.getType()==1?"业务通知":"验证码"); list.add(vo); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java index 1c0e1fff..9e8aced5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java @@ -93,8 +93,8 @@ public class SettingPaymentServiceImpl implements ISettingPaymentService { .orderByDesc(Arrays.asList("sort", "id"))); for (DevPayConfig dev : devPayConfigs) { - dev.setPayWayName(dev.getName()); - dev.setName(PaymentEnum.getPayWayMsg(dev.getPayWay())); + dev.setPayWayName(PaymentEnum.getPayWayMsg(dev.getPayWay())); + dev.setName(dev.getName()); dev.setConfig(JSONObject.parse("{}")); dev.setIcon(UrlUtils.toAdminAbsoluteUrl(dev.getIcon())); } diff --git a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java index e6738496..c32adc80 100644 --- a/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java +++ b/server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java @@ -45,7 +45,7 @@ public class AjaxResult { * @return AjaxResult */ public static AjaxResult success() { - return new AjaxResult<>(ErrorEnum.SUCCESS.getCode(), ErrorEnum.SUCCESS.getMsg(), new ArrayList<>(), ErrorEnum.SHOW_MSG.getCode()); + return new AjaxResult<>(ErrorEnum.SUCCESS.getCode(), ErrorEnum.SUCCESS.getMsg(), new ArrayList<>(), ErrorEnum.HIDE_MSG.getCode()); } /**