From 691c663dc5624e0dc2115a69f380087fb9ac16a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 8a60d8f..3943372 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -12,15 +12,20 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.ShopScore;
+import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
+import com.ruoyi.other.vo.ShopStatistics;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -51,23 +56,26 @@
private ShopScoreService shopScoreService;
@Resource
private TokenService tokenService;
-
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private ShopMapper shopMapper;
@PostMapping
- @ApiOperation(value = "门店管理-新增门店", tags = {"后台管理"})
+ @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
String phone = shop.getPhone();
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
}
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
shop.setShopAllPoint(0);
shop.setShopPoint(0);
shop.setSharePoint(0);
shop.setServerPoint(0);
- shop.setLowerLevelRebatePoints(0);
shop.setUsePoint(0);
shop.setGiveawayAllMoney(BigDecimal.ZERO);
shop.setGiveawayMoney(BigDecimal.ZERO);
@@ -78,14 +86,20 @@
shop.setOrderNumber(0);
shop.setServerOrderNumber(0);
shop.setCustomOrderNumber(0);
+ shop.setAppUserId(appUser.getId());
shopService.save(shop);
- LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+
AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(loginUserApplet.getUserid());
+ appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
+ throw new RuntimeException("添加失败");
+ }
+ appUser.setUserType(2);
+ R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
+ if (R.isError(editAppUserR)){
throw new RuntimeException("添加失败");
}
return R.ok();
@@ -93,28 +107,32 @@
@GetMapping("/getDetailById")
- @ApiOperation(value = "门店管理-门店详情", tags = {"后台管理"})
- public R<Shop> getDetailById(@RequestParam("id") Long id){
+ @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
+ public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop byId = shopService.getById(id);
return R.ok(byId);
}
@DeleteMapping("/deleteShop")
- @ApiOperation(value = "门店管理-删除门店", tags = {"后台管理"})
+ @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
shopService.removeById(id);
return R.ok();
}
@PutMapping("/editShop")
- @ApiOperation(value = "门店管理-编辑门店", tags = {"后台管理"})
+ @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
public R<Void> editShop(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
shopService.updateById(shop);
return R.ok();
}
@GetMapping("/list")
- @ApiOperation(value = "门店管理-门店列表", tags = {"后台管理"})
+ @ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
return R.ok(shopIPage);
@@ -124,9 +142,41 @@
* 通过手机号校验店长
*/
@PostMapping("/cheUserByPhone")
- @ApiOperation(value = "门店管理-通过手机号校验店长", tags = {"后台管理"})
+ @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
return R.ok(shopService.cheUserByPhone(phone));
+ }
+
+ /**
+ * 重置密码
+ */
+ @GetMapping ("/resetPassword")
+ @ApiOperation(value = "重置密码", tags = {"管理后台-门店管理"})
+ public R<Void> resetPassword(@RequestParam(value = "ids") String ids) {
+ String[] idsArr = ids.split(",");
+ for (String id : idsArr) {
+ Shop shop = shopService.getById(Integer.valueOf(id));
+ R<SysUser> sysUser = sysUserClient.getSysUser(shop.getAppUserId());
+ SysUser userData = sysUser.getData();
+ userData.setPassword(getLastSixDigits(userData.getPhonenumber()));
+ sysUserClient.resetPassword(userData);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 获取手机号的后六位。
+ *
+ * @param phoneNumber 以字符串形式提供的手机号
+ * @return 手机号的后六位
+ * @throws IllegalArgumentException 如果手机号长度不足六位
+ */
+ public String getLastSixDigits(String phoneNumber) {
+ if (phoneNumber == null || phoneNumber.length() < 6) {
+ throw new IllegalArgumentException("手机号长度不足六位");
+ }
+ // 取字符串的最后六位
+ return phoneNumber.substring(phoneNumber.length() - 6);
}
@@ -158,6 +208,9 @@
R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
if (R.isSuccess(r)){
List<AppUserShop> appUserShopList = r.getData();
+ if (CollectionUtils.isEmpty(appUserShopList)){
+ return R.ok(new ArrayList<>());
+ }
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
List<Shop> shopList = shopService.listByIds(shopIds);
return R.ok(shopList);
@@ -170,7 +223,7 @@
*/
@GetMapping("/bindShop")
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
- public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
+ public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -203,6 +256,13 @@
Shop shop = shopService.getById(id);
return R.ok(shop);
}
+
+ @ResponseBody
+ @PostMapping("/getShopByUserId")
+ public R<List<Shop>> getShopByUserId(@RequestParam("id") Integer id){
+ List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).list();
+ return R.ok(list);
+ }
/**
@@ -230,5 +290,24 @@
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
}
+ /**
+ * 门店统计
+ */
+ @GetMapping("/shopStatistics")
+ @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店名称") String shopName) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopName);
+ return R.ok(shopStatistics);
+ }
+
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/updateShop")
+ public void updateShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ }
}
--
Gitblit v1.7.1