From 2c02b816b56d6c979315e8d6bb0ab4bc93b8076c Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 11 Jul 2022 18:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=88=86=E9=94=80=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=80=BC=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/distribution/entity/dos/DistributionOrder.java     | 3 +++
 .../distribution/serviceimpl/DistributionCashServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
index 491a8faf..fc760ac4 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
@@ -50,6 +50,9 @@ public class DistributionOrder extends BaseIdEntity {
     private String distributionId;
     @ApiModelProperty(value = "分销员名称")
     private String distributionName;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "解冻日期")
     private Date settleCycle;
     @ApiModelProperty(value = "提成金额")
diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
index 805fc9db..8f3e18cc 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
@@ -73,6 +73,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
             }
             //将提现金额存入冻结金额,扣减可提现金额
             distribution.setCanRebate(CurrencyUtil.sub(distribution.getCanRebate(), applyMoney));
+            distribution.setCommissionFrozen(CurrencyUtil.add(distribution.getCommissionFrozen(), applyMoney));
             distributionService.updateById(distribution);
             //提现申请记录
             DistributionCash distributionCash = new DistributionCash("D" + SnowFlake.getId(), distribution.getId(), applyMoney, distribution.getMemberName());