From 3acdb7733e7b30a311d0462f52ba2a595730b5b5 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Sat, 24 Jul 2021 11:47:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/lili/modules/goods/entity/dos/Goods.java   | 1 +
 .../cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index f8a347d1..6e92ee79 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -222,6 +222,7 @@ public class Goods extends BaseEntity {
         this.intro = goodsOperationDTO.getIntro();
         this.mobileIntro = goodsOperationDTO.getMobileIntro();
         this.cost = goodsOperationDTO.getCost();
+        this.goodsVideo = goodsOperationDTO.getGoodsVideo();
         if (goodsOperationDTO.getGoodsParamsDTOList() != null && goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) {
             this.params = JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList());
         }
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
index c8f7affc..a6039d8b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -120,6 +120,12 @@ public class GoodsOperationDTO implements Serializable {
     @ApiModelProperty(value = "商品类型")
     private String goodsType;
 
+    /**
+     * 商品视频
+     */
+    @ApiModelProperty(value = "商品视频")
+    private String goodsVideo;
+
 
 
 }

From 094212e6a20174e3bef9700ce9dac545be700400 Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Sat, 24 Jul 2021 17:39:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/common/enums/ResultCode.java |  1 +
 .../serviceimpl/MemberWalletServiceImpl.java  |  2 +-
 .../MemberWithdrawApplyServiceImpl.java       | 21 +++++++++++--------
 update-sql/version4.1to4.2.sql                |  5 ++++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
index 95b4ff4b..b72d707a 100644
--- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java
+++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java
@@ -220,6 +220,7 @@ public enum ResultCode {
     WALLET_NOT_EXIT_ERROR(34000, "钱包不存在，请联系管理员"),
     WALLET_INSUFFICIENT(34001, "余额不足以支付订单，请充值!"),
     WALLET_WITHDRAWAL_INSUFFICIENT(34002, "可提现金额不足！"),
+    WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT(34006, "冻结金额不足，无法处理提现申请请求！"),
     WALLET_ERROR_INSUFFICIENT(34003, "零钱提现失败！"),
     WALLET_REMARK_ERROR(34004, "请填写审核备注！"),
     WALLET_APPLY_ERROR(34005, "提现申请异常！"),
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
index 915f1707..e4451089 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
@@ -154,7 +154,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         if (0 > CurrencyUtil.sub(memberWallet.getMemberWallet(), money)) {
             throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
         }
-        memberWallet.setMemberWallet(CurrencyUtil.sub(memberWallet.getMemberWallet(), money));
+        memberWallet.setMemberFrozenWallet(CurrencyUtil.sub(memberWallet.getMemberFrozenWallet(), money));
         this.updateById(memberWallet);
         //新增预存款日志
         WalletLog walletLog = new WalletLog(memberWallet.getMemberId(), memberWallet.getMemberName(), -money, "提现金额已冻结，审核通过提现成功", serviceType);
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
index a9f45007..7faba804 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
@@ -3,6 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.DateUtil;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -45,22 +46,23 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
         //查询申请记录
         MemberWithdrawApply memberWithdrawApply = this.getById(applyId);
         memberWithdrawApply.setInspectRemark(remark);
+        memberWithdrawApply.setInspectTime(new Date());
         if (memberWithdrawApply != null) {
-            //写入备注
-            memberWithdrawApply.setInspectRemark(remark);
+           //获取账户余额
+            MemberWalletVO memberWalletVO = memberWalletService.getMemberWallet(memberWithdrawApply.getMemberId());
+            //校验金额是否满足提现，因为是从冻结金额扣减，所以校验的是冻结金额
+            if (memberWalletVO.getMemberFrozenWallet() < memberWithdrawApply.getApplyMoney()) {
+                throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT);
+            }
             //如果审核通过 则微信直接提现，反之则记录审核状态
             if (result) {
-                //校验金额是否满足提现，因为是从冻结金额扣减，所以校验的是冻结金额
-                MemberWalletVO memberWalletVO = memberWalletService.getMemberWallet(memberWithdrawApply.getMemberId());
-                if (memberWalletVO.getMemberFrozenWallet() < memberWithdrawApply.getApplyMoney()) {
-                    throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
-                }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.VIA_AUDITING.name());
-                //保存审核记录
-                this.updateById(memberWithdrawApply);
                 //提现，微信提现成功后扣减冻结金额
                 Boolean bool = memberWalletService.withdrawal(memberWithdrawApply);
                 if (bool) {
+                    //保存修改审核记录
+                    this.updateById(memberWithdrawApply);
+                    //记录日志
                     memberWalletService.reduceFrozen(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核通过，余额提现", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
                     return true;
                 }
@@ -70,6 +72,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                     throw new ServiceException(ResultCode.WALLET_REMARK_ERROR);
                 }
                 memberWithdrawApply.setApplyStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
+                //保存修改审核记录
                 this.updateById(memberWithdrawApply);
                 //需要从冻结金额扣减到余额
                 memberWalletService.increaseWithdrawal(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核拒绝，提现金额解冻到余额", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
diff --git a/update-sql/version4.1to4.2.sql b/update-sql/version4.1to4.2.sql
index d5564345..a0eaa351 100644
--- a/update-sql/version4.1to4.2.sql
+++ b/update-sql/version4.1to4.2.sql
@@ -22,4 +22,7 @@ INSERT INTO `lilishop`.`li_menu` (`id`, `create_by`, `create_time`, `delete_flag
 alter table li_member_evaluation modify column reply_image text;
 
 /** 修改售后图片字段类型 **/
-alter table li_after_sale modify column after_sale_image text;
\ No newline at end of file
+alter table li_after_sale modify column after_sale_image text;
+
+/** 提现申请审核sql **/
+INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1367042804944994305, 'admin', '2021-03-03 09:22:58', b'0', NULL, NULL, NULL, 'member/advance/withdrawApply', 'ios-alert', 2, 'withdrawApply', '1367042490443497472', 'withdrawApply', 1.00, '提现申请', NULL);
\ No newline at end of file