xiangq

cif-service/src/main/java/com/txz/cif/web/mng/RechargeRecordController.java

@@ -3,8 +3,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.Account;
 import com.txz.cif.model.BizLog;
 import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.service.AccountService;
 import com.txz.cif.service.BizLogService;
 import com.txz.cif.service.RechargeRecordService;
 
@@ -44,9 +46,11 @@ public class RechargeRecordController {
 	@Resource
 	private BizLogService bizLogService;
 
+	@Resource
+	private AccountService accountService;
     @GetMapping("/detail")
 	@ApiOperation(value = "rechargeRecord获取详情",httpMethod = "GET")
-    public Result<RechargeRecordBO> detail(@RequestParam Integer id) {
+    public Result<RechargeRecordBO> detail(@RequestParam Long id) {
     	if(id == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
@@ -62,6 +66,10 @@ public class RechargeRecordController {
 					.andEqualTo("bizNo",rechargeRecord.getOrderNo());
 			List<BizLog> logs = bizLogService.findByCondition(c);
 			bo.setBizLogs(logs);
+			Account wallet = accountService.getAccount(rechargeRecord.getUserId(), 1);
+			bo.setWalletBalance(wallet.getBalance());
+			Account earnings = accountService.getAccount(rechargeRecord.getUserId(), 2);
+			bo.setEarningsBalance(earnings.getBalance());
 			return ResultGenerator.genSuccessResult(bo);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);

cif-service/src/main/java/com/txz/cif/web/mng/WithdrawRecordController.java

@@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.Account;
 import com.txz.cif.model.BizLog;
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.model.WithdrawRecord;
@@ -48,7 +49,7 @@ public class WithdrawRecordController {
 
     @GetMapping("/detail")
 	@ApiOperation(value = "withdrawRecord获取详情",httpMethod = "GET")
-    public Result<WithdrawRecordBO> detail(@RequestParam Integer id) {
+    public Result<WithdrawRecordBO> detail(@RequestParam Long id) {
     	if(id == null){
     		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
     	}
@@ -64,6 +65,11 @@ public class WithdrawRecordController {
 					.andEqualTo("bizNo",withdrawRecord.getOrderNo());
 			List<BizLog> logs = bizLogService.findByCondition(c);
 			bo.setBizLogs(logs);
+
+			Account wallet = accountService.getAccount(rechargeRecord.getUserId(), 1);
+			bo.setWalletBalance(wallet.getBalance());
+			Account earnings = accountService.getAccount(rechargeRecord.getUserId(), 2);
+			bo.setEarningsBalance(earnings.getBalance());
 			return ResultGenerator.genSuccessResult(bo);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);