diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletInfoController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletInfoController.java index bee0219..85a1a7f 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletInfoController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletInfoController.java @@ -9,6 +9,7 @@ import org.jeecg.api.service.AppletInfoService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.jeecg.modules.commonHelp.entity.CommonHelp; +import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; @@ -97,8 +98,8 @@ public class AppletInfoController { //提现 @ApiOperation(value="提现", notes="提现") @PostMapping("/openMoney") - public Result openMoney (@RequestHeader("X-Access-Token") String token, BigDecimal money){ - return appletInfoService.openMoney(token,money); + public Result openMoney (@RequestHeader("X-Access-Token") String token, BigDecimal money, CommonMoneyLog log){ + return appletInfoService.openMoney(token,money, log); } //领取提现 @ApiOperation(value="提现", notes="提现") diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletInfoService.java b/module-common/src/main/java/org/jeecg/api/service/AppletInfoService.java index aaabf1a..9fed55c 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletInfoService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletInfoService.java @@ -4,6 +4,7 @@ import org.jeecg.api.bean.PageBean; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.commonAddress.entity.CommonAddress; import org.jeecg.modules.commonHelp.entity.CommonHelp; +import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; import java.math.BigDecimal; @@ -47,7 +48,7 @@ public interface AppletInfoService { //提现 - Result openMoney (String token, BigDecimal money); + Result openMoney (String token, BigDecimal money, CommonMoneyLog log); //流水记录带分页搜索 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java index ae92194..68663a2 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoServiceImpl.java @@ -259,13 +259,12 @@ public class AppletInfoServiceImpl implements AppletInfoService { //提现 @Override - public Result openMoney (String token, BigDecimal money){ + public Result openMoney (String token, BigDecimal money, CommonMoneyLog commonMoneyLog){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); if(money.compareTo(hanHaiMember.getMoney()) == 1){ return Result.error("提现金额不能大于余额"); } //增加提现流水 - CommonMoneyLog commonMoneyLog = new CommonMoneyLog(); commonMoneyLog.setCreateTime(new Date()); commonMoneyLog.setTitle("提现"); commonMoneyLog.setUserId(hanHaiMember.getId());