diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/account/service/impl/AccountServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/account/service/impl/AccountServiceImpl.java index 7397392..f424efa 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/account/service/impl/AccountServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/account/service/impl/AccountServiceImpl.java @@ -109,7 +109,7 @@ public class AccountServiceImpl implements AccountService ServiceUtil.assertion(StringUtils.isAnyBlank(account.getNo(), account.getName(), account.getIdCard()), "银行卡、姓名或身份证存在空值"); BankCardInfo bankCardInfo = BankValidUtils.valid3Bank(account.getNo(), account.getName(), account.getIdCard()); ServiceUtil.assertion(bankCardInfo == null, "银行卡三要素校验失败"); - account.setBankCardName(bankCardInfo.getBankName()); + account.setBankName(bankCardInfo.getBankName()); account.setBankType(bankCardInfo.getType()); account.setBankIcon(bankCardInfo.getIcon()); account.setBankCardName(bankCardInfo.getCardName()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundDashboardImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundDashboardImpl.java index 75a6006..5924527 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundDashboardImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundDashboardImpl.java @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.bst.pay.domain.enums.PayBstType; -import com.ruoyi.bst.pay.domain.enums.PayStatus; import com.ruoyi.bst.refund.domain.RefundQuery; +import com.ruoyi.bst.refund.domain.enums.RefundStatus; import com.ruoyi.bst.refund.mapper.RefundMapper; import com.ruoyi.bst.refund.service.RefundDashboard; import com.ruoyi.common.utils.MathUtils; @@ -24,7 +24,7 @@ public class RefundDashboardImpl implements RefundDashboard { RefundQuery query = new RefundQuery(); BeanUtils.copyBeanProp(query, refundQuery); query.setPayBstType(PayBstType.ORDER.getType()); - query.setStatusList(PayStatus.payedList()); + query.setStatusList(RefundStatus.valid()); return MathUtils.dv(refundMapper.selectSumofAmount(query)); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/system/SysProfileController.java b/ruoyi-web/src/main/java/com/ruoyi/web/system/SysProfileController.java index 4dab75a..ff32cd7 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/system/SysProfileController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/system/SysProfileController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.system; +import com.ruoyi.common.utils.qiniu.QiNiuUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -57,7 +58,7 @@ public class SysProfileController extends BaseController /** * 修改用户 */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @Log(title = "修改个人信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult updateProfile(@RequestBody User user) { @@ -86,7 +87,7 @@ public class SysProfileController extends BaseController /** * 重置密码 */ - @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @Log(title = "重置密码", businessType = BusinessType.UPDATE, isSaveRequestData = false) @PutMapping("/updatePwd") public AjaxResult updatePwd(String oldPassword, String newPassword) { @@ -122,7 +123,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + String avatar = QiNiuUtils.DOMAIN + "/" + QiNiuUtils.upload(file); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success();