From 479a56a36e5b055d89e3aa27ed0ba405265cd9e9 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 16:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java | 5 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 5 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 9 ++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 34 +++++++++++-----
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java | 3 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 11 ++++-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 1
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 23 ++++++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java | 1
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 2 +
10 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 5a0c169..1824fcd 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -72,6 +72,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "删除（0=否，1=是）")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
index aa4ac8c..63f7507 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
@@ -62,6 +62,11 @@
public R<List<Order>> byUserId(Long appUserId) {
return R.fail();
}
+
+ @Override
+ public R<List<Order>> byShopId(Integer shopId) {
+ return R.fail();
+ }
};
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
index 41f8d17..efeec68 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
@@ -33,6 +33,8 @@
@PostMapping("/order/byUserId")
public R<List<Order>> byUserId(@RequestParam("appUserId")Long appUserId);
+ @PostMapping("/order/byShopId")
+ public R<List<Order>> byShopId(@RequestParam("shopId")Integer shopId);
/**
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 315b847..a6bb668 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -187,9 +187,6 @@
public R<AppUser> info(){
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
-
-
-
return R.ok(user);
}
@Resource
@@ -403,6 +400,26 @@
return R.ok(appuserPage);
}
+ @GetMapping("/shop/getAppuserPage")
+ @ApiOperation(value = "用户列表", tags = {"门店后台"})
+ public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ AppUser appUser)
+ {
+ Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+
+ List<Long> userIds = new ArrayList<>();
+ userIds.add(-1L);
+ //获取在该本店下单的用户ids
+ R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);
+ for (Order datum : listR.getData()) {
+ userIds.add(datum.getAppUserId());
+ }
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageNum, pageSize, appUser,objectId);
+ return R.ok(appuserPage);
+ }
+
+
@GetMapping("/danger/info")
@ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"})
public R<DangerInfoDto> dangerinfo(Long id)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index a1d0963..6d9ebf5 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -2,19 +2,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.WithQuery;
import com.ruoyi.account.dto.WithdrawalRequestsDTO;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.WithdrawalRequestsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -33,6 +33,8 @@
@Resource
private WithdrawalRequestsService withdrawalRequestsService;
+ @Resource
+ private AppUserService appUserService;
/**
* 提现申请
@@ -48,14 +50,24 @@
@ApiOperation(value = "提现申请列表", tags = {"后台"})
public R<IPage<WithdrawalRequests>> page(@RequestBody WithQuery withQuery){
return R.ok(withdrawalRequestsService.pageList(withQuery));
-
}
-// @PostMapping("/auth")
-// @ApiOperation(value = "提现申请", tags = {"后台"})
-// public R<IPage<WithdrawalRequests>> page(@RequestBody WithQuery withQuery){
-// return R.ok(withdrawalRequestsService.pageList(withQuery));
-//
-// }
+ @PostMapping("/auth")
+ @ApiOperation(value = "提现申请审批", tags = {"后台"})
+ public R<IPage<WithdrawalRequests>> auth(@RequestParam Long id,@ApiParam("2'审核通过',3'审核拒绝'") Integer auditStatus){
+ WithdrawalRequests byId = withdrawalRequestsService.getById(id);
+ if (auditStatus==2){
+
+ //将用户待审核金额减少，已提现金额增加
+ AppUser byId1 = appUserService.getById(byId.getAppUserId());
+ byId1.setWithdrawnAmount(byId1.getWithdrawnAmount().add(byId.getWithdrawalAmount()));
+ appUserService.updateById(byId1);
+ //执行对应的第三方提现 todo
+ }
+ //通过
+ byId.setAuditStatus(auditStatus);
+ withdrawalRequestsService.updateById(byId);
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
index f313602..a2ae452 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
@@ -28,7 +28,8 @@
List<NearbyReferrerVo> getNearbyReferrer(@Param("cityCode") String cityCode, @Param("nearbyReferrer") NearbyReferrer nearbyReferrer);
IPage<AppUser> getAppuserPage(@Param("page") IPage<AppUser> page, @Param("appUser") AppUser appUser);
-
+ IPage<AppUser> getAppuserPage1(@Param("page") IPage<AppUser> page, @Param("appUser") AppUser appUser,Integer objectId);
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
index d17c594..db37014 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
@@ -82,4 +82,5 @@
void onlineRecord();
IPage<AppUser> getAppuserPage(Integer pageNum, Integer pageSize, AppUser appUser);
+ IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index a58ae1f..864d130 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -669,4 +669,9 @@
}
return appUserMapper.getAppuserPage(new Page<>(pageNum, pageSize), appUser);
}
+ @Override
+ public IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId) {
+
+ return appUserMapper.getAppuserPage1(new Page<>(pageNum, pageSize), appUser,objectId);
+ }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 1f95358..de0971d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -212,6 +212,15 @@
}
+ @PostMapping("/byUserId")
+ public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
+ return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+ }
+ @PostMapping("/byShopId")
+ public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
+ return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+ }
+
@ResponseBody
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 41660b8..8114a0d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -149,9 +149,14 @@
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
- tokenService.getLoginUser();
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
- return R.ok(page);
+ //判断当前登陆人是平台还是门店
+ if (tokenService.getLoginUser().getSysUser().getRoleType()==1) {
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }else {
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
}
@ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
--
Gitblit v1.7.1