记录和shopUser 问题
This commit is contained in:
@@ -15,8 +15,10 @@ import com.czg.account.service.UserInfoService;
|
||||
import com.czg.enums.ShopUserFlowBizEnum;
|
||||
import com.czg.exception.CzgException;
|
||||
import com.czg.market.entity.MemberLevelConfig;
|
||||
import com.czg.market.entity.MkPointsUser;
|
||||
import com.czg.market.entity.SmsPushEventUser;
|
||||
import com.czg.market.service.MemberLevelConfigService;
|
||||
import com.czg.market.service.MkPointsUserService;
|
||||
import com.czg.market.service.OrderInfoService;
|
||||
import com.czg.market.service.TbMemberConfigService;
|
||||
import com.czg.market.vo.InviteUserVO;
|
||||
@@ -37,6 +39,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
|
||||
import org.apache.dubbo.config.annotation.DubboService;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.awt.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@@ -10,7 +10,9 @@ import com.czg.account.entity.*;
|
||||
import com.czg.account.service.*;
|
||||
import com.czg.config.RedisCst;
|
||||
import com.czg.exception.CzgException;
|
||||
import com.czg.market.entity.MkPointsUser;
|
||||
import com.czg.market.entity.MkShopCouponRecord;
|
||||
import com.czg.market.service.MkPointsUserService;
|
||||
import com.czg.market.service.MkShopCouponRecordService;
|
||||
import com.czg.resp.CzgResult;
|
||||
import com.czg.service.RedisService;
|
||||
@@ -51,6 +53,8 @@ public class UShopUserServiceImpl implements UShopUserService {
|
||||
private ShopConfigMapper shopConfigMapper;
|
||||
@DubboReference
|
||||
private MkShopCouponRecordService couponRecordService;
|
||||
@DubboReference
|
||||
private MkPointsUserService pointsUserService;
|
||||
|
||||
@Override
|
||||
public ShopUser getShopUserInfo(Long shopId, long userId) {
|
||||
@@ -140,6 +144,8 @@ public class UShopUserServiceImpl implements UShopUserService {
|
||||
shopUserDetailDTO.setFreeDineConfig(freeDineConfigService.getConfig(shopInfoService.getMainIdByShopId(shopId)));
|
||||
shopUserDetailDTO.setPayPwd(userInfo.getPayPwd());
|
||||
shopUserDetailDTO.setUsePayPwd(userInfo.getUsePayPwd());
|
||||
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, shopUser.getId(), shopUser.getUserId());
|
||||
shopUserDetailDTO.setPointsUser(pointsUser);
|
||||
return shopUserDetailDTO;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user