mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

扫码登录

This commit is contained in:
pan.wl.2 2024-11-12 00:00:47 +08:00
parent a3ec439f33
commit ddfef19682
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRefundServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.mdd.common.mapper.RefundLogMapper;
import com.mdd.common.mapper.RefundRecordMapper; import com.mdd.common.mapper.RefundRecordMapper;
import com.mdd.common.util.StringUtils; import com.mdd.common.util.StringUtils;
import com.mdd.common.util.TimeUtils; import com.mdd.common.util.TimeUtils;
import com.mdd.common.util.UrlUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -85,6 +86,7 @@ public class FinanceRefundServiceImpl implements IFinanceRefundService {
vo.setRefundStatusText(RefundEnum.getRefundStatusMsg(vo.getRefundStatus())); vo.setRefundStatusText(RefundEnum.getRefundStatusMsg(vo.getRefundStatus()));
vo.setRefundWayText(PaymentEnum.getPayWayMsg(vo.getRefundWay())); vo.setRefundWayText(PaymentEnum.getPayWayMsg(vo.getRefundWay()));
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar()));
} }
Map<String, Object> extend = new LinkedHashMap<>(); Map<String, Object> extend = new LinkedHashMap<>();

5
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingNoticeServiceImpl.java
View File

@ -46,13 +46,10 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
for (NoticeSetting n : noticeSettings) { for (NoticeSetting n : noticeSettings) {
SettingNoticeListedVo vo = new SettingNoticeListedVo(); SettingNoticeListedVo vo = new SettingNoticeListedVo();
BeanUtils.copyProperties(n, vo); BeanUtils.copyProperties(n, vo);
JSONObject systemNotice = JSONObject.parse(n.getSystemNotice()); JSONObject systemNotice = JSONObject.parse(n.getSystemNotice());
JSONObject smsNotice = JSONObject.parse(n.getSmsNotice()); JSONObject smsNotice = JSONObject.parse(n.getSmsNotice());
JSONObject oaNotice = JSONObject.parse(n.getOaNotice()); JSONObject oaNotice = JSONObject.parse(n.getOaNotice());
JSONObject mnpNotice = JSONObject.parse(n.getMnpNotice()); JSONObject mnpNotice = JSONObject.parse(n.getMnpNotice());
if (systemNotice != null && "1".equals(systemNotice.getString("status"))) { if (systemNotice != null && "1".equals(systemNotice.getString("status"))) {
vo.setSmsNotice(systemNotice); vo.setSmsNotice(systemNotice);
} }
@ -68,7 +65,7 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
if (mnpNotice != null && "1".equals(mnpNotice.getString("status"))) { if (mnpNotice != null && "1".equals(mnpNotice.getString("status"))) {
vo.setSmsNotice(mnpNotice); vo.setSmsNotice(mnpNotice);
} }
vo.setType(n.getType()==1?"业务通知":"验证码"); vo.setTypeDesc(n.getType()==1?"业务通知":"验证码");
list.add(vo); list.add(vo);
} }

4
server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingPaymentServiceImpl.java
View File

@ -93,8 +93,8 @@ public class SettingPaymentServiceImpl implements ISettingPaymentService {
.orderByDesc(Arrays.asList("sort", "id"))); .orderByDesc(Arrays.asList("sort", "id")));
for (DevPayConfig dev : devPayConfigs) { for (DevPayConfig dev : devPayConfigs) {
dev.setPayWayName(dev.getName()); dev.setPayWayName(PaymentEnum.getPayWayMsg(dev.getPayWay()));
dev.setName(PaymentEnum.getPayWayMsg(dev.getPayWay())); dev.setName(dev.getName());
dev.setConfig(JSONObject.parse("{}")); dev.setConfig(JSONObject.parse("{}"));
dev.setIcon(UrlUtils.toAdminAbsoluteUrl(dev.getIcon())); dev.setIcon(UrlUtils.toAdminAbsoluteUrl(dev.getIcon()));
} }

2
server/like-common/src/main/java/com/mdd/common/core/AjaxResult.java
View File

@ -45,7 +45,7 @@ public class AjaxResult<T> {
* @return AjaxResult * @return AjaxResult
*/ */
public static AjaxResult<Object> success() { public static AjaxResult<Object> 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());
} }
/** /**