ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -89,4 +89,14 @@ shopService.changeCooperationTime(mgtChangeCoopDto); return R.ok(); } @RequestMapping(value = "/pageMgtShopProportion", method = RequestMethod.POST) @ApiOperation(value = "分页获取商户分成列表") public R<Page<MgtShopPageVo>> pageMgtShopProportion(@RequestBody MgtShopPageDto mgtShopPageDto) { Page<MgtShopPageVo> page = new Page<>(); page.setSize(mgtShopPageDto.getPageSize()); page.setCurrent(mgtShopPageDto.getPageNum()); List<MgtShopPageVo> mgtShopPageVoList = shopService.pageShop(page,mgtShopPageDto); return R.ok(page.setRecords(mgtShopPageVoList)); } } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopProportionPageDto.java
New file @@ -0,0 +1,19 @@ package com.ruoyi.shop.domain.dto; import com.ruoyi.system.api.domain.dto.MgtPageDto; import lombok.Data; /** * @ClassName MgtShopProportionPageDto * @Description TODO * @Author jqs * @Date 2023/6/7 18:00 * @Version 1.0 */ @Data public class MgtShopProportionPageDto extends MgtPageDto { } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java
@@ -1,16 +1,17 @@ package com.ruoyi.shop.domain.pojo.shop; import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** * <p> @@ -31,7 +32,7 @@ /** * 分成id */ @TableId("proportion_id") @TableId(value = "proportion_id",type = IdType.AUTO) private Long proportionId; /** * 删除标记 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopProportionPageVo.java
New file @@ -0,0 +1,36 @@ package com.ruoyi.shop.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @ClassName MgtShopProportionPageVo * @Description TODO * @Author jqs * @Date 2023/6/7 17:57 * @Version 1.0 */ @Data public class MgtShopProportionPageVo { @ApiModelProperty(value = "分成id") private Long proportionId; @ApiModelProperty(value = "商户id") private Long shopId; @ApiModelProperty("商户名称") private String shopName; @ApiModelProperty("店铺地址") private String shopAddress; @ApiModelProperty("店主姓名") private String shopownerName; @ApiModelProperty(value = "分成比例") private BigDecimal proportionPercent; } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -83,6 +83,10 @@ @Resource private ShopAuthenticationService shopAuthenticationService; @Resource private ShopProportionService shopProportionService; /** * 获取商户详情 @@ -220,6 +224,7 @@ } } if(newShop){ //商户账户信息初始化 ShopAccount shopAccount = new ShopAccount(); shopAccount.setShopId(shop.getShopId()); shopAccount.setDelFlag(0); @@ -228,13 +233,23 @@ shopAccount.setTotalRefund(new BigDecimal("0")); shopAccount.setTotalProfitsharing(new BigDecimal("0")); shopAccount.setTotalMoney(new BigDecimal("0")); shopAccountService.saveOrUpdate(shopAccount); shopAccountService.save(shopAccount); //商户认证信息初始化 String authId = IdUtils.simpleUUID(); ShopAuthentication shopAuthentication = new ShopAuthentication(); shopAuthentication.setAuthId(authId); shopAuthentication.setDelFlag(0); shopAuthentication.setShopId(shop.getShopId()); shopAuthenticationService.saveOrUpdate(shopAuthentication); shopAuthenticationService.save(shopAuthentication); //商户分成信息初始化 ShopProportion shopProportion = new ShopProportion(); shopProportion.setDelFlag(0); shopProportion.setShopId(shop.getShopId()); shopProportion.setShopType(shop.getShopType()); shopProportion.setProportionPercent(new BigDecimal("100.00")); shopProportion.setUpdateTime(new Date()); shopProportion.setUpdateUserId(MGTEditShopDto.getUserId()); shopProportionService.save(shopProportion); } }