From 905077448a20fe1f06c9303152e83a6c9463541c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 四月 2025 19:21:54 +0800
Subject: [PATCH] 商家端
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 178 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 60 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 07f7b79..e8839ab 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
@@ -3,12 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.MD5Generator;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -16,6 +19,7 @@
import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.dto.AddGoodsDTO;
import com.ruoyi.other.enums.PhoneType;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.mapper.ShopScoreMapper;
@@ -31,6 +35,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -40,7 +46,10 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
import java.util.*;
import java.util.stream.Collectors;
@@ -564,8 +573,6 @@
/**
* 根据id获取门店信息
- * @param id
- * @return
*/
@ResponseBody
@PostMapping("/getShopById")
@@ -574,6 +581,9 @@
return R.ok(shop);
}
+ /**
+ * 根据店长id获取门店列表
+ */
@ResponseBody
@PostMapping("/getShopByUserId")
public R<List<Shop>> getShopByUserId(@RequestParam("id") Long id){
@@ -581,11 +591,8 @@
return R.ok(list);
}
-
/**
* 根据店铺管理员电话获取门店数据
- * @param phone
- * @return
*/
@ResponseBody
@PostMapping("/getShopByPhone")
@@ -594,11 +601,11 @@
return R.ok(one);
}
- @PostMapping("/getShopByUserIds")
+/* @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
@@ -648,7 +655,6 @@
/**
* 编辑门店
- * @param shop
*/
@PostMapping("/updateShop")
public void updateShop(@RequestBody Shop shop){
@@ -656,56 +662,11 @@
}
-
-
- @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);*/
- return null;
- }
-
-
-
@ResponseBody
@GetMapping("/getSysUserShop")
@ApiOperation(value = "获取可切换的门店列表", tags = {"门店后台-首页"})
- public R<List<VerifiableShopVo>> getSysUserShop(){
+ 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);
@@ -719,12 +680,47 @@
VerifiableShopVo vo = new VerifiableShopVo();
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());
+ }
list.add(vo);
}
return R.ok(list);
}
-
-
+
+ @ResponseBody
+ @GetMapping("/getShopBalance")
+ @ApiOperation(value = "获取门店余额", tags = {"门店后台-首页"})
+ public R<ShopBalanceVO> getShopBalance(@ApiParam("门店id") @RequestParam Integer shopId){
+ return R.ok(shopService.getShopBalance(shopId));
+ }
+
+ @ResponseBody
+ @GetMapping("/getShopBalanceStatementList")
+ @ApiOperation(value = "获取门店余额变动明细", tags = {"门店后台-首页"})
+ public R<PageInfo<ShopBalanceStatementVO>> getShopBalanceStatementList(@ApiParam("变动类型（4=提现，5=订单收入，6=订单退款）") Integer type,
+ @ApiParam("门店id") Integer shopId,
+ @ApiParam("指定日期") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date,
+ Integer pageCurr, Integer pageSize){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ if (date != null) {
+ // 将 createTime 设置为当天的开始时间 (00:00)
+ startTime = date.atStartOfDay();
+
+ // 使用 YearMonth 来获取该月的最后一天
+ YearMonth yearMonth = YearMonth.from(date);
+ LocalDate lastDayOfMonth = yearMonth.atEndOfMonth();
+
+ // 将最后一天转换为 LocalDateTime，并设置为当天的最后一秒 (23:59:59.999)
+ endTime = lastDayOfMonth.atTime(LocalTime.MAX);
+ }
+ return R.ok(shopService.getShopBalanceStatementList(shopId,startTime, endTime, type, pageCurr, pageSize));
+ }
@PostMapping("/saveWithdrawalAccount")
@ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
@@ -734,9 +730,8 @@
}
@PostMapping("/saveWithdrawalAppletAccount")
- @ApiOperation(value = "保存提现账户", tags = {"小程序-个人中心-门店管理-门店钱包"})
+ @ApiOperation(value = "保存提现账户", tags = {"门店后台-首页"})
public R saveWithdrawalAppletAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount){
-
Shop shop = shopService.getById(saveWithdrawalAccount.getShopId());
if(null != shop){
shop.setReceiverAccountNoEnc(saveWithdrawalAccount.getReceiverAccountNoEnc());
@@ -745,6 +740,69 @@
shop.setReceiverBankChannelNo(saveWithdrawalAccount.getReceiverBankChannelNo());
shopService.updateById(shop);
}
+ return R.ok();
+ }
+
+
+ /**
+ * 指定门店商品
+ */
+ @ResponseBody
+ @GetMapping("/getGoodsListByShopId")
+ @ApiOperation(value = "获取门店内商品列表", tags = {"门店后台-首页"})
+ public R<PageInfo<GoodsVO>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
+ PageInfo<GoodsVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
+ List<GoodsVO> goodsList = shopService.getGoodsListByShopId(pageInfo, shopId);
+ return R.ok(pageInfo.setRecords(goodsList));
+ }
+
+ /**
+ * 商品详情
+ */
+ @GetMapping("/goodsDetail/{goodsId}")
+ @ApiOperation(value = "商品详情", tags = {"门店后台-首页"})
+ public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId) {
+ return R.ok(shopService.goodsDetail(goodsId));
+ }
+
+ /**
+ * 添加商品
+ */
+ @PostMapping("/addGoods")
+ @ApiOperation(value = "发布商品", tags = {"门店后台-商品管理"})
+ public R<Void> addGoods(@RequestBody AddGoodsDTO addGoodsDTO) {
+ shopService.addGoodsByShop(addGoodsDTO);
+ return R.ok();
+ }
+
+ /**
+ * 上、下架商品
+ */
+ @PostMapping("/status/{goodsId}")
+ @ApiOperation(value = "上、下架商品", tags = {"门店后台-商品管理"})
+ public R<Void> status(@PathVariable Integer goodsId) {
+ Goods goods = goodsService.getById(goodsId);
+ if (goods == null) {
+ return R.fail("商品不存在");
+ }
+ 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();
+ }
+
+ /**
+ * 删除商品
+ */
+ @DeleteMapping("/del/{goodsId}")
+ @ApiOperation(value = "发布商品", tags = {"门店后台-商品管理"})
+ public R<Void> addGoods(@PathVariable Integer goodsId) {
+ Goods goods = goodsService.getById(goodsId);
+ if (goods == null) {
+ return R.fail("商品不存在");
+ }
+ goodsService.removeById(goodsId);
return R.ok();
}
@@ -761,7 +819,7 @@
@ResponseBody
@GetMapping("/verifyAccountConfiguration")
- @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细"})
+ @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-首页"})
public R verifyAccountConfiguration(){
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
--
Gitblit v1.7.1