From be629a8b5fd0b4ea2950cf1e204c56119bab37bc Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 14:13:21 +0800
Subject: [PATCH] feat(mall): 会员标签增加名称查询

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |  368 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 323 insertions(+), 45 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index eecd7a2..361b586 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1,10 +1,7 @@
 package cc.mrbird.febs.mall.service.impl;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.properties.XcxProperties;
 import cc.mrbird.febs.common.utils.*;
@@ -12,10 +9,13 @@
 import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
 import cc.mrbird.febs.mall.conversion.MallStoreConversion;
 import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.signActivity.ApiNewGiftSettingDto;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
 import cc.mrbird.febs.mall.service.*;
 import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiLabelInfoVo;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiMemberLabelVo;
 import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
 import cc.mrbird.febs.pay.service.IXcxPayService;
 import cc.mrbird.febs.pay.util.MD5;
@@ -49,6 +49,7 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -89,6 +90,10 @@
     private final MallStoreItemMapper mallStoreItemMapper;
     private final MallStoreMemberMapper mallStoreMemberMapper;
     private final MallDoctorMapper mallDoctorMapper;
+    private final HappyMemberLevelMapper happyMemberLevelMapper;
+    private final IApiMallMemberWalletService mallMemberWalletService;
+    private final HappyMemberLabelRecordMapper happyMemberLabelRecordMapper;
+    private final HappyMemberLabelMapper happyMemberLabelMapper;
 
 
     @Value("${spring.profiles.active}")
@@ -264,12 +269,29 @@
         Long id = LoginUserUtil.getLoginUser().getId();
         MallMember mallMember = this.baseMapper.selectById(id);
 
+
+
         MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+
+        HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
+                new LambdaQueryWrapper<HappyMemberLevel>()
+                        .select(HappyMemberLevel::getName,  HappyMemberLevel::getIconPng)
+                        .eq(HappyMemberLevel::getCode, mallMember.getDirector())
+        );
+        if(happyMemberLevel != null){
+            mallMemberVo.setLevelName(happyMemberLevel.getName());
+            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
+        }
         if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
             MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
             if (referMember != null) {
                 mallMemberVo.setReferrerName(referMember.getName());
             }
+        }
+        if(mallMember.getStoreMaster() == 0){
+            mallMemberVo.setIsTeamLeader(2);
+        }else{
+            mallMemberVo.setIsTeamLeader(1);
         }
 
         if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -302,9 +324,32 @@
 
         mallMemberVo.setVipInfo(mallVipConfig);
         mallMemberVo.setBalance(wallet.getBalance());
-//        mallMemberVo.setScore(wallet.getScore());
+        mallMemberVo.setScore(wallet.getScore());
         mallMemberVo.setPrizeScore(wallet.getPrizeScore());
 //        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
+
+        List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+                new LambdaQueryWrapper<HappyMemberLabelRecord>()
+                        .eq(HappyMemberLabelRecord::getMemberId, id)
+        );
+        if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
+            Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
+            List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+                    new LambdaQueryWrapper<HappyMemberLabel>()
+                            .select(HappyMemberLabel::getIconPng,  HappyMemberLabel::getName)
+                            .in(HappyMemberLabel::getId, collect)
+            );
+            if(CollUtil.isNotEmpty(happyMemberLabels)){
+                ArrayList<ApiLabelInfoVo> apiMemberLabelVos = new ArrayList<>();
+                for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
+                    ApiLabelInfoVo apiLabelInfoVo = new ApiLabelInfoVo();
+                    apiLabelInfoVo.setIconPng(happyMemberLabel.getIconPng());
+                    apiLabelInfoVo.setName(happyMemberLabel.getName());
+                    apiMemberLabelVos.add(apiLabelInfoVo);
+                }
+                mallMemberVo.setLabelList(apiMemberLabelVos);
+            }
+        }
         return new FebsResponse().success().data(mallMemberVo);
     }
 
@@ -343,6 +388,11 @@
         mallMember.setTradePassword(SecureUtil.md5(forgetPwdDto.getPassword()));
         this.baseMapper.updateById(mallMember);
         return new FebsResponse().success().message("设置成功");
+    }
+
+    public static void main(String[] args) {
+        String pwd = SecureUtil.md5("123456");
+        System.out.println(pwd);
     }
 
     @Override
@@ -633,6 +683,7 @@
                     mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
                     mallMember.setOpenId(openId);
                     mallMember.setSessionKey(sessionKey);
+                    mallMember.setTradePassword(SecureUtil.md5("123456"));
 
                     if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
                         MallMember member = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
