From 5ecc5e9bd3a1ea6866296f8ecc08270a8ac5ce3f Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Sun, 22 Jun 2025 19:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=8F=90=E7=8E=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-pc/src/views/commonMoney/CommonMoneyList.vue | 59 ++++++++++++---------- .../views/commonMoney/modules/CommonMoneyForm.vue | 24 ++++----- .../jeecg/api/controller/AppletInfoController.java | 10 +++- .../org/jeecg/api/service/AppletInfoService.java | 3 +- .../api/service/impl/AppletInfoServiceImpl.java | 33 +++++++++++- .../controller/CommonMoneyLogController.java | 14 +++++ .../commonMoneyLog/entity/CommonMoneyLog.java | 13 ++++- 7 files changed, 112 insertions(+), 44 deletions(-) diff --git a/admin-pc/src/views/commonMoney/CommonMoneyList.vue b/admin-pc/src/views/commonMoney/CommonMoneyList.vue index 2f7a8c1..c1e609f 100644 --- a/admin-pc/src/views/commonMoney/CommonMoneyList.vue +++ b/admin-pc/src/views/commonMoney/CommonMoneyList.vue @@ -13,10 +13,10 @@ 查询 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - + + + + @@ -83,7 +83,7 @@ - 提现审核 + 提现审核 @@ -124,7 +124,7 @@ }, data () { return { - description: '提现流水管理页面', + description: '提现审核', // 表头 columns: [ { @@ -143,36 +143,35 @@ sorter: true, dataIndex: 'createTime' }, + { + title:'标题', + align:"center", + dataIndex: 'title' + }, { title:'用户表标识', align:"center", dataIndex: 'userId_dictText' }, { - title:'状态', + title:'审核状态', align:"center", dataIndex: 'status_dictText' }, { - title:'金额', - align:"center", - dataIndex: 'price' + title:'领取状态', + align:"center", + dataIndex: 'state_dictText' }, { - title:'当前余额', + title:'提现金额', align:"center", dataIndex: 'money' }, { - title:'标题', + title:'原钱包金额', align:"center", - dataIndex: 'title' - }, - { - title:'截图', - align:"center", - dataIndex: 'image', - scopedSlots: {customRender: 'imgSlot'} + dataIndex: 'oldMoney' }, { title: '操作', @@ -184,19 +183,21 @@ } ], url: { - list: "/commonMoney/commonMoney/list", - delete: "/commonMoney/commonMoney/delete", - deleteBatch: "/commonMoney/commonMoney/deleteBatch", - exportXlsUrl: "/commonMoney/commonMoney/exportXls", - importExcelUrl: "commonMoney/commonMoney/importExcel", - + list: "/commonMoneyLog/commonMoneyLog/list", + delete: "/commonMoneyLog/commonMoneyLog/delete", + deleteBatch: "/commonMoneyLog/commonMoneyLog/deleteBatch", + exportXlsUrl: "/commonMoneyLog/commonMoneyLog/exportXls", + importExcelUrl: "commonMoneyLog/commonMoneyLog/importExcel", }, dictOptions:{}, superFieldList:[], + queryParam: { + type : '2' + }, } }, created() { - this.getSuperFieldList(); + this.getSuperFieldList(); }, computed: { importExcelUrl: function(){ @@ -204,6 +205,12 @@ }, }, methods: { + searchReset() { + this.queryParam = { + type : '2' + } + this.loadData(1); + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/admin-pc/src/views/commonMoney/modules/CommonMoneyForm.vue b/admin-pc/src/views/commonMoney/modules/CommonMoneyForm.vue index a913e12..3f52825 100644 --- a/admin-pc/src/views/commonMoney/modules/CommonMoneyForm.vue +++ b/admin-pc/src/views/commonMoney/modules/CommonMoneyForm.vue @@ -10,17 +10,17 @@ - + - + - - + + @@ -28,11 +28,11 @@ - - - - - + + + + + @@ -72,9 +72,9 @@ validatorRules: { }, url: { - add: "/commonMoney/commonMoney/add", - edit: "/commonMoney/commonMoney/edit", - queryById: "/commonMoney/commonMoney/queryById" + add: "/commonMoneyLog/commonMoneyLog/add", + edit: "/commonMoneyLog/commonMoneyLog/edit", + queryById: "/commonMoneyLog/commonMoneyLog/queryById" } } }, 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 42e9066..bee0219 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 @@ -100,12 +100,18 @@ public class AppletInfoController { public Result openMoney (@RequestHeader("X-Access-Token") String token, BigDecimal money){ return appletInfoService.openMoney(token,money); } + //领取提现 + @ApiOperation(value="提现", notes="提现") + @PostMapping("/requestMerchantTransfer") + public Result requestMerchantTransfer (@RequestHeader("X-Access-Token") String token, String id){ + return appletInfoService.requestMerchantTransfer(token, id); + } @ApiOperation(value="获取流水日志列表", notes="获取流水日志列表") @GetMapping("/getLogList") - public Result getLogList(@RequestHeader("X-Access-Token") String token,String timeDate, PageBean pageBean){ - return appletInfoService.getLogList(token,timeDate,pageBean); + public Result getLogList(@RequestHeader("X-Access-Token") String token,String timeDate, PageBean pageBean, String type){ + return appletInfoService.getLogList(token,timeDate,pageBean, type); } // @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 8eb2fc6..aaabf1a 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 @@ -51,7 +51,7 @@ public interface AppletInfoService { //流水记录带分页搜索 - Result getLogList(String token,String timeDate,PageBean pageBean); + Result getLogList(String token,String timeDate,PageBean pageBean, String type); //生成邀请二维码 @@ -64,4 +64,5 @@ public interface AppletInfoService { //新增帮助反馈信息 Result addHelp(String token, CommonHelp commonHelp); + Result requestMerchantTransfer(String token, String id); } 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 681d2dd..ae92194 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 @@ -6,6 +6,8 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xkcoding.http.util.StringUtil; +import jodd.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.jeecg.api.bean.FansPageBean; import org.jeecg.api.bean.PageBean; @@ -34,6 +36,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; @@ -104,6 +107,7 @@ public class AppletInfoServiceImpl implements AppletInfoService { List moneyList = commonMoneyLogMapper.selectObjs( new LambdaQueryWrapper() .eq(CommonMoneyLog::getUserId, hanHaiMember.getId()) + .eq(CommonMoneyLog::getType, 2) .select(CommonMoneyLog::getMoney) ).stream() .filter(obj -> obj != null) @@ -267,27 +271,37 @@ public class AppletInfoServiceImpl implements AppletInfoService { commonMoneyLog.setUserId(hanHaiMember.getId()); commonMoneyLog.setMoney(money); commonMoneyLog.setOldMoney(hanHaiMember.getMoney()); - commonMoneyLog.setType(1); + commonMoneyLog.setType(2);//提现类型 commonMoneyLog.setState(0); + commonMoneyLog.setStatus("0"); commonMoneyLogService.save(commonMoneyLog); //修改用户余额 BigDecimal money1 = hanHaiMember.getMoney().subtract(money); hanHaiMember.setMoney(money1); hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("提现成功"); } //流水记录带分页搜索 @Override - public Result getLogList(String token,String timeDate,PageBean pageBean){ + public Result getLogList(String token,String timeDate,PageBean pageBean, String type){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + + + Page pageList = commonMoneyLogService.lambdaQuery() .eq(CommonMoneyLog::getUserId,hanHaiMember.getId()) +// .eq(StringUtil.isNotEmpty(timeDate), CommonMoneyLog::getCreateTime, timeDate) .orderByDesc(CommonMoneyLog::getCreateTime) + .eq(StringUtil.isNotEmpty(type), CommonMoneyLog::getType, type) .page(page); + return Result.OK("流水记录查询成功",pageList); } @@ -627,4 +641,19 @@ public class AppletInfoServiceImpl implements AppletInfoService { commonHelpService.save(commonHelp); return Result.OK("增加成功"); } + + @Override + public Result requestMerchantTransfer(String token, String id) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + CommonMoneyLog log = commonMoneyLogService.getById(id); + + if (ObjectUtils.isEmpty(log)){ + return Result.error("提现不存在"); + } + log.setState(1); + commonMoneyLogService.updateById(log); + + return Result.ok(); + } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java index 93813f9..f8831d1 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.xkcoding.http.util.StringUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -96,7 +98,19 @@ public class CommonMoneyLogController extends JeecgController edit(@RequestBody CommonMoneyLog commonMoneyLog) { + + // TODO 这里需要写审核通过的逻辑 + if (commonMoneyLog.getType() == 2 && + "1".equals(commonMoneyLog.getStatus()) + && StringUtil.isEmpty(commonMoneyLog.getPackageInfo())){ + //第一次审核通过 + +// commonMoneyLog.setPackageInfo(); + } + + commonMoneyLogService.updateById(commonMoneyLog); + return Result.OK("编辑成功!"); } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java index d7db7cc..7c675e0 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java @@ -65,7 +65,7 @@ public class CommonMoneyLog implements Serializable { /**类型*/ @Excel(name = "类型", width = 15, dicCode = "pay_type") @Dict(dicCode = "pay_type") - @ApiModelProperty(value = "类型") + @ApiModelProperty(value = "类型 0收入 1支出 2提现") private java.lang.Integer type; /**状态*/ @Excel(name = "状态", width = 15, dicCode = "pay_state") @@ -77,4 +77,15 @@ public class CommonMoneyLog implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "用户标识") private java.lang.String userId; + + /**类型*/ + @Excel(name = "审核状态", width = 15, dicCode = "withdraw_type") + @Dict(dicCode = "withdraw_type") + @ApiModelProperty(value = "审核状态") + private java.lang.String status; + + /**类型*/ + @Excel(name = "提现签名", width = 15) + @ApiModelProperty(value = "提现签名") + private java.lang.String packageInfo; }