From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 576 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 553 insertions(+), 23 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 83021b4..64e4910 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,32 +2,47 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserShopClient;
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.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.enums.ShopStatus;
-import com.ruoyi.other.service.ShopScoreService;
-import com.ruoyi.other.service.ShopService;
-import com.ruoyi.other.service.TechnicianService;
+import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.vo.VerifiableShopVo;
+import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.mapper.ShopMapper;
+import com.ruoyi.other.service.*;
+import com.ruoyi.other.util.GeodesyUtil;
+import com.ruoyi.other.util.tencentMap.TencentMapUtil;
import com.ruoyi.other.vo.NearbyShopVO;
+import com.ruoyi.other.vo.SaveWithdrawalAccount;
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.feignClient.UserShopClient;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.UserShop;
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.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -40,10 +55,8 @@
*/
@RestController
@RequestMapping("/shop")
-@Api(tags = "门店")
+@Api("门店")
public class ShopController extends BaseController {
- @Resource
- private TechnicianService technicianService;
@Resource
private ShopService shopService;
@Resource
@@ -52,21 +65,341 @@
private ShopScoreService shopScoreService;
@Resource
private TokenService tokenService;
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private ShopMapper shopMapper;
+ @Resource
+ private UserShopClient userShopClient;
+ @Resource
+ private AppUserShopClient appUserShopClient;
+ @Resource
+ private GoodsService goodsService;
+ @Resource
+ private GoodsShopService goodsShopService;
+ @Resource
+ private OrderClient orderClient;
+ @Resource
+ private TechnicianSubscribeService technicianSubscribeService;
+ @Resource
+ private TechnicianService technicianService;
+ @Resource
+ private ReceiverBankChannelService receiverBankChannelService;
+
@PostMapping
- @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理-新增门店"})
+ @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
+ @Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
+ return R.fail("该手机号未注册");
+ }
+ shop.setShopAllPoint(0);
+ shop.setLowerLevelSharePoint(0);
+ shop.setSharePoint(0);
+ shop.setServerPoint(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);
+ shop.setAppUserId(appUser.getId());
+ String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ shop.setProvinceCode(city.substring(0, 2) + "0000");
+ shop.setCityCode(city.substring(0, 4) + "00");
+ shop.setDistrictCode(city);
shopService.save(shop);
+
+ Integer shopId = shop.getId();
+
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shopId);
+ 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("添加失败");
+ }
+ //添加门店后台账号和门店关系数据
+ SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ if(null != sysUser){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setNickName(sysUser.getNickName());
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopClient.saveUserShop(userShop);
+ }
+ }else{
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getPhone());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shopId);
+ user.setAppUserId(appUser.getId());
+ user.setPassword(phone.substring(5));
+ user.setCreateTime(new Date());
+ Long userId = sysUserClient.saveShopUser(user).getData();
+
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShopClient.saveUserShop(userShop);
+ }
+
+ // 更换下级会员绑定门店
+ R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
+ if (R.isError(lowerShopR)){
+ throw new RuntimeException("更换下级会员绑定门店失败");
+ }
return R.ok();
}
- @PostMapping("/getDetailById")
- public R<Shop> getDetailById(@RequestParam("id") Long id){
+ @GetMapping("/getDetailById")
+ @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 = {"管理后台-门店管理"})
+ public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
+ List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
+ if(list1.size() > 0){
+ Set<Integer> collect1 = list1.stream().map(Goods::getId).collect(Collectors.toSet());
+ long count = goodsShopService.count(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getShopId, id).in(GoodsShop::getGoodsId, collect1));
+ if(0 < count){
+ return R.fail("门店已被商品使用，不能删除");
+ }
+ }
+ Shop shop = shopService.getById(id);
+ shop.setDelFlag(1);
+ shopService.updateById(shop);
+ appUserClient.clearBindShop(shop.getId());
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(data.size() > 0){
+ List<Integer> collect = data.stream().map(UserShop::getUserId).collect(Collectors.toList()).stream().map(Long::intValue).collect(Collectors.toList());
+ List<SysUser> sysUserList = sysUserClient.getUserList(collect).getData();
+ //删除门店下的所有员工
+ sysUserClient.delShopUser(shop.getId(), 2);
+ //修改小程序用户类型和门店数据
+ for (SysUser sysUser : sysUserList) {
+ //通过电话号码查询小程序用户和门店关系数据
+ AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).getData();
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ //删除用户门店关系表数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShopClient.delAppUserShop(appUserShop);
+ }
+ }
+ //取消预约的订单
+ List<Technician> list = technicianService.list(new LambdaQueryWrapper<Technician>().eq(Technician::getShopId, shop.getId()).eq(Technician::getDelFlag, 0));
+ if(list.size() > 0){
+ for (Technician technician : list) {
+ technician.setDelFlag(1);
+ }
+ technicianService.updateBatchById(list);
+ Set<Integer> collect = list.stream().map(Technician::getId).collect(Collectors.toSet());
+ technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>().in(TechnicianSubscribe::getTechnicianId, collect).eq(TechnicianSubscribe::getDelFlag, 0)
+ .eq(TechnicianSubscribe::getStatus, 0).set(TechnicianSubscribe::getStatus, 2));
+ }
+ return R.ok();
+ }
+
+ @PutMapping("/editShop")
+ @ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
+ public R<Void> editShop(@RequestBody Shop shop){
+ String phone = shop.getPhone();
+ if (!shopService.cheUserByPhone(phone)) {
+ return R.fail("该手机号未注册");
+ }
+ if (shop.getPid()!=null){
+ Shop shopP = shopService.getById(shop.getPid());
+ if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
+ return R.fail("门店之间不能互相作为上级门店");
+ }
+ }
+ String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ shop.setProvinceCode(city.substring(0, 2) + "0000");
+ shop.setCityCode(city.substring(0, 4) + "00");
+ shop.setDistrictCode(city);
+ Shop old_shop = shopService.getById(shop.getId());
+ shopService.updateById(shop);
+ //修改管理员
+ AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
+ //需要先判断用户是否没有关联任何门店
+ List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
+ appUser.setUserType(1);
+ appUserClient.editAppUserById(appUser);
+ }
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserShopClient.delAppUserShop(appUserShop);
+
+ //添加新管理员
+ appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ appUserClient.addAppUserShop(appUserShop);
+
+ //修改管理员
+ shop.setAppUserId(appUser.getId());
+ shopService.updateById(shop);
+
+ //添加门店后台账号和门店关系数据
+ SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ if(null != sysUser){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(sysUser.getUserId());
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShopClient.saveUserShop(userShop);
+ }
+ }else{
+ //添加管理后台账号
+ SysUser user = new SysUser();
+ user.setDeptId(1L);
+ user.setUserName(appUser.getPhone());
+ user.setNickName(appUser.getName());
+ user.setPhonenumber(appUser.getPhone());
+ user.setAvatar(appUser.getAvatar());
+ user.setStatus("0");
+ user.setDelFlag("0");
+ user.setRoleType(2);
+ user.setObjectId(shop.getId());
+ user.setAppUserId(appUser.getId());
+ user.setPassword(phone.substring(5));
+ user.setCreateTime(new Date());
+ Long userId = sysUserClient.saveShopUser(user).getData();
+
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShopClient.saveUserShop(userShop);
+ }
+ return R.ok();
+ }
+
+
+ @PutMapping("/freezingOrThawing")
+ @ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})
+ public R freezingOrThawing(@RequestParam("id") Integer id, @RequestParam("status") Integer status){
+ Shop shop = shopService.getById(id);
+ if(shop.getStatus().equals(status)){
+ return R.fail("不能重复操作");
+ }
+ shop.setStatus(status);
+ 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);
+ for (Shop record : shopIPage.getRecords()) {
+ record.setLaveUsePoint(record.getLavePoint());
+ }
+ return R.ok(shopIPage);
+ }
+
+ /**
+ * 通过手机号校验店长
+ */
+ @PostMapping("/cheUserByPhone")
+ @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));
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
+ userData.setPassword(userData.getPhonenumber().substring(5));
+ 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);
}
@@ -74,7 +407,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));
@@ -82,7 +415,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) {
@@ -93,13 +426,44 @@
* 查询当前店长所属门店
*/
@GetMapping("/shopByUser")
- @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心-首页"}, notes = "可绑定的门店列表")
- public R<List<Shop>> shopByUser() {
- R<List<AppUserShop>> r = appUserClient.getAppUserShop(SecurityUtils.getUserId());
+ @ApiOperation(value = "查询当前店长所属门店", tags = {"小程序-个人中心"}, notes = "可绑定的门店列表")
+ public R<List<Shop>> shopByUser(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ AppUser appUser = appUserClient.getAppUserById(userid);
+ R<List<AppUserShop>> r = appUserClient.getAppUserShop(userid);
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);
+ List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ if(null != appUser.getShopId()){
+ Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
+ if(first.isPresent()){
+ Shop shop = first.get();
+ for (Shop shop1 : shopList) {
+ if(shop1.getId().equals(shop.getId())){
+ shopList.remove(shop1);
+ break;
+ }
+ }
+ shopList.add(0, shop);
+ }
+ }
+ for (Shop shop : shopList) {
+ Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ shop.setDistance(wgs84);
+ List<ShopScore> list = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getShopId, shop.getId()));
+ double v = 5;
+ if(list.size() > 0){
+ v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(new BigDecimal(list.size()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
+ }
+ shop.setScore(v);
+ ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shop.getId()).last(" order by create_time desc limit 0, 1"));
+ shop.setMyScore(null == one ? "0" : one.getScore().toString());
+ }
return R.ok(shopList);
}
return R.ok(new ArrayList<>());
@@ -109,8 +473,15 @@
* 绑定门店
*/
@GetMapping("/bindShop")
- @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心-绑定门店"})
- public R<Void> bindShop(@ApiParam("门店id") @RequestParam Long shopId) {
+ @ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
+ public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
+ Shop shop = shopService.getById(shopId);
+ if(null == shop || shop.getDelFlag() == 1){
+ return R.fail("绑定店铺不存在");
+ }
+ if(2 == shop.getStatus()){
+ return R.fail("绑定店铺已被冻结");
+ }
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
@@ -121,7 +492,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());
@@ -143,6 +514,13 @@
Shop shop = shopService.getById(id);
return R.ok(shop);
}
+
+ @ResponseBody
+ @PostMapping("/getShopByUserId")
+ public R<List<Shop>> getShopByUserId(@RequestParam("id") Long id){
+ List<Shop> list = shopService.lambdaQuery().eq(Shop::getAppUserId, id).eq(Shop::getDelFlag,0).list();
+ return R.ok(list);
+ }
/**
@@ -163,5 +541,157 @@
return R.ok(list);
}
+ /**
+ * 根据名称查询门店id
+ * @param shopName
+ * @return
+ */
+ @PostMapping("/getShopIdByName")
+ public R<Set<Integer>> getShopIdByName(@RequestParam("shopName") 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()));
+ }
+
+ /**
+ * 门店统计
+ */
+ @GetMapping("/shopStatistics")
+ @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
+ public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
+ ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
+ if(null == shopId){
+ shopId = 0;
+ }
+ Integer serviceOrder = orderClient.getShopSaleNum(shopId, 1).getData();
+ Integer goodsOrder = orderClient.getShopSaleNum(shopId, 2).getData();
+ shopStatistics.setTotalOrder(serviceOrder + goodsOrder);
+ shopStatistics.setServiceOrder(serviceOrder);
+ shopStatistics.setGoodsOrder(goodsOrder);
+ return R.ok(shopStatistics);
+ }
+
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/updateShop")
+ public void updateShop(@RequestBody Shop shop){
+ shopService.updateById(shop);
+ }
+
+
+
+
+ @ResponseBody
+ @GetMapping("/getVerifiableShop")
+ @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
+ public R<List<VerifiableShopVo>> getVerifiableShop(String longitude, String latitude, Integer goodsId){
+ String city = TencentMapUtil.inverseGeographicalAnalysis(longitude, latitude, false);
+ if(null == city){
+ city = "510100";
+ }
+ city = city.substring(0, 4) + "00";
+ LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1).eq(Shop::getCityCode, city);
+ if(null != goodsId){
+ Goods goods = goodsService.getById(goodsId);
+ if(1 == goods.getType() && 1 == goods.getAppointStore()){
+ List<Integer> collect = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getGoodsId, goods.getId()))
+ .stream().map(GoodsShop::getShopId).collect(Collectors.toList());
+ if(collect.size() > 0){
+ wrapper.in(Shop::getId, collect);
+ }
+ }
+ }
+ List<Shop> list = shopService.list(wrapper);
+ List<VerifiableShopVo> verifiableShopVoList = new ArrayList<>();
+ for (Shop shop : list) {
+ VerifiableShopVo vo = new VerifiableShopVo();
+ vo.setId(shop.getId());
+ vo.setName(shop.getName());
+ vo.setAddress(shop.getAddress());
+ vo.setHomePicture(shop.getHomePicture());
+ Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
+ vo.setDistance(wgs84.longValue());
+ verifiableShopVoList.add(vo);
+ }
+ verifiableShopVoList.sort(new Comparator<VerifiableShopVo>() {
+ @Override
+ public int compare(VerifiableShopVo o1, VerifiableShopVo o2) {
+ return o1.getDistance().compareTo(o2.getDistance());
+ }
+ });
+ return R.ok(verifiableShopVoList);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getSysUserShop")
+ @ApiOperation(value = "获取可切换的门店列表", tags = {"门店后台-首页"})
+ public R<List<VerifiableShopVo>> getSysUserShop(){
+ Long userid = tokenService.getLoginUser().getUserid();
+ UserShop userShop = new UserShop();
+ userShop.setUserId(userid);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ List<Integer> collect = data.stream().map(UserShop::getShopId).collect(Collectors.toList());
+ List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>()
+ .in(!CollectionUtils.isEmpty(collect),Shop::getId, collect)
+ .eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<VerifiableShopVo> list = new ArrayList<>();
+ for (Shop shop : shops) {
+ VerifiableShopVo vo = new VerifiableShopVo();
+ vo.setId(shop.getId());
+ vo.setName(shop.getName());
+ list.add(vo);
+ }
+ return R.ok(list);
+ }
+
+
+
+ @PostMapping("/saveWithdrawalAccount")
+ @ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
+ public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ shopService.saveWithdrawalAccount(saveWithdrawalAccount);
+ return R.ok();
+ }
+
+
+ /**
+ * 获取所有门店
+ * @return
+ */
+ @PostMapping("/getAllShop")
+ public R<List<Shop>> getAllShop(){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ return R.ok(list);
+ }
+
+ @ResponseBody
+ @GetMapping("/verifyAccountConfiguration")
+ @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细"})
+ public R verifyAccountConfiguration(){
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Shop shop = shopService.getById(sysUser.getObjectId());
+ if(StringUtils.hasLength(shop.getReceiverAccountNoEnc())){
+ return R.ok();
+ }
+ return R.fail("请先配置收款账户");
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getBankSerialNumber")
+ @ApiOperation(value = "获取行联号", tags = {"门店后台-财务管理-提现明细"})
+ public R<List<ReceiverBankChannel>> getBankSerialNumber(String name){
+ List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>()
+ .like(ReceiverBankChannel::getName, name));
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1