@@ -677,7 +728,37 @@
                     wallet.setBalance(BigDecimal.ZERO);
                     wallet.setMemberId(mallMember.getId());
                     mallMemberWalletMapper.insert(wallet);
+
+                    //分销员的邀请码赠送优惠卷
+                    if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
+                        String couponUUID = IdUtil.simpleUUID();
+                        //通过邀请人信息,获取能领取的优惠卷信息
+                        MallMember refMember = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
+                        if(ObjectUtil.isNotEmpty(refMember)){
+                            SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(refMember.getId());
+                            if(ObjectUtil.isNotEmpty(salemanCoupon)){
+                                Long couponId = salemanCoupon.getCouponId();
+                                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(mallMember.getId(), couponId);
+                                if(CollUtil.isEmpty(mallMemberCoupons)){
+                                    //商品优惠卷如果绑定了,那么当前登陆者获取一张卷
+                                    MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+                                    MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+                                    mallMemberCoupon.setCouponId(couponId);
+                                    mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+                                    mallMemberCoupon.setMemberId(mallMember.getId());
+                                    mallMemberCoupon.setCouponUuid(couponUUID);
+                                    mallMemberCoupon.setInviteId(refMember.getInviteId());
+                                    mallMemberCoupon.setState(1);
+                                    mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+                                    mallMemberCouponMapper.insert(mallMemberCoupon);
+                                }
+                            }
+                        }
+                    }
                 } else {
+                    if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
+                        throw new FebsException("账号已停用");
+                    }
                     mallMember.setSessionKey(sessionKey);
                     this.baseMapper.updateById(mallMember);
                 }
@@ -741,6 +822,50 @@
 
         mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
         this.baseMapper.updateById(mallMember);
+
+//        //完善信息赠送新人礼
+//        if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
+//            DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                    CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
+//                    CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
+//            );
+//            mallMember.setNewGift(1);
+//            this.baseMapper.updateById(mallMember);
+//
+//            ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
+//            if (apiNewGiftSettingDto.getState() == 1) {
+//                String prizeScore = apiNewGiftSettingDto.getPrizeScore();
+//                BigDecimal bigDecimal = new BigDecimal(prizeScore).setScale(0, RoundingMode.HALF_DOWN);
+//                if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+//                    walletService.add(bigDecimal, mallMember.getId(), "prizeScore");
+//                    mallMoneyFlowService.addMoneyFlow(
+//                            mallMember.getId(),
+//                            bigDecimal,
+//                            ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getValue(),
+//                            MallUtils.getOrderNum(),
+//                            FlowTypeEnum.PRIZE_SCORE.getValue(),
+//                            StrUtil.format(ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getDesc(),bigDecimal),
+//                            2
+//                    );
+//                }
+//                if (apiNewGiftSettingDto.getCouponId() != null) {
+//                    MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(apiNewGiftSettingDto.getCouponId());
+//                    if(ObjectUtil.isNotEmpty(mallGoodsCoupon)){
+//                        MallMemberCoupon memberCoupon = new MallMemberCoupon();
+//                        memberCoupon.setCouponId(mallGoodsCoupon.getId());
+//                        memberCoupon.setCouponName(mallGoodsCoupon.getName());
+//                        memberCoupon.setInviteId(mallMember.getInviteId());
+//                        memberCoupon.setCouponUuid(IdUtil.simpleUUID());
+//                        memberCoupon.setState(1);
+//                        memberCoupon.setFromType(3);
+//                        memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay()));
+//                        memberCoupon.setMemberId(mallMember.getId());
+//                        mallMemberCouponMapper.insert(memberCoupon);
+//                    }
+//                }
+//
+//            }
+//        }
         return new FebsResponse().success();
     }
 
@@ -858,10 +983,12 @@
         mallMoneyFlowService.addMoneyFlow(
                 memberId,
                 amount,
-                MoneyFlowTypeEnum.RECHARGE.getValue(),
+                ScoreFlowTypeEnum.RECHARGE_ING.getValue(),
                 rechargeNo,
                 FlowTypeEnum.BALANCE.getValue(),
-                "余额充值",1);
+                StrUtil.format(ScoreFlowTypeEnum.RECHARGE_ING.getDesc(),amount),
+                1
+        );
 
         String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
         String payResultStr = brandWCPayRequestData.getPrepay_id();
@@ -1097,10 +1224,12 @@
 
         MallMember member = this.baseMapper.selectById(loginUser.getId());
 
