ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/AppUserController.java
@@ -32,7 +32,7 @@ */ @PostMapping("/getAppUserPage") @ApiOperation(value = "appUser分页") @PreAuthorize("@ss.hasPermi('appuser:manage')") // @PreAuthorize("@ss.hasPermi('appuser:manage')") public R<IPage<AppUserPageVO>> getAppUserPage(@RequestBody AppUserPageDTO getAppUserPage) { return R.ok(appUserService.getAppUserPage(getAppUserPage)); } @@ -42,7 +42,7 @@ */ @GetMapping("/detail/{id}") @ApiOperation(value = "查看详情") @PreAuthorize("@ss.hasPermi('appuser:manage')") // @PreAuthorize("@ss.hasPermi('appuser:manage')") public R<AppUserVO> detail(@PathVariable("id") String id){ return R.ok(appUserService.detail(id)); } @@ -51,7 +51,7 @@ */ @PutMapping("/frozen/{id}") @ApiOperation(value = "冻结/解冻") @PreAuthorize("@ss.hasPermi('appuser:manage')") // @PreAuthorize("@ss.hasPermi('appuser:manage')") public R<Void> frozen(@PathVariable("id") String id){ appUserService.frozen(id); return R.ok(); @@ -62,7 +62,7 @@ */ @PutMapping("/balance") @ApiOperation(value = "修改余额") @PreAuthorize("@ss.hasPermi('appuser:manage')") // @PreAuthorize("@ss.hasPermi('appuser:manage')") public R<Void> balance(@RequestBody UpdateBalanceDTO dto){ appUserService.balance(dto); return R.ok(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FinanceController.java
@@ -35,7 +35,7 @@ */ @PostMapping("/top") @ApiOperation(value = "财务流水-顶部") @PreAuthorize("@ss.hasPermi('finance:flows')") // @PreAuthorize("@ss.hasPermi('finance:flows')") public R<FinanceFlowsTopVO> top(@RequestBody FinanceFlowsDTO dto){ return R.ok(orderService.financeTop(dto)); } @@ -46,7 +46,7 @@ @PostMapping("/flows/page") @ApiOperation(value = "财务流水-分页") @PreAuthorize("@ss.hasPermi('finance:flows')") // @PreAuthorize("@ss.hasPermi('finance:flows')") public R<IPage<FinanceFlowsPageVO>> flowsPage(@RequestBody FinanceFlowsDTO dto){ return R.ok(orderService.flowsPage(dto)); } @@ -56,7 +56,7 @@ */ @PostMapping("/withdraw/page") @ApiOperation(value = "提现申请-分页") @PreAuthorize("@ss.hasPermi('finance:apply')") // @PreAuthorize("@ss.hasPermi('finance:apply')") public R<IPage<WithdrawPageVO>> withdrawPage(@RequestBody WithdrawPageDTO dto){ return R.ok(withdrawService.withdrawPage(dto)); } @@ -67,7 +67,7 @@ @PutMapping("/withdraw/agree") @ApiOperation(value = "提现申请-同意") @PreAuthorize("@ss.hasPermi('finance:flows')") // @PreAuthorize("@ss.hasPermi('finance:flows')") public R<Void> agree(@RequestBody WithDrawAgreeDTO dto){ withdrawService.agree(dto); return R.ok(); @@ -79,7 +79,7 @@ */ @PutMapping("/withdraw/refuse") @ApiOperation(value = "提现申请-拒绝") @PreAuthorize("@ss.hasPermi('finance:flows')") // @PreAuthorize("@ss.hasPermi('finance:flows')") public R<Void> refuse(@RequestBody WithDrawRefuseDTO dto){ withdrawService.refuse(dto); return R.ok(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/IndexController.java
@@ -39,7 +39,7 @@ */ @GetMapping("/qichacha") @ApiOperation(value = "接口统计") @PreAuthorize("@ss.hasPermi('index:manage')") // @PreAuthorize("@ss.hasPermi('index:manage')") public R<QichachaStatisticsVO> qichacha() { return R.ok( qichachaService.qichacha()); } @@ -49,7 +49,7 @@ */ @GetMapping("/today") @ApiOperation(value = "收入统计-今日入账") @PreAuthorize("@ss.hasPermi('index:manage')") // @PreAuthorize("@ss.hasPermi('index:manage')") public R<TodayStatisticsVO> today() { return R.ok( orderService.today()); } @@ -59,7 +59,7 @@ */ @GetMapping("/chart") @ApiOperation(value = "收入统计-折线图") @PreAuthorize("@ss.hasPermi('index:manage')") // @PreAuthorize("@ss.hasPermi('index:manage')") public R<IndexLineChartVO> chart(@RequestParam(required = false, defaultValue = "7") Integer days, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrderController.java
@@ -27,7 +27,7 @@ */ @PostMapping("/getOrderPage") @ApiOperation(value = "订单分页") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R<IPage<OrderPageVO>> getOrderPage(@RequestBody OrderPageDTO dto) { return R.ok(orderService.getOrderPage(dto)); } @@ -36,7 +36,7 @@ */ @GetMapping("/detail/{id}") @ApiOperation(value = "查看详情-基础信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R<OrderDetailVO> detail(@PathVariable("id") String id) { return R.ok(orderService.detail(id)); } @@ -46,7 +46,7 @@ */ @GetMapping("/business/{id}") @ApiOperation(value = "查看详情-企业工商信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R<BusinessVO> business(@PathVariable("id") String id) { return R.ok(orderService.business(id)); } @@ -57,7 +57,7 @@ */ @GetMapping("/error/{id}") @ApiOperation(value = "查看详情-企业异常信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R error(@PathVariable("id") String id) { return orderService.error(id); } @@ -66,7 +66,7 @@ */ @GetMapping("/change/{id}") @ApiOperation(value = "查看详情-企业变更信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R change(@PathVariable("id") String id) { return orderService.change(id); } @@ -75,7 +75,7 @@ */ @GetMapping("/tax/{id}") @ApiOperation(value = "查看详情-企业纳税信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R tax(@PathVariable("id") String id) { return orderService.tax(id); } @@ -85,7 +85,7 @@ */ @GetMapping("/invoice/{id}") @ApiOperation(value = "查看详情-企业发票信息") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R invoice(@PathVariable("id") String id) { return orderService.invoice(id); } @@ -94,7 +94,7 @@ */ @DeleteMapping("/delete/{id}") @ApiOperation(value = "删除") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R delete(@PathVariable("id") String id) { orderService.delete(id); return R.ok(); @@ -106,7 +106,7 @@ */ @PutMapping("/shelves/{id}") @ApiOperation(value = "上、下架") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R shelves(@PathVariable("id") String id) { orderService.shelves(id); return R.ok(); @@ -117,7 +117,7 @@ */ @PutMapping("/cancel/{id}") @ApiOperation(value = "取消交易") @PreAuthorize("@ss.hasPermi('order:manage')") // @PreAuthorize("@ss.hasPermi('order:manage')") public R cancel(@PathVariable("id") String id) { orderService.cancel(id); return R.ok(); ruoyi-system/src/main/java/com/ruoyi/system/pojo/vo/BusinessVO.java
@@ -25,6 +25,10 @@ @ApiModelProperty(value = "注册资本") private String registeredCapital; @ApiModelProperty(value = "注册资本 企查查") private String newRegisteredCapital; @ApiModelProperty(value = "公司类型") private String companyCategoryName; ruoyi-system/src/main/java/com/ruoyi/system/pojo/vo/FinanceFlowsTopVO.java
@@ -12,15 +12,15 @@ public class FinanceFlowsTopVO { @ApiModelProperty("总入账") private BigDecimal total; private BigDecimal total=BigDecimal.ZERO; @ApiModelProperty(value = "总利润") private BigDecimal totalProfit; private BigDecimal totalProfit=BigDecimal.ZERO; @ApiModelProperty(value = "上级分佣金额") private BigDecimal superior; private BigDecimal superior=BigDecimal.ZERO; @ApiModelProperty(value = "卖家收入金额") private BigDecimal seller; private BigDecimal seller=BigDecimal.ZERO; } ruoyi-system/src/main/java/com/ruoyi/system/pojo/vo/OrderDetailVO.java
@@ -173,7 +173,7 @@ private String backupsNameTwo; @ApiModelProperty(value = "注册资本") @ApiModelProperty(value = "注册资本 企查查") private String newRegisteredCapital; @ApiModelProperty(value = "账户类型(1=无账户,2=变更,3=新法人注销,4=老法人注销)") ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java
@@ -93,6 +93,10 @@ //3.下级用户 List<InviteUser> list = this.baseMapper.getInviteUserListByInviteId(id); vo.setInviteUserList(list); List<AccountDetail> list1 = accountDetailMapper.selectList(new LambdaQueryWrapper<AccountDetail>().eq(AccountDetail::getCategory, 2).eq(AccountDetail::getStatus, 1).eq(AccountDetail::getUserId, id)); BigDecimal reduce2 = list1.stream().map(AccountDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add); vo.setRecorded(reduce2); return vo; }
@@ -169,6 +169,7 @@ } BusinessVO vo = new BusinessVO(); BeanUtils.copyProperties(company, vo); vo.setNewRegisteredCapital(company.getRealRegisteredCapital()); vo.setPlace(company.getCity()+company.getProvince()+company.getArea()); String name = companyTypeService.getById(company.getCompanyCategory()).getName(); @@ -772,7 +773,8 @@ @Override public FinanceFlowsTopVO financeTop(FinanceFlowsDTO dto) { return this.baseMapper.financeTop(dto); FinanceFlowsTopVO financeFlowsTopVO = this.baseMapper.financeTop(dto); return financeFlowsTopVO; } @Override ruoyi-system/src/main/resources/mapper/system/AppUserMapper.xml
@@ -83,13 +83,13 @@ share_user_id, user_id AS order_user_id, -- 订单关联的用户ID（即被邀请用户） SUM(commission_price) AS total_commission FROM tb_order WHERE status = 6 -- 已完成 FROM tb_order WHERE status in(4,5,6) -- 已完成 AND share_user_id = #{id} GROUP BY share_user_id, user_id -- 按分佣用户和订单关联用户分组 ) commission ON tbu.id = commission.order_user_id -- 关联被邀请用户ID WHERE tbu.status != 3 -- 未注销 AND tbu.is_delete = 0 -- 未删除 AND tbu.invite_id = #{id}; AND tbu.id = #{id}; </select> </mapper> ruoyi-system/src/main/resources/mapper/system/OrderMapper.xml
@@ -126,6 +126,7 @@ c.have_patent, c.have_soft_works, c.real_registered_capital as newRegisteredCapital, c.high_tech_enterprise_technology as highTechEnterpriseTechnology, info.need_rename, info.new_district, publish.user_name as publishName, @@ -198,10 +199,10 @@ </select> <select id="financeTop" resultType="com.ruoyi.system.pojo.vo.FinanceFlowsTopVO"> SELECT SUM(price) AS totalIncome, SUM(price) AS total, SUM(commission_platform) AS totalProfit, SUM(commission_price) AS totalCommission, SUM(price - commission_platform - commission_price) AS sellerIncome SUM(commission_price) AS superior, SUM(price - commission_platform - commission_price) AS seller FROM tb_order WHERE status IN (4, 5, 6) AND is_refund = 0 @@ -226,7 +227,7 @@ WHERE ((status IN (4, 5, 6)) -- 只查询已支付订单 or (status=-1 and is_refund =1)) -- 已取消且已退款的订单 (status!=-1 and is_refund =1)) -- 已取消且已退款的订单 <if test="null != dto.orderNo and '' != dto.orderNo"> and order_no LIKE CONCAT('%', #{dto.orderNo}, '%') </if> @@ -271,17 +272,17 @@ and pay_time between #{dto.operateTimeStart} and #{dto.operateTimeEnd} </if> AND ( #{dto.type} IS NULL OR 1 = #{dto.type} ) UNION ALL select 1 FROM tb_order WHERE is_refund = 1 -- 只查询已退款订单 <if test="null != dto.orderNo and '' != dto.orderNo"> and order_no LIKE CONCAT('%', #{dto.orderNo}, '%') </if> <if test="null != dto.operateTimeStart and null != dto.operateTimeEnd"> and refund_time between #{dto.operateTimeStart} and #{dto.operateTimeEnd} </if> AND ( #{dto.type} IS NULL OR 2 = #{dto.type} ) <!-- UNION ALL--> <!-- select 1--> <!-- FROM tb_order--> <!-- WHERE is_refund = 1 -- 只查询已退款订单--> <!-- <if test="null != dto.orderNo and '' != dto.orderNo">--> <!-- and order_no LIKE CONCAT('%', #{dto.orderNo}, '%')--> <!-- </if>--> <!-- <if test="null != dto.operateTimeStart and null != dto.operateTimeEnd">--> <!-- and refund_time between #{dto.operateTimeStart} and #{dto.operateTimeEnd}--> <!-- </if>--> <!-- AND ( #{dto.type} IS NULL OR 2 = #{dto.type} )--> ) AS t </select> </mapper>
