PC端 提现记录导出功能优化

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TTxRecordController.java

@@ -12,6 +12,7 @@ import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.poi.ExcelUtil;
 import com.ylx.massage.domain.TOrder;
 import com.ylx.massage.domain.TTxRecord;
+import com.ylx.massage.enums.TTxRecordEnum;
 import com.ylx.massage.service.TTxRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -126,6 +127,25 @@ public class TTxRecordController extends BaseController {
     @PostMapping(value = "pc/export")
     public void export(HttpServletResponse response, Page<TTxRecord> page, TTxRecord record) {
         Page<TTxRecord> pageRecord = recordService.page(page, record, this.getDeptId());
+        pageRecord.getRecords().forEach(r -> {
+            if(r.getnStatus().compareTo(TTxRecordEnum.PASS_ING.getCode())==0){
+                r.setnStatusShow(TTxRecordEnum.PASS_ING.getInfo());
+            }
+            if(r.getnStatus().compareTo(TTxRecordEnum.PASS.getCode())==0){
+                r.setnStatusShow(TTxRecordEnum.PASS.getInfo());
+            }
+            if(r.getnStatus().compareTo(TTxRecordEnum.NO_PASS.getCode())==0){
+                r.setnStatusShow(TTxRecordEnum.NO_PASS.getInfo());
+            }
+
+            //提现到账金额
+            r.setrPrice(r.getdPrice().multiply(r.getPercent()).
+                    setScale(2, RoundingMode.DOWN));
+            //提现代扣税额
+            r.setWPrice(r.getdPrice().subtract(r.getrPrice()).
+                    setScale(2, RoundingMode.DOWN));
+            r.setPercentShow(r.getPercent().multiply(new BigDecimal("100")).setScale(2, RoundingMode.DOWN).toPlainString()+"%");
+        });
         ExcelUtil<TTxRecord> util = new ExcelUtil<>(TTxRecord.class);
         util.exportExcel(response, pageRecord.getRecords(), "提现信息");
     }
@@ -154,6 +174,12 @@ public class TTxRecordController extends BaseController {
         }
         Page<TTxRecord> pageResult = recordService.page(page, txRecord, this.getDeptId());
         pageResult.getRecords().forEach(r -> {
+            //提现到账金额
+            r.setrPrice(r.getdPrice().multiply(r.getPercent()).
+                    setScale(2, RoundingMode.DOWN));
+            //提现代扣税额
+            r.setWPrice(r.getdPrice().subtract(r.getrPrice()).
+                    setScale(2, RoundingMode.DOWN));
             r.setPercentShow(r.getPercent().multiply(new BigDecimal("100")).setScale(2, RoundingMode.DOWN).toPlainString()+"%");
         });
         return R.ok(pageResult);

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TTxRecord.java

@@ -69,6 +69,14 @@ public class TTxRecord implements Serializable {
     @ApiModelProperty("提现金额")
     private BigDecimal dPrice;
 
+    /**
+     * 税率-前端展示
+     */
+    @TableField(exist = false)
+    @Excel(name = "税率")
+    @ApiModelProperty("税率")
+    private String percentShow;
+
     /**
      * 提现到账金额
      */
@@ -148,11 +156,18 @@ public class TTxRecord implements Serializable {
     /**
      * 审核中0 审核通过1
      */
-    @Excel(name = "状态")
     @TableField("n_status")
     @ApiModelProperty("审核中0, 审核通过1, 驳回2")
     private Integer nStatus;
 
+    /**
+     * 审核中0 审核通过1
+     */
+    @Excel(name = "状态")
+    @TableField(exist = false)
+    @ApiModelProperty("审核中0, 审核通过1, 驳回2")
+    private String nStatusShow;
+
     /**
      * 创建时间
      */
@@ -174,14 +189,6 @@ public class TTxRecord implements Serializable {
     @ApiModelProperty("结束时间")
     private String endTime;
 
-    /**
-     * 税率-前端展示
-     */
-    @TableField(exist = false)
-    @Excel(name = "税率")
-    @ApiModelProperty("税率")
-    private String percentShow;
-
     public String getcId() {
         return cId;
     }
@@ -298,4 +305,12 @@ public class TTxRecord implements Serializable {
     public void setPercentShow(String percentShow) {
         this.percentShow = percentShow;
     }
+
+    public String getnStatusShow() {
+        return nStatusShow;
+    }
+
+    public void setnStatusShow(String nStatusShow) {
+        this.nStatusShow = nStatusShow;
+    }
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -1610,8 +1610,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 eq(com.ylx.common.utils.StringUtils.isNotBlank(user.getcOpenid()),TOrder::getcOpenId, user.getcOpenid()).
                 eq(wStatus != null, TOrder::getwStatus, wStatus).
                 // 过滤 待付款 退单审核通过 已取消 已拒绝
-                ne(TOrder::getnStatus, OrderStatusEnum.WAIT_PAY).
-                ne(TOrder::getnStatus, OrderStatusEnum.CANCEL_APPLICATION_PASS).
+                ne(TOrder::getnStatus, OrderStatusEnum.WAIT_PAY.getCode()).
+                ne(TOrder::getnStatus, OrderStatusEnum.CANCEL_APPLICATION_PASS.getCode()).
                 ne(TOrder::getnStatus, OrderStatusEnum.CANCEL.getCode()).
                 ne(TOrder::getnStatus, OrderStatusEnum.REFUSE.getCode()).
                 orderByDesc(TOrder::getDtCreateTime);