From 2270e4505f8e5878712a8a327934fc6ed54c1289 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 14:07:46 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 131 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 27 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 f846e47..7aa69f8 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
@@ -2,33 +2,34 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
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.api.domain.Technician;
-import com.ruoyi.other.enums.ShopStatus;
import com.ruoyi.other.service.ShopScoreService;
import com.ruoyi.other.service.ShopService;
-import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
-import com.ruoyi.other.vo.VerifiableShopVo;
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.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -40,10 +41,8 @@
*/
@RestController
@RequestMapping("/shop")
-@Api(tags = "门店")
+@Api("门店")
public class ShopController extends BaseController {
- @Resource
- private TechnicianService technicianService;
@Resource
private ShopService shopService;
@Resource
@@ -55,10 +54,79 @@
- @PostMapping("/getDetailById")
+
+ @PostMapping
+ @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("该手机号未注册");
+ }
+ 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);
+ shop.setLowerLevelGiveawayMoney(BigDecimal.ZERO);
+ shop.setServerGiveawayMoney(BigDecimal.ZERO);
+ shop.setCanWithdrawMoney(BigDecimal.ZERO);
+ shop.setWithdrawMoney(BigDecimal.ZERO);
+ shop.setOrderNumber(0);
+ shop.setServerOrderNumber(0);
+ shop.setCustomOrderNumber(0);
+ shopService.save(shop);
+
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(loginUserApplet.getUserid());
+ appUserShop.setShopId(shop.getId());
+ R<Void> r = appUserClient.addAppUserShop(appUserShop);
+ if (R.isError(r)){
+ throw new RuntimeException("添加失败");
+ }
+ return R.ok();
+ }
+
+
+ @GetMapping("/getDetailById")
+ @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Long id){
Shop byId = shopService.getById(id);
return R.ok(byId);
+ }
+
+ @DeleteMapping("/deleteShop")
+ @ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
+ public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
+ shopService.removeById(id);
+ return R.ok();
+ }
+
+ @PutMapping("/editShop")
+ @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
+ public R<Void> editShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ return R.ok();
+ }
+
+ @GetMapping("/list")
+ @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);
+ }
+
+ /**
+ * 通过手机号校验店长
+ */
+ @PostMapping("/cheUserByPhone")
+ @ApiOperation(value = "通过手机号校验店长", tags = {"管理后台-门店管理"})
+ public R<Boolean> cheUserByPhone(@RequestParam("phone") String phone) {
+ return R.ok(shopService.cheUserByPhone(phone));
}
@@ -66,7 +134,7 @@
* 附近门店列表
*/
@GetMapping("/nearbyShopList")
- @ApiOperation(value = "附近门店列表", tags = {"小程序-首页-附近门店列表"})
+ @ApiOperation(value = "附近门店列表", tags = {"小程序-首页"})
public R<List<NearbyShopVO>> nearbyShopList(@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
return R.ok(shopService.nearbyShopList(longitude, latitude));
@@ -74,7 +142,7 @@
@GetMapping("/shopDetail")
- @ApiOperation(value = "门店详情", tags = {"小程序-首页-门店详情"})
+ @ApiOperation(value = "门店详情", tags = {"小程序-首页"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
@ApiParam("经度") @RequestParam BigDecimal longitude,
@ApiParam("纬度") @RequestParam BigDecimal latitude) {
@@ -85,19 +153,23 @@
* 查询当前店长所属门店
*/
@GetMapping("/shopByUser")
- @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
public R<List<Shop>> shopByUser() {
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
- .eq(Shop::getAppUserId, SecurityUtils.getUserId())
- .eq(Shop::getStatus, ShopStatus.SHOP_STATUS_NORMAL.getCode()));
- return R.ok(list);
+ R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
+ if (R.isSuccess(r)){
+ List<AppUserShop> appUserShopList = r.getData();
+ List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
+ List<Shop> shopList = shopService.listByIds(shopIds);
+ return R.ok(shopList);
+ }
+ return R.ok(new ArrayList<>());
}
/**
* 绑定门店
*/
@GetMapping("/bindShop")
- @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
+ @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
@@ -109,7 +181,7 @@
* @return
*/
@PostMapping("/shopScore")
- @ApiOperation(value = "门店打分", tags = {"小程序-个人中心-门店打分"})
+ @ApiOperation(value = "门店打分", tags = {"小程序-个人中心"})
public R<Void> shopScore(@RequestBody ShopScore shopScore) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
shopScore.setAppUserId(loginUserApplet.getUserid());
@@ -120,15 +192,6 @@
- @ResponseBody
- @GetMapping("/getVerifiableShop")
- @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
- public R<List<VerifiableShopVo>> getVerifiableShop(){
- // todo 待完善 pu
- return R.ok();
- }
-
-
/**
* 根据id获取门店信息
* @param id
@@ -139,6 +202,13 @@
public R<Shop> getShopById(@RequestParam("id") Integer id){
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);
}
@@ -160,5 +230,12 @@
return R.ok(list);
}
+ @GetMapping("/getShopIdByName")
+ R<Set<Integer>> getShopIdByName(@RequestParam String shopName){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
+ .like(Shop::getName, shopName));
+ return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
+ }
+
}
--
Gitblit v1.7.1