From 6acf6357094588946b5528f1ef1ed84a0f1037fd Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 13 六月 2025 19:45:27 +0800
Subject: [PATCH] 小程序收付款
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 471 +++++++++++++++++++++++-----------------------------------
1 files changed, 187 insertions(+), 284 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 e8839ab..83f385a 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,14 +2,20 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.utils.bean.BeanUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
@@ -19,6 +25,7 @@
import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.dto.ShopAnalysisDTO;
import com.ruoyi.other.dto.AddGoodsDTO;
import com.ruoyi.other.enums.PhoneType;
import com.ruoyi.other.mapper.ShopMapper;
@@ -36,6 +43,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -43,6 +51,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -80,7 +89,7 @@
@Resource
private ShopScoreMapper shopScoreMapper;
@Resource
- private UserShopClient userShopClient;
+ private AppUserShopClient appUserShopClient;
@Resource
private GoodsService goodsService;
@Resource
@@ -91,6 +100,8 @@
private ReceiverBankChannelService receiverBankChannelService;
@Resource
private ShopScoreService shopScoreService;
+ @Autowired
+ private PhoneService phoneService;
/**
@@ -150,7 +161,7 @@
}
@PostMapping
- @ApiOperation(value = "新增门店", tags = {"管理后台-门店管理"})
+ @ApiOperation(value = "新增门店", tags = {"后台-门店管理"})
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
String phone = shop.getPhone();
@@ -158,98 +169,25 @@
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.setCreateTime(LocalDateTime.now());
shop.setAppUserId(appUser.getId());
- String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
- if(!StringUtils.hasLength(city)){
- city = "510100";
- }
- shop.setProvinceCode(city.substring(0, 2) + "0000");
- shop.setCityCode(city.substring(0, 4) + "00");
- shop.setDistrictCode(city);
+ //添加门店
shopService.save(shop);
-
- Integer shopId = shop.getId();
-
- appUser.setUserType(2);
- R<Void> editAppUserR = appUserClient.editAppUserById(appUser);
- if (R.isError(editAppUserR)){
- throw new RuntimeException("添加失败");
+ //添加shopuser
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ R appUserShopR = appUserShopClient.insert(appUserShop);
+ if (appUserShopR.getCode()!=200){
+ throw new RuntimeException("添加用户门店关系失败");
}
- //添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
- if(null != sysUser){
- sysUser.setAppUserId(appUser.getId());
- sysUserClient.updateUser(sysUser);
-
- UserShop userShop = new UserShop();
- userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shopId);
- 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(shopId);
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(sysUser.getNickName());
- 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());
- String s = MD5Generator.generateMD5(phone.substring(5));
- user.setPassword(s);
- user.setCreateTime(new Date());
- Long userId = sysUserClient.saveShopUser(user).getData();
-
- UserShop userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shopId);
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(null == data || data.size() == 0){
- userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shopId);
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopClient.saveUserShop(userShop);
- }
- }
-
- // 更换下级会员绑定门店
- R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
- if (R.isError(lowerShopR)){
- throw new RuntimeException("更换下级会员绑定门店失败");
- }
+ //添加客服phone
+ Phone phone1 = new Phone();
+ phone1.setType(2);//门店
+ phone1.setPhoneOne(shop.getServiceTel());
+ phone1.setShopId(shop.getId());
+ phoneService.save(phone1);
return R.ok();
}
@@ -258,16 +196,13 @@
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Integer id){
Shop shop = shopService.getById(id);
- if (null != shop.getPid() && shop.getPid()==0){
- shop.setPid(null);
- }
return R.ok(shop);
}
@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));
+ List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).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));
@@ -278,127 +213,70 @@
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
- // 查询有没有门店绑定这个被删除的门店
- List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
- for (Shop shop1 : shops) {
- LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
- .eq(Shop::getId,shop1.getId());
- shopService.update(set);
+ R deleteR = appUserShopClient.delete(shop.getId(), shop.getAppUserId());
+ if (deleteR.getCode()!=200){
+ throw new RuntimeException("删除用户门店关系失败");
}
- //清除用户绑定当前门店
- appUserClient.clearBindShop(shop.getId());
- //查询门店绑定的平台账号
- UserShop userShop = new UserShop();
- userShop.setShopId(shop.getId());
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(data.size() > 0){
- //删除门店后台账号和关系数据
- sysUserClient.delShopUser(shop.getId(), 2);
- }*/
return R.ok();
}
@PutMapping("/editShop")
@ApiOperation(value = "门店管理-编辑门店", tags = {"管理后台-门店管理"})
public R<Void> editShop(@RequestBody Shop shop){
+
+ //判断是否修改店长
+ Shop byId = shopService.getById(shop.getId());
+
String phone = shop.getPhone();
- if (!shopService.cheUserByPhone(phone)) {
- return R.fail("该手机号未注册");
- }
- if (shop.getPid() != null && shop.getPid() != 0){
- Shop shopP = shopService.getById(shop.getPid());
- if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
- return R.fail("门店之间不能互相作为上级门店");
+ if (!phone.equals(byId.getPhone())){
+ //修改店长
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
+ return R.fail("该手机号未注册");
}
- }
- String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
- if(!StringUtils.hasLength(city)){
- city = "510100";
- }
- 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());
-
- //删除后台用户和店铺关系数据
- UserShop userShop = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
- if(null != data && data.size() > 0){
- UserShop userShop1 = data.get(0);
- userShopClient.delUserShop(userShop1);
- //如果当前后台账户关联的店铺是最后一个，删除后台账户
- userShop = new UserShop();
- userShop.setUserId(userShop1.getUserId());
- data = userShopClient.getUserShop(userShop).getData();
- if(data.size() == 0){
- sysUserClient.delSysUserById(userShop1.getUserId());
+
+ Long originalUserId = byId.getAppUserId();
+ //添加用户id到shop信息中
+ shop.setAppUserId(appUser.getId());
+ //删除店铺关系
+ R deleteR = appUserShopClient.delete(shop.getId(), originalUserId);
+ if (deleteR.getCode()!=200){
+ throw new RuntimeException("删除用户门店关系失败");
}
+ //添加shopuser
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setAppUserId(appUser.getId());
+ appUserShop.setShopId(shop.getId());
+ R appUserShopR = appUserShopClient.insert(appUserShop);
+ if (appUserShopR.getCode()!=200){
+ throw new RuntimeException("添加用户门店关系失败");
+ }
+
}
- //添加新管理员
- appUser = appUserClient.getAppUserByPhone1(phone).getData();
- appUser.setUserType(2);
- appUserClient.editAppUserById(appUser);
-
- //修改管理员
- shop.setAppUserId(appUser.getId());
- shopService.updateById(shop);
-
- //添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
- if(null != sysUser){
- userShop = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setUserId(sysUser.getUserId());
- 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);
- userShop.setNickName(sysUser.getNickName());
- 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(shop.getId());
- user.setAppUserId(appUser.getId());
- user.setPassword(phone.substring(5));
- user.setCreateTime(new Date());
- Long userId = sysUserClient.saveShopUser(user).getData();
-
- userShop = new UserShop();
- userShop.setShopId(shop.getId());
- userShop.setUserId(userId);
- data = userShopClient.getUserShop(userShop).getData();
- if(null == data || data.size() == 0){
- userShop = new UserShop();
- userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(appUser.getName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopClient.saveUserShop(userShop);
- }
+
+ //删除客服电话
+ QueryWrapper<Phone> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("shop_id", shop.getId());
+ queryWrapper.eq("type",2);
+ Phone one = phoneService.getOne(queryWrapper);
+ if (!one.getPhoneOne().equals(shop.getServiceTel())){
+ phoneService.removeById(one.getId());
+ //添加客服phone
+ Phone phone1 = new Phone();
+ phone1.setType(2);//门店
+ phone1.setPhoneOne(shop.getServiceTel());
+ phone1.setShopId(shop.getId());
+ phoneService.save(phone1);
}
+
+
+ //修改店铺
+ shopService.updateById(shop);
+
+
return R.ok();
+
}
public static void main(String[] args) {
@@ -415,53 +293,6 @@
}
shop.setStatus(status);
shopService.updateById(shop);
- //处理员工等数据
- if(status == 1){
- UserShop userSh = new UserShop();
- userSh.setShopId(id);
- List<UserShop> data = userShopClient.getUserShop(userSh).getData();
- for (UserShop datum : data) {
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("0");
- sysUserClient.updateUser(sysUser);
- }
- }else{
- //查询门店所有关联数据
- UserShop userSh = new UserShop();
- userSh.setShopId(id);
- List<UserShop> data = userShopClient.getUserShop(userSh).getData();
- for (UserShop datum : data) {
- //查询用户关联的其他店铺
- UserShop userShop = new UserShop();
- userShop.setUserId(datum.getUserId());
- List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
- List<UserShop> collect = data1.stream().filter(s -> !s.getShopId().equals(id)).collect(Collectors.toList());
- if(collect.size() == 0){
- //如果没有其他店铺，则将用户禁用
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("1");
- sysUserClient.updateUser(sysUser);
- }else{
- List<Integer> shopIds = collect.stream().map(UserShop::getShopId).collect(Collectors.toList());
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1)
- .in(Shop::getId, shopIds));
- //如果用户关联的其他门店都禁用了，将用户禁用
- if(list.size() == 0){
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus("1");
- sysUserClient.updateUser(sysUser);
- }else{
- //修改默认门店
- SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- if(sysUser.getObjectId().equals(id)){
- sysUser.setObjectId(list.get(0).getId());
- sysUserClient.updateUser(sysUser);
- }
- }
- }
- }
- }
-
return R.ok();
}
@@ -472,9 +303,9 @@
@ApiOperation(value = "门店列表", tags = {"管理后台-门店管理"})
public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam("pageNum") Integer pageNum,@ApiParam("每一页数据大小") @RequestParam("pageSize") Integer pageSize,Shop shop){
IPage<Shop> shopIPage = shopService.getShopList(pageNum, pageSize, shop);
- /*for (Shop record : shopIPage.getRecords()) {
- record.setLaveUsePoint(record.getLavePoint());
- }*/
+ for (Shop record : shopIPage.getRecords()) {
+ record.setFullAddress(record.getAddress()+record.getDetailAddress());
+ }
return R.ok(shopIPage);
}
@@ -493,7 +324,7 @@
@GetMapping ("/resetPassword")
@ApiOperation(value = "重置密码", tags = {"管理后台-门店管理"})
public R<Void> resetPassword(@RequestParam(value = "ids") String ids) {
- String[] idsArr = ids.split(",");
+ /* String[] idsArr = ids.split(",");
for (String id : idsArr) {
Shop shop = shopService.getById(Integer.valueOf(id));
UserShop userShop = new UserShop();
@@ -504,7 +335,7 @@
String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
userData.setPassword(s);
sysUserClient.resetPassword(userData);
- }
+ }*/
return R.ok();
}
@@ -541,8 +372,8 @@
@GetMapping("/shopDetail")
@ApiOperation(value = "门店详情", tags = {"小程序-首页"})
public R<ShopDetailVO> shopDetail(@ApiParam("门店id") @RequestParam Integer shopId,
- @ApiParam("经度") @RequestParam BigDecimal longitude,
- @ApiParam("纬度") @RequestParam BigDecimal latitude) {
+ @ApiParam("经度") @RequestParam(required = false) BigDecimal longitude,
+ @ApiParam("纬度") @RequestParam(required = false) BigDecimal latitude) {
return R.ok(shopService.getShopDetail(shopId, longitude, latitude));
}
@@ -601,11 +432,7 @@
return R.ok(one);
}
-/* @PostMapping("/getShopByUserIds")
- public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds){
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getAppUserId, userIds));
- return R.ok(list);
- }*/
+
/**
* 根据名称查询门店id
@@ -665,24 +492,29 @@
@ResponseBody
@GetMapping("/getSysUserShop")
@ApiOperation(value = "获取可切换的门店列表", tags = {"门店后台-首页"})
- public R<List<VerifiableShopVo>> getSysUserShop(@ApiParam("经度") @RequestParam BigDecimal longitude,
- @ApiParam("纬度") @RequestParam BigDecimal latitude){
- 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());
+ public R<List<VerifiableShopVo>> getSysUserShop(@ApiParam("经度") @RequestParam(required = false) BigDecimal longitude,
+ @ApiParam("纬度") @RequestParam(required = false) BigDecimal latitude){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+
+ List<AppUserShop> data = appUserShopClient.getUserShopListByUserId(userid).getData();
+ if (null == data || data.isEmpty()) {
+ return R.fail("暂无其他门店可切换");
+ }
+ List<Integer> collect = data.stream().map(AppUserShop::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));
+ if (shops == null || shops.isEmpty()) {
+ return R.fail("暂无其他门店可切换");
+ }
List<VerifiableShopVo> list = new ArrayList<>();
for (Shop shop : shops) {
VerifiableShopVo vo = new VerifiableShopVo();
+ BeanUtils.copyProperties(shop, vo);
vo.setId(shop.getId());
vo.setName(shop.getName());
+
vo.setHomePicture(shop.getHomePicture());
- String address = shop.getProvince() + shop.getCity() + shop.getDistrict()+ shop.getAddress();
- vo.setAddress(address);
if (null != latitude && null != longitude) {
Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
vo.setDistance(wgs84.longValue());
@@ -750,7 +582,9 @@
@ResponseBody
@GetMapping("/getGoodsListByShopId")
@ApiOperation(value = "获取门店内商品列表", tags = {"门店后台-首页"})
- public R<PageInfo<GoodsVO>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
+ public R<PageInfo<GoodsVO>> getGoodsListByShopId(@ApiParam("门店id")@RequestParam("shopId") Integer shopId,
+ @ApiParam("门店id")@RequestParam("pageCurr") Integer pageCurr,
+ @ApiParam("门店id")@RequestParam("pageSize") Integer pageSize) {
PageInfo<GoodsVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
List<GoodsVO> goodsList = shopService.getGoodsListByShopId(pageInfo, shopId);
return R.ok(pageInfo.setRecords(goodsList));
@@ -770,10 +604,19 @@
*/
@PostMapping("/addGoods")
@ApiOperation(value = "发布商品", tags = {"门店后台-商品管理"})
- public R<Void> addGoods(@RequestBody AddGoodsDTO addGoodsDTO) {
- shopService.addGoodsByShop(addGoodsDTO);
- return R.ok();
+ public R<Integer> addGoods(@RequestBody AddGoodsDTO addGoodsDTO) {
+ return R.ok( shopService.addGoodsByShop(addGoodsDTO));
}
+
+ /**
+ * 编辑商品
+ */
+ @PostMapping("/editGoods")
+ @ApiOperation(value = "编辑商品", tags = {"门店后台-商品管理"})
+ public R<Integer> editGoods(@RequestBody AddGoodsDTO addGoodsDTO) {
+ return R.ok( shopService.editGoodsByShop(addGoodsDTO));
+ }
+
/**
* 上、下架商品
@@ -787,7 +630,6 @@
}
goodsService.update(new UpdateWrapper<Goods>()
.setSql("status = CASE status WHEN 1 THEN 2 WHEN 2 THEN 1 ELSE status END")
- .set("update_time", LocalDateTime.now())
.eq("id", goodsId));
return R.ok();
}
@@ -796,24 +638,25 @@
* 删除商品
*/
@DeleteMapping("/del/{goodsId}")
- @ApiOperation(value = "发布商品", tags = {"门店后台-商品管理"})
- public R<Void> addGoods(@PathVariable Integer goodsId) {
- Goods goods = goodsService.getById(goodsId);
+ @ApiOperation(value = "删除商品", tags = {"门店后台-商品管理"})
+ public R<Void> delGoods(@PathVariable Integer goodsId) {
+ Goods goods = goodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getId, goodsId)
+ .eq(Goods::getStatus, 2).eq(Goods::getDelFlag,0));
if (goods == null) {
return R.fail("商品不存在");
}
- goodsService.removeById(goodsId);
+ goodsService.update(new LambdaUpdateWrapper<Goods>().eq(Goods::getId, goodsId).set(Goods::getDelFlag,1));
+
return R.ok();
}
/**
* 获取所有门店
- * @return
*/
- @PostMapping("/getAllShop")
+ @GetMapping("/getAllShop")
public R<List<Shop>> getAllShop(){
- List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().select(Shop::getName,Shop::getId).eq(Shop::getDelFlag, 0));
return R.ok(list);
}
@@ -856,7 +699,18 @@
return R.ok(list);
}
+ @GetMapping("/getServiceProvider")
+ R<List<String>> getServiceProvider(@RequestParam("appUserId") Long appUserId){
+ LambdaQueryWrapper<Shop> queryWrapper=new LambdaQueryWrapper<>();
+ queryWrapper.eq(Shop::getAppUserId, appUserId);
+ queryWrapper.eq(Shop::getDelFlag,0);
+ List<Shop> shops = shopMapper.selectList(queryWrapper);
+ List<String> collect = shops.stream().map(Shop::getName).distinct().collect(Collectors.toList());
+ return R.ok(collect);
+ }
+
+/*
@GetMapping("/getShopStatistics")
public R<Map<String, BigDecimal> > getShopStatistics(@RequestParam("shopId") Integer shopId){
LambdaQueryWrapper<Shop> queryWrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1);
@@ -866,16 +720,65 @@
List<Shop> shopList = shopService.list(queryWrapper);
BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
BigDecimal giveawayMoney = BigDecimal.ZERO;
- /* for (Shop shop : shopList) {
+ */
+/* for (Shop shop : shopList) {
serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
- }*/
+ }*//*
+
Map<String, BigDecimal> map = new HashMap<>();
map.put("serverGiveawayMoney", serverGiveawayMoney);
map.put("giveawayMoney", giveawayMoney);
return R.ok(map);
}
+*/
+ /**
+ * 获取店铺收益 后台-工作台-收益分析
+ */
+ @PostMapping("/getIncomeAnalysis")
+ R<Map<String, Object>> getIncomeAnalysis(@RequestBody ShopAnalysisDTO shopAnalysisDTO){
+ QueryWrapper<Shop> queryWrapper=new QueryWrapper<>();
+ //余额 已提现 提现中 可提现
+ queryWrapper.select("sum(balance) as balance","sum(withdraw_money) as withdrawMoney"
+ ,"sum(withdraw_audit_money) as withdrawAuditMoney","sum(can_withdraw_money) as canWithdrawMoney");
+ queryWrapper.eq("del_flag",0);
+ if (shopAnalysisDTO.getShopId() != null) {
+ queryWrapper.eq("id", shopAnalysisDTO.getShopId());
+ }
+ return R.ok(shopService.getMap(queryWrapper));
+ }
+
+ @PostMapping("/insert")
+ R insert(@RequestBody Shop shop){
+ shopService.save(shop);
+ return R.ok(shop.getId());
+ }
+
+ /**
+ * 店铺余额列表
+ */
+
+ @GetMapping("/getBalanceList")
+ @ApiOperation(value = "门店余额列表", tags = {"后台-财务统计-余额列表"})
+ R<PageInfo<ShopBalanceListVO>> getBalanceList(@ApiParam("门店名称")@RequestParam(value = "name",required = false) String name,
+ @ApiParam("当前页")@RequestParam("pageCurr") Integer pageCurr,
+ @ApiParam("分页大小")@RequestParam("pageSize") Integer pageSize){
+ PageInfo<ShopBalanceListVO> pageInfo=shopService.getBalanceList(name,pageCurr,pageSize);
+ return R.ok(pageInfo);
+ }
+
+ /**
+ * 导出店铺余额列表
+ */
+
+ @GetMapping("/shopBalanceExcel")
+ @ApiOperation(value = "导出", tags = {"后台-财务统计-余额列表"})
+ void shopBalanceExcel(HttpServletResponse response,@ApiParam("门店名称")@RequestParam(value = "name" ,required = false) String name){
+ List<ShopBalanceExcel> exportList =shopMapper.shopBalanceExcel(name);
+ ExcelUtil<ShopBalanceExcel> util = new ExcelUtil<ShopBalanceExcel>(ShopBalanceExcel.class);
+ util.exportExcel(response, exportList, "店铺余额列表数据");
+ }
}
--
Gitblit v1.7.1