From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 11:43:51 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java |   64 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 20 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 806b660..5bda83c 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
@@ -3,29 +3,22 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
-import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
-import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
+import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
 import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
 import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
 import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
-import com.ruoyi.shop.service.shop.ShopCertificateService;
-import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.shop.service.shop.ShopStaffService;
-import com.ruoyi.shop.service.shop.ShopSuggestService;
-import com.ruoyi.system.api.domain.dto.MerBaseDto;
-import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
-import com.ruoyi.system.api.domain.dto.MerEditUserDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.shop.domain.vo.MerchantBasicdataSettlementVo;
+import com.ruoyi.shop.service.shop.*;
+import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -52,7 +45,8 @@
     @Resource
     private ShopStaffService shopStaffService;
 
-
+    @Resource
+    private ShopRelUserService shopRelUserService;
 
     @Resource
     private ShopSuggestService shopSuggestService;
@@ -66,7 +60,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);
     }
 
@@ -110,7 +105,9 @@
     @ApiOperation(value = "获取员工信息")
     public R<MerStaffInfoVo> getShopStaffInfo() {
         Long userId = SecurityUtils.getUserId();
-        MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId);
+        ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+        Shop shop = shopService.getByShopId(shopRelUser.getShopId());
+        MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId,shop);
         return R.ok(merStaffInfoVo);
     }
 
@@ -119,7 +116,16 @@
     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]);
+            shopService.saveOrUpdate(shop);
+        }
         return R.ok();
     }
 
@@ -145,4 +151,22 @@
         shopSuggestService.suggest(merShopSuggestDto);
         return R.ok();
     }
+
+
+
+    @RequestMapping(value = "/listShopByShop", method = RequestMethod.POST)
+    @ApiOperation(value = "获取商户下属代理商")
+    public R<List<MgtSimpleShopVo>> listShopByShop(@RequestBody MerBaseDto merBaseDto)
+    {
+        List<MgtSimpleShopVo> mgtShopListSimpleVos = shopService.listShopByShop(merBaseDto.getShopId());
+        return R.ok(mgtShopListSimpleVos);
+    }
+
+
+
+    @RequestMapping(value = "/getShopMerchantBasicDataSettlement", method = RequestMethod.POST)
+    @ApiOperation(value = "获取提现记录（汇付天下）")
+    public R<List<MerchantBasicdataSettlementVo>> getMerchantBasicDataSettlement(@Validated @RequestBody MerchantBasicdataSettlementDto mgtShopShareRatioSetDto){
+        return shopService.getMerchantBasicDataSettlement(mgtShopShareRatioSetDto);
+    }
 }

--
Gitblit v1.7.1