Merge remote-tracking branch 'origin/dev' into dev

pz-system/src/main/java/com/pz/system/domain/vo/PaymentRecordVo.java

@@ -49,13 +49,13 @@ public class PaymentRecordVo {
      * 金额
      */
     @ExcelProperty(value = "金额")
-    private Long money;
+    private Double money;
 
     /**
      * 用户
      */
     @ExcelProperty(value = "用户")
-    private Long uid;
+    private Integer uid;
 
     /**
      * 备注

pz-system/src/main/java/com/pz/system/service/impl/PaymentRecordServiceImpl.java

@@ -2,6 +2,7 @@ package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pz.common.core.domain.BaseEntity;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -53,7 +54,7 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
         Optional.ofNullable(result.getRecords())
             .ifPresent(paymentRecordVos -> {
                 paymentRecordVos.forEach(paymentRecordVo -> {
-                    Optional.ofNullable(sysUserMapper.selectUserById(paymentRecordVo.getUid()))
+                    Optional.ofNullable(sysUserMapper.selectUserById(paymentRecordVo.getUid().longValue()))
                         .ifPresent(sysUser -> {
                             paymentRecordVo.setUserName(sysUser.getUserName());
                         });
@@ -79,6 +80,7 @@ public class PaymentRecordServiceImpl implements IPaymentRecordService {
         lqw.eq(StringUtils.isNotBlank(bo.getOtherOrder()), PaymentRecord::getOtherOrder, bo.getOtherOrder());
         lqw.eq(bo.getMoney() != null, PaymentRecord::getMoney, bo.getMoney());
         lqw.eq(bo.getUid() != null, PaymentRecord::getUid, bo.getUid());
+        lqw.orderByDesc(BaseEntity::getCreateTime);
         return lqw;
     }
 

pz-system/src/main/java/com/pz/system/service/impl/UserRefundServiceImpl.java

@@ -59,10 +59,10 @@ public class UserRefundServiceImpl implements IUserRefundService {
             userRefundVos.forEach(userRefundVo -> {
                 Optional.ofNullable(totalOrderMapper.selectVoById(userRefundVo.getOrderId()))
                     .ifPresent(totalOrderVo -> {
+                        userRefundVo.setRemark(totalOrderVo.getRefundReason());
                         userRefundVo.setOrderSn(totalOrderVo.getOrderSn());
-                        userRefundVo.setPayMoney(new BigDecimal(totalOrderVo.getPayMoney()));
+                        userRefundVo.setPayMoney(new BigDecimal(totalOrderVo.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_UP));
                     });
-
                 Optional.ofNullable(businessMapper.selectVoById(userRefundVo.getBusinessId())).ifPresent(
                     businessVo -> {
                         userRefundVo.setBname(businessVo.getName());