Bladeren bron

PC端 提现记录 税率显示问题修改

lixiaolong 1 dag geleden
bovenliggende
commit
b33f4cbbf7

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

@@ -152,7 +152,11 @@ public class TTxRecordController extends BaseController {
         if(null != this.getDeptId() && this.getDeptId() != 100){
             tTxRecordLambdaQueryWrapper.eq(TTxRecord::getDeptId,this.getDeptId());
         }
-        return R.ok(recordService.page(page, txRecord, this.getDeptId()));
+        Page<TTxRecord> pageResult = recordService.page(page, txRecord, this.getDeptId());
+        pageResult.getRecords().forEach(r -> {
+            r.setPercentShow(r.getPercent().toPlainString().substring(r.getPercent().toPlainString().length() - 1)+"%");
+        });
+        return R.ok(pageResult);
     }
 
 

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

@@ -89,7 +89,6 @@ public class TTxRecord implements Serializable {
      * 税率
      */
     @TableField("percent")
-    @Excel(name = "税率")
     @ApiModelProperty("税率")
     private BigDecimal percent;
 
@@ -175,6 +174,14 @@ public class TTxRecord implements Serializable {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    /**
+     * 税率-前端展示
+     */
+    @TableField(exist = false)
+    @Excel(name = "税率")
+    @ApiModelProperty("税率")
+    private String percentShow;
+
     public String getcId() {
         return cId;
     }
@@ -283,4 +290,12 @@ public class TTxRecord implements Serializable {
     public void setrPrice(BigDecimal rPrice) {
         this.rPrice = rPrice;
     }
+
+    public String getPercentShow() {
+        return percentShow;
+    }
+
+    public void setPercentShow(String percentShow) {
+        this.percentShow = percentShow;
+    }
 }