Pu Zhibing
3 天以前 6f5e0af7b4e3c4e6d2bcd33bafb6649727e98b37
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.service.impl.order;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
@@ -90,6 +91,7 @@
    /**
     * 获取会员服务商品
     *
     * @param merConsumerGoodsDto
     * @return
     */
@@ -101,6 +103,14 @@
            merConsumerGoodsVo.setNoSureList(noSureList);
        }
        List<MerConsumerGoodsListVo> sureList = consumerGoodsMapper.listMerConsumerGoods(merConsumerGoodsDto);
        Member member = remoteMemberService.getMember(merConsumerGoodsDto.getUserId()).getData();
        String lastServiceId = member.getLastServiceId();
        if (StringUtils.isNotEmpty(lastServiceId)) {
            List<String> list = JSON.parseArray(lastServiceId, String.class);
            sureList.forEach(s -> {
                s.setOptionFlag(list.contains(s.getConsumerGoodsId()));
            });
        }
        merConsumerGoodsVo.setSureList(sureList);
        return merConsumerGoodsVo;
    }
@@ -308,6 +318,13 @@
                serviceRecordDetail1.setRecordId(serviceRecord.getId());
            }
            serviceRecordDetailService.saveBatch(serviceRecordDetailList);
            //保存本次确认的服务商品id,用于下次进入页面后默认勾选上
            List<String> collect = goodsList.stream().map(MerSureConsumerGoodsListDto::getConsumerGoodsId).collect(Collectors.toList());
            Member member = remoteMemberService.getMember(merSureConsumerGoodsDto.getUserId()).getData();
            member.setLastServiceId(JSON.toJSONString(collect));
            remoteMemberService.editMember(member);
            //更新商户和会员服务统计
            MemberTotalChangeDto memberTotalChange = new MemberTotalChangeDto();
            memberTotalChange.setUserId(merSureConsumerGoodsDto.getMemberUserId());
@@ -315,7 +332,6 @@
            memberTotalChange.setServiceCount(serviceCount);
            remoteMemberService.changeMemberTotal(memberTotalChange);
            if(!sendData.isEmpty()){
                Member member = remoteMemberService.getMember(userId).getData();
                R<Shop> r = remoteShopService.getShop(shopId);
                if(r.getCode() != 200){
                    throw new ServiceException(r.getMsg());
@@ -327,11 +343,10 @@
                        Integer number = Integer.valueOf(sendDatum.get("number").toString());
                        String msg = "{\"name\":\"" + (StringUtils.isEmpty(member.getRealName()) ? member.getNickName() : member.getRealName()) + "\"," +
                                "\"store\":\"" + shop.getShopName() + "\",\"product\":\"" + product + "\"}";
                        if(number == 2){
                            MsgUtils.sendMsg(member.getMobile(),"SMS_464376210",msg);
                        }
                        if(number == 0){
                            MsgUtils.sendMsg(member.getMobile(),"SMS_464321234",msg);
                        } else {
                            MsgUtils.sendMsg(member.getMobile(), "SMS_464376210", msg);
                        }
                    }