-        MallMember mallMember = new MallMember();
-        mallMember.setId(member.getId());
-        mallMember.setLastLoginTime(new Date());
-        this.baseMapper.updateById(mallMember);
+//        MallMember mallMember = new MallMember();
+//        mallMember.setId(member.getId());
+//        mallMember.setLastLoginTime(new Date());
+//        this.baseMapper.updateById(mallMember);
+
+        this.baseMapper.updateLastLoginTime(member.getId(),new Date());
 
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode());
         if (dic == null || StrUtil.isBlank(dic.getValue())) {
@@ -1340,18 +1469,19 @@
 
         // 获取当前登录用户的ID
         Long memberId = LoginUserUtil.getLoginUser().getId();
+        log.info("开始绑定医生{}",memberId);
         // 从DTO中提取邀请ID和门店会员ID
         String inviteId = dto.getInviteId();
         Long storeMemberId = dto.getStoreMemberId();
 
         // 根据门店会员ID查询门店会员信息
-        MallStoreMember mallStoreMember = mallStoreMemberMapper.selectById(storeMemberId);
+        MallStoreMember mallStoreMember = mallStoreMemberMapper.selectOne(
+                new LambdaQueryWrapper<MallStoreMember>()
+                .eq(MallStoreMember::getId,storeMemberId)
+                .eq(MallStoreMember::getMemberId,memberId)
+                );
         // 如果门店会员信息为空,抛出异常
         if(null == mallStoreMember){
-            throw new FebsException("当前检测记录无法绑定!");
-        }
-        // 如果门店会员的会员ID与当前登录用户ID不匹配,抛出异常
-        if(mallStoreMember.getMemberId() != memberId){
             throw new FebsException("当前检测记录无法绑定!");
         }
 
@@ -1363,7 +1493,11 @@
         }
 
         // 查询与当前门店会员ID关联的医生列表
-        List<MallDoctor> mallDoctors = mallDoctorMapper.selectList(new LambdaQueryWrapper<MallDoctor>().eq(MallDoctor::getStoreMemberId, mallStoreMember.getId()));
+        List<MallDoctor> mallDoctors = mallDoctorMapper.selectList(
+                new LambdaQueryWrapper<MallDoctor>()
+                        .eq(MallDoctor::getStoreMemberId, mallStoreMember.getId())
+                        .eq(MallDoctor::getMemberId, mallMember.getId())
+        );
         // 如果医生列表为空,创建新的医生对象并设置相关信息,然后插入数据库
         if(CollUtil.isEmpty(mallDoctors)){
             MallDoctor mallDoctor = new MallDoctor();
@@ -1372,8 +1506,13 @@
             mallDoctor.setBindMemberId(mallStoreMember.getMemberId());
             mallDoctor.setBindPhone(mallStoreMember.getPhone());
             mallDoctor.setBindName(mallStoreMember.getName());
-            mallDoctor.setBindInfo(mallStoreMember.getAccount());
             mallDoctor.setBindAge(mallStoreMember.getAge());
+
+            Long storeId = mallStoreMember.getStoreId();
+            Long storeItemId = mallStoreMember.getStoreItemId();
+            MallStore mallStore = mallStoreMapper.selectById(storeId);
+            MallStoreItem mallStoreItem = mallStoreItemMapper.selectById(storeItemId);
+            mallDoctor.setBindInfo(mallStore.getName()+"-"+mallStoreItem.getCode());
             mallDoctorMapper.insert(mallDoctor);
         }
 
@@ -1447,7 +1586,8 @@
                 ApiDoctorListVo apiDoctorListVo = new ApiDoctorListVo();
                 apiDoctorListVo.setId(mallDoctor.getId());
                 apiDoctorListVo.setStoreMemberId(mallDoctor.getStoreMemberId());
-                apiDoctorListVo.setName(mallDoctor.getBindName());
+                MallMember mallMember = this.baseMapper.selectById(mallDoctor.getMemberId());
+                apiDoctorListVo.setName(mallMember.getName());
                 apiDoctorListVo.setPhone(mallDoctor.getBindPhone());
                 apiDoctorListVo.setBindAge(mallDoctor.getBindAge());
                 apiDoctorListVo.setBindInfo(mallDoctor.getBindInfo());
@@ -1466,46 +1606,184 @@
         Long memberId = LoginUserUtil.getLoginUser().getId();
 
         MallDoctor mallDoctor = mallDoctorMapper.selectById(dto.getId());
-        if(memberId != mallDoctor.getBindMemberId()){
+        if(!memberId.equals(mallDoctor.getBindMemberId())){
             throw new FebsException("当前授权无法删除!");
         }
         mallDoctorMapper.deleteById(dto.getId());
         return new FebsResponse().success().message("操作成功");
     }
 
