java/HongRuiTang.git

			@@ -3,14 +3,12 @@
			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.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;
			@@ -19,6 +17,7 @@
			import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -61,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);
			}

			@@ -124,6 +124,7 @@
			String[] editArr = editValue.split("-");
			shop.setBusinessStartTime(editArr[0]);
			shop.setBusinessEndTime(editArr[1]);
			shopService.saveOrUpdate(shop);
			}
			return R.ok();
			}
			@@ -160,4 +161,12 @@
			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);
			}
			}