切换店铺 无权限问题
角色模板 关闭却新增问题 会员加入 时间
This commit is contained in:
@@ -79,14 +79,13 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
|
||||
|
||||
@Override
|
||||
public Page<ChatCouponVO> pageChatCoupon(Long shopId, Integer page, Integer size, Integer status) {
|
||||
Page<ChatCouponVO> pages = pageAs(Page.of(page, size),
|
||||
return pageAs(Page.of(page, size),
|
||||
QueryWrapper.create()
|
||||
.eq(ChatCoupon::getShopId, shopId)
|
||||
.eq(ChatCoupon::getStatus, status)
|
||||
.orderBy(ChatCoupon::getStatus).asc()
|
||||
.orderBy(ChatCoupon::getId).desc(),
|
||||
ChatCouponVO.class);
|
||||
return pages;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -518,6 +519,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
||||
shopUser.setMemberCircleReward(memberOrder.getReward());
|
||||
shopUser.setIsVip(1);
|
||||
shopUser.setOpenType("PAY");
|
||||
shopUser.setJoinTime(LocalDateTime.now());
|
||||
if (memberOrder.getReward() != null) {
|
||||
//购买开通
|
||||
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
|
||||
|
||||
Reference in New Issue
Block a user