-    public static void main(String[] args) {
-        Long userld = 16425L;
-        String shopAccount = "爱和美医疗";
-        String shopPwd = "blnka2005";
+    @Override
+    public FebsResponse flowList(ApiMoneyFlowDto dto) {
+        Long id = LoginUserUtil.getLoginUser().getId();
+        IPage<ApiMoneyFlowVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        dto.setMemberId(id);
+        IPage<ApiMoneyFlowVo> pages = mallMoneyFlowMapper.selectFlowInPage(page, dto);
+        return new FebsResponse().success().data(pages);
+    }
 
-        HashMap<String, String> objectObjectHashMap = new HashMap<>();
+    @Override
+    public FebsResponse flowHeader() {
+        // 获取当前登录用户的ID
+        Long memberId = LoginUserUtil.getLoginUser().getId();
+        ApiMoneyFlowHeaderVo apiMoneyFlowHeaderVo = new ApiMoneyFlowHeaderVo();
+        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+        apiMoneyFlowHeaderVo.setBalance(mallMemberWallet.getBalance());
+        apiMoneyFlowHeaderVo.setPrizeScore(mallMemberWallet.getPrizeScore());
+        return new FebsResponse().success().data(apiMoneyFlowHeaderVo);
+    }
 
-        objectObjectHashMap.put("shopAccount",shopAccount);
-        objectObjectHashMap.put("shopPwd",shopPwd);
-        objectObjectHashMap.put("userId",userld.toString());
+    @Override
+    public FebsResponse newGiftEvent() {
+        // 获取当前登录用户的ID
+        Long memberId = LoginUserUtil.getLoginUser().getId();
 
-        //sign= MD5(shopAccount+shopPwd+userId)
-        StringBuffer stringBuffer = new StringBuffer();
-        stringBuffer.append(shopAccount);
-        stringBuffer.append(shopPwd);
-        stringBuffer.append(userld);
-        String sign = MD5.MD5Encode(stringBuffer.toString());
-        objectObjectHashMap.put("sign",sign);
+        ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo();
 
-        System.out.println(sign);
+        MallMember mallMember = this.baseMapper.selectById(memberId);
 
-        System.out.println(objectObjectHashMap);
-        String url = "https://data.muchun.co/api/getCustomerCheckRecords";
-        String result = HttpCurlUtil.sendPost(url, objectObjectHashMap);
-        Integer retCode = JSONUtil.parseObj(result).getInt("retCode");
-        String message = JSONUtil.parseObj(result).getStr("message");
-        if(0 != retCode){
-            System.out.println(message);
+        Integer newGift = mallMember.getNewGift();
+        if(newGift == 0){
+            apiMemberNewGiftSettingVo.setOpenState(1);
+        }else{
+            apiMemberNewGiftSettingVo.setOpenState(0);
         }
 
-        JSONArray data = JSONUtil.parseObj(result).getJSONArray("data");
-        System.out.println(data);
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
+                CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
+        );
+        ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
+        apiMemberNewGiftSettingVo.setState(apiNewGiftSettingDto.getState());
+        if(apiMemberNewGiftSettingVo.getState() == 1 && apiMemberNewGiftSettingVo.getOpenState() == 1){
+
+            mallMember.setNewGift(1);
+
+            BigDecimal prizeScore = new BigDecimal(StrUtil.isBlank(apiNewGiftSettingDto.getPrizeScore()) ? "0" : apiNewGiftSettingDto.getPrizeScore())
+                    .setScale(0, RoundingMode.HALF_DOWN);
+
+            if(prizeScore.compareTo(BigDecimal.ZERO) > 0){
+                mallMoneyFlowService.addMoneyFlow(
+                        memberId,
+                        prizeScore,
+                        ScoreFlowTypeEnum.NEW_GIFT_PRIZE_SCORE.getValue(),
+                        MallUtils.getOrderNum(),
+                        FlowTypeEnum.PRIZE_SCORE.getValue(),
+                        StrUtil.format( ScoreFlowTypeEnum.NEW_GIFT_PRIZE_SCORE.getDesc(),prizeScore),
+                        2);
+                mallMemberWalletService.add(prizeScore,memberId , "prizeScore");
+
+                apiMemberNewGiftSettingVo.setPrizeScore(prizeScore);
+            }
+
+            String couponUUID = IdUtil.simpleUUID();
+            if(ObjectUtil.isNotEmpty(apiNewGiftSettingDto.getCouponId())){
+                Long couponId = apiNewGiftSettingDto.getCouponId();
+                MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+                if(ObjectUtil.isNotEmpty(mallGoodsCoupon) && mallGoodsCoupon.getState() == 2){
+                    List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(memberId, couponId);
+                    if(CollUtil.isEmpty(mallMemberCoupons)){
+                        //商品优惠卷如果绑定了,那么当前登陆者获取一张卷
+                        MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+                        mallMemberCoupon.setCouponId(couponId);
+                        mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+                        mallMemberCoupon.setMemberId(memberId);
+                        mallMemberCoupon.setCouponUuid(couponUUID);
+                        mallMemberCoupon.setInviteId(mallMember.getInviteId());
+                        mallMemberCoupon.setState(1);
+                        mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+                        mallMemberCouponMapper.insert(mallMemberCoupon);
+
+                        mallMoneyFlowService.addMoneyFlow(
+                                memberId,
+                                BigDecimal.ONE,
+                                ScoreFlowTypeEnum.NEW_GIFT_COUPON.getValue(),
+                                MallUtils.getOrderNum(),
+                                FlowTypeEnum.BALANCE.getValue(),
+                                StrUtil.format( ScoreFlowTypeEnum.NEW_GIFT_COUPON.getDesc(),mallGoodsCoupon.getName()),
+                                2);
+
+                        apiMemberNewGiftSettingVo.setCouponName(mallGoodsCoupon.getName());
+                    }
+                }
+            }
+        }
+
+        mallMember.setLastLoginTime(new Date());
+        this.baseMapper.updateById(mallMember);
+
+//        this.baseMapper.updateLastLoginTime(memberId,new Date());
+
+        return new FebsResponse().success().data(apiMemberNewGiftSettingVo);
     }
 
+    @Override
+    public FebsResponse getLabelList() {
+
+        // 获取当前登录用户的ID
+        Long memberId = LoginUserUtil.getLoginUser().getId();
+
+        ArrayList<ApiMemberLabelVo> apiMemberLabelVos = new ArrayList<>();
+
+        List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+                new LambdaQueryWrapper<HappyMemberLabelRecord>()
+                        .eq(HappyMemberLabelRecord::getMemberId,memberId)
+        );
+        if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
+            Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
+            List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+                    new LambdaQueryWrapper<HappyMemberLabel>()
+                            .select(HappyMemberLabel::getIconPng)
+                            .in(HappyMemberLabel::getId, collect)
+            );
+            if(CollUtil.isNotEmpty(happyMemberLabels)){
+                for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
+                    ApiMemberLabelVo apiMemberLabelVo = new ApiMemberLabelVo();
+                    apiMemberLabelVo.setName(happyMemberLabel.getName());
+                    apiMemberLabelVo.setContent(happyMemberLabel.getContent());
+                    apiMemberLabelVo.setHeaderPng(happyMemberLabel.getHeaderPng());
+                    apiMemberLabelVo.setIconPng(happyMemberLabel.getIconPng());
+                    apiMemberLabelVos.add(apiMemberLabelVo);
+                }
+            }
+        }
+
+        return new FebsResponse().success().data(apiMemberLabelVos);
+    }
+
+//    public static void main(String[] args) {
+//        Long userld = 16425L;
+//        String shopAccount = "爱和美医疗";
+//        String shopPwd = "blnka2005";
+//
+//        HashMap<String, String> objectObjectHashMap = new HashMap<>();
+//
+//        objectObjectHashMap.put("shopAccount",shopAccount);
+//        objectObjectHashMap.put("shopPwd",shopPwd);
+//        objectObjectHashMap.put("userId",userld.toString());
+//
+//        //sign= MD5(shopAccount+shopPwd+userId)
+//        StringBuffer stringBuffer = new StringBuffer();
+//        stringBuffer.append(shopAccount);
+//        stringBuffer.append(shopPwd);
+//        stringBuffer.append(userld);
+//        String sign = MD5.MD5Encode(stringBuffer.toString());
+//        objectObjectHashMap.put("sign",sign);
+//
+//        System.out.println(sign);
+//
+//        System.out.println(objectObjectHashMap);
+//        String url = "https://data.muchun.co/api/getCustomerCheckRecords";
+//        String result = HttpCurlUtil.sendPost(url, objectObjectHashMap);
+//        Integer retCode = JSONUtil.parseObj(result).getInt("retCode");
+//        String message = JSONUtil.parseObj(result).getStr("message");
+//        if(0 != retCode){
+//            System.out.println(message);
+//        }
+//
+//        JSONArray data = JSONUtil.parseObj(result).getJSONArray("data");
+//        System.out.println(data);
+//    }
+
 
 }

--
Gitblit v1.9.1