From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index ce90f1a..9a4c127 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -61,7 +61,8 @@
@ApiOperation(value = "获取商户端商业统计")
public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerBaseDto merBaseDto) {
Long userId = SecurityUtils.getUserId();
- MerHomeShopTotalVo merHomeShopTotalVo = shopService.getMerHomeTotal(userId);
+ merBaseDto.setUserId(userId);
+ MerHomeShopTotalVo merHomeShopTotalVo = shopService.getMerHomeTotal(merBaseDto);
return R.ok(merHomeShopTotalVo);
}
@@ -116,7 +117,15 @@
public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
Long userId = SecurityUtils.getUserId();
merEditUserDto.setUserId(userId);
- shopStaffService.editShopStaffInfo(merEditUserDto);
+ if(merEditUserDto.getEditType()!=5){
+ shopStaffService.editShopStaffInfo(merEditUserDto);
+ }else{
+ Shop shop = shopService.getByShopId(merEditUserDto.getShopId());
+ String editValue = merEditUserDto.getEditValue();
+ String[] editArr = editValue.split("-");
+ shop.setBusinessStartTime(editArr[0]);
+ shop.setBusinessEndTime(editArr[1]);
+ }
return R.ok();
}
--
Gitblit v1.7.1