订单支付修改
This commit is contained in:
@@ -86,7 +86,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
|
|||||||
AssertUtil.isTrue( shopUserId == null || orderId == null || amount == null, "参数不能为空");
|
AssertUtil.isTrue( shopUserId == null || orderId == null || amount == null, "参数不能为空");
|
||||||
ShopUser shopUser = shopUserService.getById(shopUserId);
|
ShopUser shopUser = shopUserService.getById(shopUserId);
|
||||||
|
|
||||||
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
|
MkShopConsumeDiscountRecord discountRecord = getOne(new QueryWrapper()
|
||||||
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId)
|
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUserId)
|
||||||
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId));
|
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId));
|
||||||
AssertUtil.isNull(discountRecord, "减免记录不存在");
|
AssertUtil.isNull(discountRecord, "减免记录不存在");
|
||||||
@@ -95,6 +95,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
|
|||||||
|
|
||||||
boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, discountRecord.getId())
|
boolean flag = updateChain().eq(MkShopConsumeDiscountRecord::getId, discountRecord.getId())
|
||||||
.eq(MkShopConsumeDiscountRecord::getIsUse, 0)
|
.eq(MkShopConsumeDiscountRecord::getIsUse, 0)
|
||||||
|
.set(MkShopConsumeDiscountRecord::getOrderId, orderId)
|
||||||
.set(MkShopConsumeDiscountRecord::getIsUse, 1).update();
|
.set(MkShopConsumeDiscountRecord::getIsUse, 1).update();
|
||||||
AssertUtil.isTrue(!flag, "修改失败");
|
AssertUtil.isTrue(!flag, "修改失败");
|
||||||
}
|
}
|
||||||
@@ -106,7 +107,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
|
|||||||
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
|
.eq(MkShopConsumeDiscountRecord::getOrderId, orderId)
|
||||||
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
|
.eq(MkShopConsumeDiscountRecord::getShopUserId, shopUser.getId()));
|
||||||
if (discountRecord != null) {
|
if (discountRecord != null) {
|
||||||
if (discountRecord.getOrderId() == null) {
|
if (discountRecord.getOrderId() == null && orderId != null) {
|
||||||
discountRecord.setOrderId(orderId);
|
discountRecord.setOrderId(orderId);
|
||||||
updateById(discountRecord);
|
updateById(discountRecord);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user