diff --git a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java index c5e5f34..07b3ae6 100644 --- a/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java @@ -103,7 +103,8 @@ public class MybatisPlusConfig { "shop_dealer_user", "shop_dealer_order", "shop_dealer_referee", - "shop_store_rider" + "shop_store_rider", + "shop_goods_profit" ).contains(tableName); } }; diff --git a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java index 247f7ab..89b74bb 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java @@ -143,7 +143,8 @@ public class GltTicketIssueService { //2.执行分销员分销、统计门店/服务商分销业务 dealerOrderSettlement.orderSettlement(orderNo); - //3.执行平台分红业务 TODO 待开发 + //3.执行平台分红业务 + dealerOrderSettlement.partnerProfit(orderNo, tenantId); //4.普通商品【非水票订单】如果是需要自配送的，则会同步生成派单信息 gltTicketOrderService.dispatchOrder(orderNo, tenantId); diff --git a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java index b995553..f824d5e 100644 --- a/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java +++ b/src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java @@ -8,8 +8,11 @@ import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum; import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.mapper.UserMapper; +import com.gxwebsoft.common.system.redis.OrderNoUtils; import com.gxwebsoft.glt.entity.GltTicketTemplate; import com.gxwebsoft.glt.service.GltTicketTemplateService; +import com.gxwebsoft.shop.dto.ShopDealerSettlementDto; +import com.gxwebsoft.shop.dto.ShopDealerSettlementItemDto; import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.mapper.ShopDealerRefereeMapper; @@ -17,6 +20,7 @@ import com.gxwebsoft.shop.mapper.ShopOrderMapper; import com.gxwebsoft.shop.service.*; import com.gxwebsoft.shop.util.UpstreamUserFinder; import com.gxwebsoft.shop.vo.ShopDealerRefereeVO; +import com.gxwebsoft.shop.vo.ShopGoodsProfitVO; import com.gxwebsoft.shop.vo.ShopOrderGoodsVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -33,6 +37,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; /** * 租户10584：分销订单结算任务 @@ -94,6 +99,12 @@ public class DealerOrderSettlement10584Task { @Resource private ShopDealerRefereeMapper shopDealerRefereeMapper; + @Resource + private ShopGoodsProfitService shopGoodsProfitService; + + @Resource + private OrderNoUtils orderNoUtils; + /** * 每10秒执行一次。 */ @@ -230,6 +241,68 @@ public class DealerOrderSettlement10584Task { } } + /** + * 股东/合伙人分红 + * @param orderNo 订单号 + * @return + */ + @Transactional + public Boolean partnerProfit(String orderNo, Integer tenantId){ + //1.查询订单信息 + ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId); + if(shopOrder != null){ + //2.查询订单号订单所有已开启分销的商品分润信息 + List orderGoodsVOList = shopOrderMapper.getOrderGoodsInfo(orderNo); + if(CollectionUtils.isNotEmpty(orderGoodsVOList)){ + + //3.计算商品实付比例 + BigDecimal rate = shopOrder.getPayPrice().divide(shopOrder.getTotalPrice(), 2, RoundingMode.HALF_UP); + + //4.查询商品分红设定比例数据 + List goodsIdList = orderGoodsVOList.stream().map(ShopOrderGoodsVO::getGoodsId).distinct().collect(Collectors.toList()); + List goodsProfitVOList = shopGoodsProfitService.getGoodsProfit(goodsIdList, 1); + + if(CollectionUtils.isNotEmpty(goodsProfitVOList)){ + List itemList = new ArrayList<>(); + + //5.按照商品分组分润信息 + Map> goodsProfitMap = goodsProfitVOList.stream().collect(Collectors.groupingBy(ShopGoodsProfitVO::getGoodsId)); + + //6.遍历商品获取分红子项数据 + orderGoodsVOList.forEach(orderGoodsVO ->{ + List profitVOS = goodsProfitMap.get(orderGoodsVO.getGoodsId()); + if(CollectionUtils.isNotEmpty(profitVOS)){ + BigDecimal itemPrice = orderGoodsVO.getPrice().multiply(BigDecimal.valueOf(orderGoodsVO.getTotalNum())); + BigDecimal itemProfitPrice = itemPrice.multiply(rate).setScale(3, RoundingMode.HALF_UP); + profitVOS.forEach(profitVO ->{ + ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto(); + String no = orderNoUtils.generate("C"); + BigDecimal money = profitVO.getProfit().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP).multiply(itemProfitPrice).setScale(3, RoundingMode.HALF_UP); + itemDto.setNo(no); + itemDto.setUserId(profitVO.getUserId()); + itemDto.setMoney(money); + + itemList.add(itemDto); + }); + } + }); + + //7.存在分红子项数据，则批量结算 + if(CollectionUtils.isNotEmpty(itemList)){ + ShopDealerSettlementDto settlementDto = new ShopDealerSettlementDto(); + settlementDto.setOrderNo(orderNo); + settlementDto.setToUserId(shopOrder.getUserId()); + settlementDto.setTenantId(tenantId); + settlementDto.setItemList(itemList); + + shopDealerUserService.orderProfit(settlementDto); + } + } + } + } + return Boolean.TRUE; + } + private List findUnsettledPaidOrders(Set waterFormIds) { // 租户10584约定： // - 普通订单：以发货为准（deliveryStatus=20）才结算； @@ -380,12 +453,12 @@ public class DealerOrderSettlement10584Task { // 已日结形式，统计分销记录表：shop_dealer_order 做对应一级二级管理津贴结算】 ShopRoleCommission shopRoleCommission = settleShopRoleRefereeCommissionV2(order, rate, orderGoodsVOList, level1ParentCache, shopRoleCache); - // 3) 分红：固定比率，每个订单都分 TODO 总分红未开发，还按原逻辑走 - int goodsQty = orderGoodsVOList.stream().mapToInt(ShopOrderGoodsVO::getTotalNum).sum(); - TotalDealerCommission totalDealerCommission = settleTotalDealerCommissionV2(order, goodsQty, totalDealerUser); +// // 3) 分红：固定比率，每个订单都分 +// int goodsQty = orderGoodsVOList.stream().mapToInt(ShopOrderGoodsVO::getTotalNum).sum(); +// TotalDealerCommission totalDealerCommission = settleTotalDealerCommissionV2(order, goodsQty, totalDealerUser); - // 4) 写入分销订单记录（用于排查/统计；详细分佣以 ShopDealerCapital 为准） - createDealerOrderRecordV2(order, dealerRefereeCommission, shopRoleCommission, totalDealerCommission); + // 3) 写入分销订单记录（用于排查/统计；详细分佣以 ShopDealerCapital 为准） + createDealerOrderRecordV2(order, dealerRefereeCommission, shopRoleCommission); log.info("订单结算完成 - orderId={}, orderNo={}, baseAmount={}", order.getOrderId(), order.getOrderNo(), payPrice); }else { @@ -1067,7 +1140,7 @@ public class DealerOrderSettlement10584Task { * @param dealerRefereeCommission 一级、二级分销员分销数据 * @param shopRoleCommission 门店/服务商一级、二级管理津贴数据 */ - private void createDealerOrderRecordV2(ShopOrder order, DealerRefereeCommissionV2 dealerRefereeCommission, ShopRoleCommission shopRoleCommission, TotalDealerCommission totalDealerCommission) { + private void createDealerOrderRecordV2(ShopOrder order, DealerRefereeCommissionV2 dealerRefereeCommission, ShopRoleCommission shopRoleCommission) { // 幂等：同一订单只写一条（依赖 order_no + tenant_id 作为业务唯一） ShopDealerOrder existed = shopDealerOrderService.getOne( new LambdaQueryWrapper() @@ -1141,7 +1214,7 @@ public class DealerOrderSettlement10584Task { dealerOrder.setSettleTime(LocalDateTime.now()); dealerOrder.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); dealerOrder.setTenantId(TENANT_ID); - dealerOrder.setComments(buildCommissionTraceCommentV2(dealerRefereeCommission, shopRoleCommission, totalDealerCommission)); + dealerOrder.setComments(buildCommissionTraceCommentV2(dealerRefereeCommission, shopRoleCommission)); shopDealerOrderService.save(dealerOrder); } @@ -1163,8 +1236,7 @@ public class DealerOrderSettlement10584Task { private String buildCommissionTraceCommentV2( DealerRefereeCommissionV2 dealerRefereeCommission, - ShopRoleCommission shopRoleCommission, - TotalDealerCommission totalDealerCommission + ShopRoleCommission shopRoleCommission ) { // 轻量“过程”留痕，方便排查；详细分佣以 ShopDealerCapital 为准。 Integer direct = dealerRefereeCommission != null ? dealerRefereeCommission.directDealerId : null; @@ -1175,14 +1247,11 @@ public class DealerOrderSettlement10584Task { BigDecimal storeDirectMoney = shopRoleCommission != null ? shopRoleCommission.storeDirectMoney : BigDecimal.ZERO; Integer storeSimpleUserId = shopRoleCommission != null ? shopRoleCommission.storeSimpleUserId : null; BigDecimal storeSimpleMoney = shopRoleCommission != null ? shopRoleCommission.storeSimpleMoney : BigDecimal.ZERO; - Integer userId = totalDealerCommission != null ? totalDealerCommission.userId : null; - BigDecimal money = totalDealerCommission != null ? totalDealerCommission.money : BigDecimal.ZERO; return "direct=" + direct + ":" + directMoney + ",simple=" + simpleDealerId + ":" + simpleMoney + ",dividend1=" + storeDirectUserId + ":" + storeDirectMoney - + ",dividend2=" + storeSimpleUserId + ":" + storeSimpleMoney - + ",totalDealer=" + userId + ":" + money; + + ",dividend2=" + storeSimpleUserId + ":" + storeSimpleMoney; } private BigDecimal getOrderBaseAmount(ShopOrder order) { diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java index c7e8ecf..8c1ca96 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopGoodsProfitController.java @@ -3,13 +3,14 @@ package com.gxwebsoft.shop.controller; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.shop.entity.ShopGoodsProfit; -import com.gxwebsoft.shop.param.ShopGoodsProfitParam; +import com.gxwebsoft.shop.dto.ShopGoodsProfitUpdateDto; import com.gxwebsoft.shop.service.ShopGoodsProfitService; +import com.gxwebsoft.shop.vo.ShopGoodsProfitVO; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -29,65 +30,22 @@ public class ShopGoodsProfitController extends BaseController { private ShopGoodsProfitService shopGoodsProfitService; // @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") - @Operation(summary = "分页查询商品分润设定") - @GetMapping("/page") - public ApiResult> page(ShopGoodsProfitParam param) { - // 使用关联查询 - return success(shopGoodsProfitService.pageRel(param)); - } - -// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") - @Operation(summary = "查询全部商品分润设定") - @GetMapping() - public ApiResult> list(ShopGoodsProfitParam param) { - // 使用关联查询 - return success(shopGoodsProfitService.listRel(param)); - } - -// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')") - @Operation(summary = "根据id查询商品分润设定") - @GetMapping("/{id}") - public ApiResult get(@PathVariable("id") Integer id) { - // 使用关联查询 - return success(shopGoodsProfitService.getByIdRel(id)); - } - -// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:save')") - @OperationLog - @Operation(summary = "添加商品分润设定") - @PostMapping() - public ApiResult save(@RequestBody ShopGoodsProfit shopGoodsProfit) { - // 记录当前登录用户id - User loginUser = getLoginUser(); - if (loginUser != null) { - shopGoodsProfit.setUserId(loginUser.getUserId()); - } - if (shopGoodsProfitService.save(shopGoodsProfit)) { - return success("添加成功"); - } - return fail("添加失败"); + @Operation(summary = "通过商品、类型查询分润信息") + @GetMapping("/getByGoodsId") + @Parameters({ + @Parameter(name = "goodsId", description = "商品ID", required = true, example = "10086"), + @Parameter(name = "type", description = "类型 1-分红 2-其他", required = true, example = "1") + }) + public ApiResult> getByGoodsId(@RequestParam("goodsId") Integer goodsId, @Param("type") Integer type) { + return success(shopGoodsProfitService.getByGoodsId(goodsId, type)); } // @PreAuthorize("hasAuthority('shop:shopGoodsProfit:update')") @OperationLog - @Operation(summary = "修改商品分润设定") - @PutMapping() - public ApiResult update(@RequestBody ShopGoodsProfit shopGoodsProfit) { - if (shopGoodsProfitService.updateById(shopGoodsProfit)) { - return success("修改成功"); - } - return fail("修改失败"); - } - -// @PreAuthorize("hasAuthority('shop:shopGoodsProfit:remove')") - @OperationLog - @Operation(summary = "删除商品分润设定") - @DeleteMapping("/{id}") - public ApiResult remove(@PathVariable("id") Integer id) { - if (shopGoodsProfitService.removeById(id)) { - return success("删除成功"); - } - return fail("删除失败"); + @Operation(summary = "根据商品ID修改商品分润设定") + @PutMapping("/updateByGoodsId") + public ApiResult update(@RequestBody ShopGoodsProfitUpdateDto updateDto) { + return success(shopGoodsProfitService.updateByGoodsId(updateDto)); } } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 4866792..ee9203d 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -1001,6 +1001,13 @@ public class ShopOrderController extends BaseController { return success(Boolean.TRUE); } + @Operation(summary = "分红结算", description = "分红结算") + @PutMapping("/partnerProfit") + public ApiResult partnerProfit(@RequestBody PaySuccessTaskDto taskDto){ + dealerOrderSettlement.partnerProfit(taskDto.getOrderNo(), taskDto.getTenantId()); + return success(Boolean.TRUE); + } + @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态") @PutMapping("/payment-status") public ApiResult updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) { diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java index 9cc92fb..232d064 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java @@ -31,7 +31,7 @@ @Resource private ShopUserAddressService shopUserAddressService; - @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") @Operation(summary = "分页查询收货地址") @GetMapping("/page") public ApiResult> page(ShopUserAddressParam param) { @@ -39,7 +39,7 @@ return success(shopUserAddressService.pageRel(param)); } - @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") @Operation(summary = "查询全部收货地址") @GetMapping() public ApiResult> list(ShopUserAddressParam param) { @@ -48,7 +48,7 @@ return success(shopUserAddressService.listRel(param)); } - @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:list')") @Operation(summary = "根据id查询收货地址") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -56,7 +56,7 @@ return success(shopUserAddressService.getByIdRel(id)); } - @PreAuthorize("hasAuthority('shop:shopUserAddress:save')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:save')") @OperationLog @Operation(summary = "添加收货地址") @PostMapping() @@ -75,7 +75,7 @@ return fail("添加失败"); } - @PreAuthorize("hasAuthority('shop:shopUserAddress:update')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:update')") @OperationLog @Operation(summary = "修改收货地址") @PutMapping() @@ -83,7 +83,7 @@ return success(shopUserAddressService.updateInfo(shopUserAddress)); } - @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')") +// @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')") @OperationLog @Operation(summary = "删除收货地址") @DeleteMapping("/{id}") diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java index 2c950e2..2b06cec 100644 --- a/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopDealerSettlementDto.java @@ -20,9 +20,15 @@ public class ShopDealerSettlementDto { @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)") private Integer flowType; + @Schema(description = "订单号") + private String orderNo; + @Schema(description = "描述") private String comments; + @Schema(description = "分销来源") + private Integer toUserId; + @Schema(description = "商城ID") private Integer tenantId; diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateDto.java new file mode 100644 index 0000000..d029e27 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateDto.java @@ -0,0 +1,29 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * 商品分润设定更新 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Data +public class ShopGoodsProfitUpdateDto { + + @Schema(description = "商品ID") + @NotEmpty(message = "商品ID不能为空！") + private Integer goodsId; + + @Schema(description = "分润类型 1-股东分红 2-其他") + @NotEmpty(message = "分润类型不能为空！") + private Integer type; + + @Schema(description = "变更明细") + private List itemList; + +} diff --git a/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateItemDto.java b/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateItemDto.java new file mode 100644 index 0000000..53abf34 --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/dto/ShopGoodsProfitUpdateItemDto.java @@ -0,0 +1,26 @@ +package com.gxwebsoft.shop.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 商品分润设定更新 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Data +public class ShopGoodsProfitUpdateItemDto { + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "分佣比例 百分比") + private BigDecimal profit; + + @Schema(description = "开启状态 0-未开启 1-开启") + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java index 6ef99c6..81f7f67 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.java @@ -1,12 +1,7 @@ package com.gxwebsoft.shop.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.gxwebsoft.shop.entity.ShopGoodsProfit; -import com.gxwebsoft.shop.param.ShopGoodsProfitParam; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 商品分润设定Mapper @@ -16,22 +11,4 @@ import java.util.List; */ public interface ShopGoodsProfitMapper extends BaseMapper { - /** - * 分页查询 - * - * @param page 分页对象 - * @param param 查询参数 - * @return List - */ - List selectPageRel(@Param("page") IPage page, - @Param("param") ShopGoodsProfitParam param); - - /** - * 查询全部 - * - * @param param 查询参数 - * @return List - */ - List selectListRel(@Param("param") ShopGoodsProfitParam param); - } diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml index 688e3b9..06996ee 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml @@ -11,6 +11,7 @@ LEFT JOIN gxwebsoft_core.sys_user d ON a.to_user_id = d.user_id and d.deleted = 0 LEFT JOIN shop_order e ON a.order_no = e.order_no + a.deleted = 0 AND a.id = #{param.id} diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml index 79bf817..fb7c86c 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGoodsProfitMapper.xml @@ -2,62 +2,4 @@ - - - SELECT a.* - FROM shop_goods_profit a - - - AND a.id = #{param.id} - - - AND a.type = #{param.type} - - - AND a.goods_id = #{param.goodsId} - - - AND a.user_id = #{param.userId} - - - AND a.profit = #{param.profit} - - - AND a.status = #{param.status} - - - AND a.creator = #{param.creator} - - - AND a.create_time >= #{param.createTimeStart} - - - AND a.create_time <= #{param.createTimeEnd} - - - AND a.updater = #{param.updater} - - - AND a.deleted = #{param.deleted} - - - AND a.deleted = 0 - - - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - - - - - - - - - - diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java index 1014418..4ae1b2a 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopGoodsProfitParam.java @@ -1,13 +1,7 @@ package com.gxwebsoft.shop.param; -import java.math.BigDecimal; -import com.gxwebsoft.common.core.annotation.QueryField; -import com.gxwebsoft.common.core.annotation.QueryType; -import com.gxwebsoft.common.core.web.BaseParam; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; /** * 商品分润设定查询参数 @@ -16,46 +10,12 @@ import lombok.EqualsAndHashCode; * @since 2026-05-20 14:33:00 */ @Data -@EqualsAndHashCode(callSuper = false) -@JsonInclude(JsonInclude.Include.NON_NULL) -@Schema(name = "ShopGoodsProfitParam对象", description = "商品分润设定查询参数") -public class ShopGoodsProfitParam extends BaseParam { - private static final long serialVersionUID = 1L; - - @Schema(description = "主键ID") - @QueryField(type = QueryType.EQ) - private Integer id; +public class ShopGoodsProfitParam { @Schema(description = "类型 1-股东分红 2-其他") - @QueryField(type = QueryType.EQ) private Integer type; @Schema(description = "商品ID") - @QueryField(type = QueryType.EQ) private Integer goodsId; - @Schema(description = "用户ID") - @QueryField(type = QueryType.EQ) - private Integer userId; - - @Schema(description = "分佣比例 百分比") - @QueryField(type = QueryType.EQ) - private BigDecimal profit; - - @Schema(description = "开启状态 0-未开启 1-开启") - @QueryField(type = QueryType.EQ) - private Integer status; - - @Schema(description = "创建人") - @QueryField(type = QueryType.EQ) - private Integer creator; - - @Schema(description = "更新人") - @QueryField(type = QueryType.EQ) - private Integer updater; - - @Schema(description = "删除 0-未删 1-已删") - @QueryField(type = QueryType.EQ) - private Integer deleted; - } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index 1a13058..5e94302 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -67,6 +67,14 @@ public interface ShopDealerUserService extends IService { */ Boolean settlementBatch(ShopDealerSettlementDto dto); + + /** + * 订单分红变更冻结账户 + * @param dto + * @return + */ + Boolean orderProfit(ShopDealerSettlementDto dto); + /** * 开启/关闭分销商用户核销权限 * @param id diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java b/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java index aaa31bf..17b3834 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopGoodsProfitService.java @@ -1,9 +1,9 @@ package com.gxwebsoft.shop.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.dto.ShopGoodsProfitUpdateDto; import com.gxwebsoft.shop.entity.ShopGoodsProfit; -import com.gxwebsoft.shop.param.ShopGoodsProfitParam; +import com.gxwebsoft.shop.vo.ShopGoodsProfitVO; import java.util.List; @@ -16,27 +16,26 @@ import java.util.List; public interface ShopGoodsProfitService extends IService { /** - * 分页关联查询 - * - * @param param 查询参数 - * @return PageResult + * 通过商品、类型查询分润信息 + * @param goodsId + * @param type + * @return */ - PageResult pageRel(ShopGoodsProfitParam param); + List getByGoodsId(Integer goodsId, Integer type); /** - * 关联查询全部 - * - * @param param 查询参数 - * @return List + * 查询启用状态的商品分润信息 + * @param goodsIdList 商品ID集合 + * @param type 分润类型 + * @return */ - List listRel(ShopGoodsProfitParam param); + List getGoodsProfit(List goodsIdList, Integer type); /** - * 根据id查询 - * - * @param id 主键ID - * @return ShopGoodsProfit + * 根据商品ID修改商品分润设定 + * @param updateDto + * @return */ - ShopGoodsProfit getByIdRel(Integer id); + Boolean updateByGoodsId(ShopGoodsProfitUpdateDto updateDto); } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopOrderGoodsService.java b/src/main/java/com/gxwebsoft/shop/service/ShopOrderGoodsService.java index d9a7e9a..2ee2c9d 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopOrderGoodsService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopOrderGoodsService.java @@ -47,4 +47,5 @@ public interface ShopOrderGoodsService extends IService { * @return List */ List getListByOrderIdIgnoreTenant(Integer orderId); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java index ba147b8..58aac8b 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopActiveImageServiceImpl.java @@ -14,6 +14,7 @@ import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -38,8 +39,12 @@ public class ShopActiveImageServiceImpl extends ServiceImpl goodsIdList = list.stream().filter(shopActiveImage -> shopActiveImage.getGoodsId() != null).map(ShopActiveImage::getGoodsId) .distinct().collect(Collectors.toList()); - List shopGoodsList = shopGoodsMapper.selectBatchIds(goodsIdList); + List shopGoodsList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(goodsIdList)){ + shopGoodsList = shopGoodsMapper.selectBatchIds(goodsIdList); + } + List finalShopGoodsList = shopGoodsList; list.forEach(shopActiveImage -> { if(!StringUtils.isEmpty(shopActiveImage.getImgUrl())){ shopActiveImage.setImgUrlList(Arrays.asList(shopActiveImage.getImgUrl().split(","))); @@ -47,7 +52,7 @@ public class ShopActiveImageServiceImpl extends ServiceImpl shopActiveImage.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null); + ShopGoods shopGoods = finalShopGoodsList.stream().filter(goods -> shopActiveImage.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null); if(shopGoods != null){ shopActiveImage.setGoodsName(shopGoods.getName()); } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index ecbaf42..51f9e09 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -210,58 +210,67 @@ public class ShopDealerUserServiceImpl extends ServiceImpl userIdList = dealerCapitalList.stream().map(ShopDealerCapital::getUserId).distinct().collect(Collectors.toList()); List shopDealerUserList = lambdaQuery().in(ShopDealerUser::getUserId, userIdList).list(); + List updateCapitalList = new ArrayList<>(); + List newCapitalList = new ArrayList<>(); Map> userCapitalMap = dealerCapitalList.stream().collect(Collectors.groupingBy(ShopDealerCapital::getUserId)); userCapitalMap.forEach((k, value) ->{ - //5.4 查询是否存在待解冻订单数据 - ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType()) && capital.getPaymentFlag() != null - && capital.getPaymentFlag() == 0).findFirst().orElse(null); - if(userCapital != null){ + List capitalList = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType()) && capital.getPaymentFlag() != null + && capital.getPaymentFlag() == 0).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(capitalList)){ + ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null); - //5.5 查询此订单是否已结算 - ShopDealerCapital alreadyCapital = value.stream().filter(capital -> ShopDealerTypeEnum.DEFROST.getCode().equals(capital.getType())).findFirst().orElse(null); - if(alreadyCapital == null){ - ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null); + //5.6 判断分销账户分销金额是否大于解冻金额 + BigDecimal freezeMoney = capitalList.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + if(dealerUser != null && dealerUser.getFreezeMoney().compareTo(freezeMoney) >= 0){ + //5.7 账户解冻金额、可提现增加金额 + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney)); + dealerUser.setMoney(dealerUser.getMoney().add(freezeMoney)); + baseMapper.updateById(dealerUser); - //5.6 判断分销账户分销金额是否大于解冻金额 - BigDecimal freezeMoney = userCapital.getFreezeMoney(); - if(dealerUser != null && dealerUser.getFreezeMoney().compareTo(freezeMoney) >= 0){ - //5.7 账户解冻金额、可提现增加金额 - dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney)); - dealerUser.setMoney(dealerUser.getMoney().add(freezeMoney)); - baseMapper.updateById(dealerUser); - - //5.8 生成流水 - ShopDealerCapital dealerCapital = new ShopDealerCapital(); - String no = orderNoUtils.generate("C"); - dealerCapital.setNo(no); - dealerCapital.setUserId(k); - dealerCapital.setType(typeEnum.getCode()); - dealerCapital.setOrderNo(entity.getOrderNo()); - dealerCapital.setFlowType(updateEnum.getType()); - dealerCapital.setFreezeMoney(freezeMoney.negate()); - dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); - dealerCapital.setMoney(freezeMoney); - dealerCapital.setMoneyAfter(dealerUser.getMoney()); - dealerCapital.setComments(updateEnum.getDescription()); - dealerCapital.setToUserId(entity.getOrderUserId()); - dealerCapital.setPaymentFlag(1); - dealerCapital.setTenantId(TENANT_ID); - dealerCapital.setCreateTime(now); - User loginUser = LoginUserUtil.getLoginUser(); - if (loginUser != null) { - dealerCapital.setCreator(loginUser.getUserId()); - } - shopDealerCapitalMapper.insert(dealerCapital); - userCapital.setPaymentFlag(1); + //5.8 生成流水 + ShopDealerCapital dealerCapital = new ShopDealerCapital(); + String no = orderNoUtils.generate("C"); + dealerCapital.setNo(no); + dealerCapital.setUserId(k); + dealerCapital.setType(typeEnum.getCode()); + dealerCapital.setOrderNo(entity.getOrderNo()); + dealerCapital.setFlowType(updateEnum.getType()); + dealerCapital.setFreezeMoney(freezeMoney.negate()); + dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + dealerCapital.setMoney(freezeMoney); + dealerCapital.setMoneyAfter(dealerUser.getMoney()); + dealerCapital.setComments(updateEnum.getDescription()); + dealerCapital.setToUserId(entity.getOrderUserId()); + dealerCapital.setPaymentFlag(1); + dealerCapital.setTenantId(TENANT_ID); + dealerCapital.setCreateTime(now); + User loginUser = LoginUserUtil.getLoginUser(); + if (loginUser != null) { + dealerCapital.setCreator(loginUser.getUserId()); } - } + newCapitalList.add(dealerCapital); - //5.6 更新冻结流水为已结算状态 - userCapital.setUpdateTime(now); - shopDealerCapitalMapper.updateById(userCapital); + capitalList.forEach(capital -> { + capital.setPaymentFlag(1); + capital.setUpdateTime(now); + }); + updateCapitalList.addAll(capitalList); + } } }); + + //6.批量修改原待结算解冻订单为结算状态 + if(CollectionUtils.isNotEmpty(updateCapitalList)){ + shopDealerCapitalService.updateBatchById(updateCapitalList); + } + + //7.批量新增结算记录 + if(CollectionUtils.isNotEmpty(newCapitalList)){ + shopDealerCapitalService.saveBatch(newCapitalList); + } + + }else { log.error("未查询到待解冻订单信息:" + entity.getOrderNo()); } @@ -423,6 +432,52 @@ public class ShopDealerUserServiceImpl extends ServiceImpl itemList = entity.getItemList(); + + List userIdList = itemList.stream().map(ShopDealerSettlementItemDto::getUserId).distinct().collect(Collectors.toList()); + + List shopDealerUserList = baseMapper.selectList(new LambdaQueryWrapper().select(ShopDealerUser::getId, ShopDealerUser::getUserId, + ShopDealerUser::getMoney, ShopDealerUser::getTotalMoney, ShopDealerUser::getFreezeMoney).in(ShopDealerUser::getUserId, userIdList)); + + List updateDealerUserList = new ArrayList<>(); + List capitalList = new ArrayList<>(); + itemList.forEach(item ->{ + ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> item.getUserId().equals(shopDealerUser.getUserId())).findFirst().orElse(null); + if(dealerUser != null){ + dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().add(item.getMoney())); + dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(item.getMoney())); + dealerUser.setUpdateTime(now); + updateDealerUserList.add(dealerUser); + + ShopDealerCapital capital = BeanUtil.toBean(entity, ShopDealerCapital.class); + capital.setNo(item.getNo()); + capital.setType(ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode()); + capital.setFlowType(ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME.getType()); + capital.setComments(ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME.getDescription()); + capital.setUserId(item.getUserId()); + capital.setFreezeMoney(item.getMoney()); + capital.setFreezeMoneyAfter(dealerUser.getFreezeMoney()); + capital.setMoneyAfter(dealerUser.getMoney()); + capital.setCreateTime(now); + capitalList.add(capital); + } + }); + + if(CollectionUtils.isNotEmpty(updateDealerUserList)){ + updateBatchById(updateDealerUserList); + } + + if(CollectionUtils.isNotEmpty(capitalList)){ + shopDealerCapitalService.saveBatch(capitalList); + } + } + return Boolean.TRUE; + } + @Override public Boolean verifyEnable(Integer id) { ShopDealerUser dealerUser = baseMapper.selectById(id); diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java index f860f18..4af3ae4 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopGoodsProfitServiceImpl.java @@ -1,16 +1,31 @@ package com.gxwebsoft.shop.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.core.exception.BusinessException; +import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants; +import com.gxwebsoft.common.core.utils.LoginUserUtil; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.shop.dto.ShopGoodsProfitUpdateDto; +import com.gxwebsoft.shop.dto.ShopGoodsProfitUpdateItemDto; +import com.gxwebsoft.shop.entity.ShopDealerUser; +import com.gxwebsoft.shop.entity.ShopGoods; +import com.gxwebsoft.shop.entity.ShopGoodsProfit; +import com.gxwebsoft.shop.mapper.ShopDealerUserMapper; +import com.gxwebsoft.shop.mapper.ShopGoodsMapper; import com.gxwebsoft.shop.mapper.ShopGoodsProfitMapper; import com.gxwebsoft.shop.service.ShopGoodsProfitService; -import com.gxwebsoft.shop.entity.ShopGoodsProfit; -import com.gxwebsoft.shop.param.ShopGoodsProfitParam; -import com.gxwebsoft.common.core.web.PageParam; -import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.shop.vo.ShopGoodsProfitVO; import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 商品分润设定Service实现 @@ -22,28 +37,101 @@ import java.util.List; @AllArgsConstructor public class ShopGoodsProfitServiceImpl extends ServiceImpl implements ShopGoodsProfitService { + private ShopDealerUserMapper shopDealerUserMapper; + + private ShopGoodsMapper shopGoodsMapper; + @Override - public PageResult pageRel(ShopGoodsProfitParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); + public List getByGoodsId(Integer goodsId, Integer type) { + List list = lambdaQuery().select(ShopGoodsProfit::getId, ShopGoodsProfit::getGoodsId, ShopGoodsProfit::getUserId, ShopGoodsProfit::getProfit, + ShopGoodsProfit::getStatus).eq(ShopGoodsProfit::getGoodsId, goodsId).eq(ShopGoodsProfit::getType, type).list(); + + if(CollectionUtils.isNotEmpty(list)){ + List userIdList = list.stream().map(ShopGoodsProfit::getUserId).distinct().collect(Collectors.toList()); + + List shopDealerUserList = shopDealerUserMapper.selectList(new LambdaQueryWrapper().in(ShopDealerUser::getUserId, userIdList)); + List shopGoodsProfitVOS = BeanUtil.copyToList(list, ShopGoodsProfitVO.class); + for(ShopGoodsProfitVO shopGoodsProfitVO : shopGoodsProfitVOS){ + ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> shopGoodsProfitVO.getUserId().equals(shopDealerUser.getUserId())).findFirst().orElse(null); + if(dealerUser != null){ + shopGoodsProfitVO.setUserName(dealerUser.getRealName()); + } + } + return shopGoodsProfitVOS; + } + return new ArrayList<>(); } @Override - public List listRel(ShopGoodsProfitParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("sort_number asc, create_time desc"); - return page.sortRecords(list); + public List getGoodsProfit(List goodsIdList, Integer type) { + List profitList = lambdaQuery().select(ShopGoodsProfit::getId, ShopGoodsProfit::getGoodsId, ShopGoodsProfit::getUserId, ShopGoodsProfit::getProfit, + ShopGoodsProfit::getStatus).in(ShopGoodsProfit::getGoodsId, goodsIdList).eq(ShopGoodsProfit::getType, type).eq(ShopGoodsProfit::getStatus, 1).list(); + if(CollectionUtils.isNotEmpty(profitList)){ + return BeanUtil.copyToList(profitList, ShopGoodsProfitVO.class); + } + return new ArrayList<>(); } @Override - public ShopGoodsProfit getByIdRel(Integer id) { - ShopGoodsProfitParam param = new ShopGoodsProfitParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); + public Boolean updateByGoodsId(ShopGoodsProfitUpdateDto entity) { + User loginUser = LoginUserUtil.getLoginUser(); + if(loginUser == null){ + throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg()); + } + + List itemList = entity.getItemList(); + LocalDateTime now = LocalDateTime.now(); + if(CollectionUtils.isNotEmpty(itemList)){ + //1.先检查传入的分润总和是否超过100 + BigDecimal profitSum = itemList.stream().map(ShopGoodsProfitUpdateItemDto::getProfit).reduce(BigDecimal.ZERO, BigDecimal::add); + if(profitSum.compareTo(BigDecimal.valueOf(100)) > 0){ + throw new BusinessException("股东分红比例总和不能超过100%"); + } + + //2.查询商品原有分润数据并做超100%管控 + ShopGoods shopGoods = shopGoodsMapper.selectById(entity.getGoodsId()); + if(shopGoods == null){ + throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg()); + } + BigDecimal goodsOriginalProfit = shopGoods.getVerifyRate().add(shopGoods.getVerifyParentRate()); + if(shopGoods.getCommissionType() == 20){ + goodsOriginalProfit = goodsOriginalProfit.add(shopGoods.getFirstMoney()).add(shopGoods.getSecondMoney()).add(shopGoods.getFirstDividend()) + .add(shopGoods.getSecondDividend()).add(shopGoods.getDeliveryMoney()); + } + if(profitSum.add(goodsOriginalProfit).compareTo(BigDecimal.valueOf(100)) > 0){ + throw new BusinessException("股东分红比例与商品原有分销比例加总不能超过100！"); + } + + //3.查询有分润数据并删除 + removeByGoodsId(entity.getGoodsId(), entity.getType(), loginUser.getUserId(), now); + + //4.批量新增分润数据 + List shopGoodsProfits = BeanUtil.copyToList(itemList, ShopGoodsProfit.class); + shopGoodsProfits.forEach(shopGoodsProfit -> { + shopGoodsProfit.setType(entity.getType()); + shopGoodsProfit.setGoodsId(entity.getGoodsId()); + shopGoodsProfit.setTenantId(loginUser.getTenantId()); + shopGoodsProfit.setCreator(loginUser.getUserId()); + shopGoodsProfit.setCreateTime(now); + }); + saveBatch(shopGoodsProfits); + }else { + removeByGoodsId(entity.getGoodsId(), entity.getType(), loginUser.getUserId(), now); + } + return Boolean.TRUE; } + private void removeByGoodsId(Integer goodsId, Integer type, Integer userId, LocalDateTime date){ + List profitList = lambdaQuery().select(ShopGoodsProfit::getId).eq(ShopGoodsProfit::getGoodsId, goodsId).eq(ShopGoodsProfit::getType, type).list(); + if(CollectionUtils.isNotEmpty(profitList)){ + profitList.forEach(profit -> { + profit.setDeleted(1); + profit.setUpdater(userId); + profit.setUpdateTime(date); + }); + updateBatchById(profitList); + } + } + + } diff --git a/src/main/java/com/gxwebsoft/shop/vo/ShopGoodsProfitVO.java b/src/main/java/com/gxwebsoft/shop/vo/ShopGoodsProfitVO.java new file mode 100644 index 0000000..8d44d9a --- /dev/null +++ b/src/main/java/com/gxwebsoft/shop/vo/ShopGoodsProfitVO.java @@ -0,0 +1,35 @@ +package com.gxwebsoft.shop.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 商品分润设定 + * + * @author xm + * @since 2026-05-20 14:33:00 + */ +@Data +public class ShopGoodsProfitVO { + + @Schema(description = "主键ID") + private Integer id; + + @Schema(description = "商品ID") + private Integer goodsId; + + @Schema(description = "用户ID") + private Integer userId; + + @Schema(description = "用户名称") + private String userName; + + @Schema(description = "分佣比例 百分比") + private BigDecimal profit; + + @Schema(description = "开启状态 0-未开启 1-开启") + private Integer status; + +}