From 100d5d3317c34fd295bcd91eb67d913965aece44 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Thu, 12 Aug 2021 00:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=94=80=E4=BD=A3?= =?UTF-8?q?=E9=87=91=E5=86=BB=E7=BB=93=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionCashBuyerController.java | 4 +- .../event/impl/DistributionOrderExecute.java | 1 + .../entity/dos/DistributionOrder.java | 32 +++++++-------- .../mapper/DistributionMapper.java | 15 +++---- .../mapper/DistributionOrderMapper.java | 4 +- .../DistributionCashServiceImpl.java | 9 ----- .../DistributionOrderServiceImpl.java | 39 ++++++++++++++----- 7 files changed, 60 insertions(+), 44 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java index 13ad486e..2e62f6f4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java @@ -52,8 +52,8 @@ public class DistributionCashBuyerController { @ApiImplicitParam(name = "price", value = "申请金额", required = true, paramType = "query", dataType = "double") }) @PostMapping - public ResultMessage cash(@Max(value = 1000, message = "充值金额单次最多允许提现1000元") - @Min(value = 1, message = "充值金额单次最少提现金额为1元") + public ResultMessage cash(@Max(value = 1000, message = "提现金额单次最多允许提现1000元") + @Min(value = 1, message = "提现金额单次最少提现金额为1元") @NotNull @ApiIgnore Double price) { if (distributionCashService.cash(price)) { return ResultUtil.success(); diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java index e9fcdb79..546767f7 100644 --- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java @@ -67,6 +67,7 @@ public class DistributionOrderExecute implements OrderStatusChangeEvent, EveryDa .eq(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_BILL.name()) .le(DistributionOrder::getSettleCycle, new DateTime()) .set(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_CASH.name())); + } @Override diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java index acc692df..5500a256 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java @@ -45,7 +45,7 @@ public class DistributionOrder { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -91,21 +91,21 @@ public class DistributionOrder { @ApiModelProperty(value = "商品数量") private Integer num; - public DistributionOrder(StoreFlow storeFlow){ - distributionOrderStatus=DistributionOrderStatusEnum.WAIT_BILL.name(); - memberId=storeFlow.getMemberId(); - memberName=storeFlow.getMemberName(); - rebate=storeFlow.getDistributionRebate(); - storeId=storeFlow.getStoreId(); - storeName=storeFlow.getStoreName(); - orderSn=storeFlow.getOrderSn(); - orderItemSn=storeFlow.getOrderItemSn(); - goodsId=storeFlow.getGoodsId(); - goodsName=storeFlow.getGoodsName(); - skuId=storeFlow.getSkuId(); - specs=storeFlow.getSpecs(); - image=storeFlow.getImage(); - num= storeFlow.getNum(); + public DistributionOrder(StoreFlow storeFlow) { + distributionOrderStatus = DistributionOrderStatusEnum.WAIT_BILL.name(); + memberId = storeFlow.getMemberId(); + memberName = storeFlow.getMemberName(); + rebate = storeFlow.getDistributionRebate(); + storeId = storeFlow.getStoreId(); + storeName = storeFlow.getStoreName(); + orderSn = storeFlow.getOrderSn(); + orderItemSn = storeFlow.getOrderItemSn(); + goodsId = storeFlow.getGoodsId(); + goodsName = storeFlow.getGoodsName(); + skuId = storeFlow.getSkuId(); + specs = storeFlow.getSpecs(); + image = storeFlow.getImage(); + num = storeFlow.getNum(); } } \ No newline at end of file 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 ccc87296..a102d8ce 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 @@ -16,18 +16,19 @@ public interface DistributionMapper extends BaseMapper { /** * 修改分销员可提现金额 * - * @param canRebate 提现金额 + * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set can_rebate = can_rebate+#{canRebate} WHERE id = #{distributionId}") - void subCanRebate(Double canRebate, String 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); /** - * 添加可提现金额 + * 添加分销金额 * - * @param canRebate 提现金额 + * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set can_rebate = (can_rebate+#{canRebate}) , rebate_total=(rebate_total+#{canRebate}) , distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") - void addCanRebate(Double canRebate, String 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 3a5b273e..3054f91b 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,7 +20,9 @@ public interface DistributionOrderMapper extends BaseMapper { * @param settleCycle 时间 */ @Update("UPDATE li_distribution AS d " + - "SET d.can_rebate =(d.can_rebate +(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 ) " + + "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} ))") void rebate(String distributionOrderStatus, DateTime settleCycle); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 2f863b5a..8e3cefab 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -73,7 +73,6 @@ public class DistributionCashServiceImpl extends ServiceImpl() + .eq(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_BILL.name()) + .le(DistributionOrder::getSettleCycle, new DateTime()) + .set(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.WAIT_CASH.name())); + } + } + + } } @@ -145,7 +166,7 @@ public class DistributionOrderServiceImpl extends ServiceImpl