From f9308fa5bf03114a8ec2ba60cd1e84c23f273d3f Mon Sep 17 00:00:00 2001 From: lifenlong Date: Mon, 23 Aug 2021 17:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BD=A3=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionMapper.java | 7 +++++-- .../distribution/mapper/DistributionOrderMapper.java | 5 ++--- .../serviceimpl/DistributionOrderServiceImpl.java | 10 +++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java index a102d8ce..2068e1ed 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java @@ -19,7 +19,8 @@ public interface DistributionMapper extends BaseMapper { * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) , rebate_total=(rebate_total+#{commissionFrozen}) WHERE id = #{distributionId}") + @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + + ", rebate_total=(rebate_total+#{commissionFrozen}) WHERE id = #{distributionId}") void subCanRebate(Double commissionFrozen, String distributionId); /** @@ -28,7 +29,9 @@ public interface DistributionMapper extends BaseMapper { * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) , rebate_total=(rebate_total+#{commissionFrozen}) , distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") + @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + + ", rebate_total=(rebate_total+#{commissionFrozen}) " + + ", distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") void addCanRebate(Double commissionFrozen, String distributionId); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java index 3054f91b..c3a64d70 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java @@ -20,9 +20,8 @@ public interface DistributionOrderMapper extends BaseMapper { * @param settleCycle 时间 */ @Update("UPDATE li_distribution AS d " + - "SET d.can_rebate =(d.can_rebate +(SELECT SUM( dorder.rebate ) " + - "SET d.commission_frozen =(d.commission_frozen -(SELECT SUM( dorder.rebate ) " + - "FROM li_distribution_order AS dorder WHERE dorder.distribution_id = d.id AND dorder.distribution_order_status=#{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} ))") + "SET d.can_rebate =(d.can_rebate +(SELECT SUM( dorder.rebate ) FROM li_distribution_order AS dorder WHERE dorder.distribution_order_status = #{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} AND dorder.distribution_id = d.id ))" + + ",d.commission_frozen =(d.commission_frozen -(SELECT SUM( dorder.rebate ) FROM li_distribution_order AS dorder WHERE dorder.distribution_order_status = #{distributionOrderStatus} AND dorder.settle_cycle< #{settleCycle} AND dorder.distribution_id = d.id ) )") void rebate(String distributionOrderStatus, DateTime settleCycle); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index c31557e7..4858add2 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +39,7 @@ import java.util.List; * @author pikachu * @since 2020-03-14 23:04:56 */ +@Slf4j @Service @Transactional(rollbackFor = Exception.class) public class DistributionOrderServiceImpl extends ServiceImpl implements DistributionOrderService { @@ -107,7 +109,7 @@ public class DistributionOrderServiceImpl extends ServiceImpl() .eq(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_BILL.name()) - .le(DistributionOrder::getSettleCycle, new DateTime()) + .le(DistributionOrder::getSettleCycle, dateTime) .set(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_CASH.name())); } }