bug

jiangqs

2023-08-10 a8e56f03a22c722ccf3f67a408919e6c8f256de3

bug

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/BirthdayCard.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/birthday/BirthdayCard.java
@@ -1,4 +1,4 @@
package com.ruoyi.member.domain.pojo.birthday;
package com.ruoyi.system.api.domain.poji.member;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java

@@ -2,6 +2,7 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.RemoteMemberService;
@@ -140,7 +141,12 @@

            @Override
            public R updateMemberShopName(MgtMemberShopNameDto mgtMemberShopNameDto) {
                return R.fail("更新商户绑定会员:" + throwable.getMessage());
                return R.fail("更新商户绑定会员失败:" + throwable.getMessage());
            }

            @Override
            public R<BirthdayCard> getBirthdayCard() {
                return R.fail("获取平台生日卡失败:" + throwable.getMessage());
            }



 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java

@@ -3,6 +3,7 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.vo.*;
@@ -23,6 +24,7 @@

    /**
     * 小程序登录
     *
     * @param appMiniLoginDto
     * @return
     */
@@ -31,6 +33,7 @@

    /**
     * 小程序注册
     *
     * @param appUserRegisterDto
     * @return
     */
@@ -38,9 +41,9 @@
    public R<AppMiniRegisterVo> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto);



    /**
     * 更新绑定
     *
     * @param appMemberBindingDto
     * @return
     */
@@ -49,6 +52,7 @@

    /**
     * 更新会员商品类型
     *
     * @param appMemberGoodsTypeDto
     * @return
     */
@@ -57,6 +61,7 @@

    /**
     * 通过手机号获取会员
     *
     * @param mobile
     * @return
     */
@@ -65,6 +70,7 @@

    /**
     * 订单创建新用户
     *
     * @param member
     * @return
     */
@@ -72,49 +78,49 @@
    public R createNewMember(@RequestBody Member member);

    /**
     * @description  删除用户标签
     * @author  jqs
     * @date    2023/6/8 15:17
     * @param tag
     * @return  R
     * @return R
     * @description 删除用户标签
     * @author jqs
     * @date 2023/6/8 15:17
     */
    @PostMapping("/member/deleteMemberTag")
    public R deleteMemberTag(@RequestBody String tag);

    /**
     * @description  删除用户建议标签
     * @author  jqs
     * @date    2023/6/9 10:17
     * @param suggestTag
     * @return  R
     * @return R
     * @description 删除用户建议标签
     * @author jqs
     * @date 2023/6/9 10:17
     */
    @PostMapping("/member/deleteMemberSuggestTag")
    public R deleteMemberSuggestTag(@RequestBody String suggestTag);

    /**
     * @description  通过ids获取用户简易返回
     * @author  jqs
     * @date    2023/6/16 11:05
     * @param mgtBaseBathDto
     * @return  R<List<MgtSimpleMemberVo>>
     * @return R<List < MgtSimpleMemberVo>>
     * @description 通过ids获取用户简易返回
     * @author jqs
     * @date 2023/6/16 11:05
     */
    @PostMapping("/member/listSimpleVoByIds")
    public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto);

    /**
     * @description
     * @author  jqs
     * @date    2023/6/16 12:47
     * @param mgtUserIdByKeywordDto
     * @return  R<MgtUserIdByKeywordVo>
     * @return R<MgtUserIdByKeywordVo>
     * @description
     * @author jqs
     * @date 2023/6/16 12:47
     */
    @PostMapping("/member/getUserIdByKeyword")
    public R<MgtUserIdByKeywordVo> getUserIdByKeyword(@RequestBody MgtUserIdByKeywordDto mgtUserIdByKeywordDto);

    /**
     * @description boardMemberTotal
     * @param
     * @return R<MgtBulletinBoardVo>
     * @description boardMemberTotal
     * @author jqs34
     * @date 2023/6/18 16:45
     */
@@ -122,108 +128,118 @@
    public R<MgtBulletinBoardVo> boardMemberTotal();

    /**
     * @description  筛选userId年龄段
     * @author  jqs
     * @date    2023/6/20 14:31
     * @param mgtActivityAgeDto
     * @return  R<List<Long>>
     * @return R<List < Long>>
     * @description 筛选userId年龄段
     * @author jqs
     * @date 2023/6/20 14:31
     */
    @PostMapping("/member/listUserIdByAge")
    public R<List<Long>> listUserIdByAge(@RequestBody MgtActivityAgeDto mgtActivityAgeDto);


    /**
     * @description  通过shopId获取userId
     * @author  jqs
     * @date    2023/6/21 17:11
     * @param shopIdlist
     * @return  R<List<Long>>
     * @return R<List < Long>>
     * @description 通过shopId获取userId
     * @author jqs
     * @date 2023/6/21 17:11
     */
    @PostMapping("/member/listUserIdByShopId")
    public R<List<Long>> listUserIdByShopId(@RequestBody List<Long> shopIdlist);

    /**
     * @description  通过shopId获取user统计
     * @author  jqs
     * @date    2023/6/21 17:22
     * @param shopIdlist
     * @return  R<MgtShopTotalMemberVo>
     * @return R<MgtShopTotalMemberVo>
     * @description 通过shopId获取user统计
     * @author jqs
     * @date 2023/6/21 17:22
     */
    @PostMapping("/member/getUserTotalByShopId")
    public R<MgtShopTotalMemberVo> getUserTotalByShopId(@RequestBody List<Long> shopIdlist);

    /**
     * @description  更新会员统计
     * @author  jqs
     * @date    2023/6/28 17:52
     * @param memberTotalChangeDto
     * @return  R
     * @return R
     * @description 更新会员统计
     * @author jqs
     * @date 2023/6/28 17:52
     */
    @PostMapping("/member/changeMemberTotal")
    public R changeMemberTotal(@RequestBody MemberTotalChangeDto memberTotalChangeDto);


    /**
     * @description  获取各年龄层userId
     * @author  jqs
     * @date    2023/7/4 9:49
     * @param merTotalDto
     * @return  R<MerOrderAgeUserVo>
     * @return R<MerOrderAgeUserVo>
     * @description 获取各年龄层userId
     * @author jqs
     * @date 2023/7/4 9:49
     */
    @PostMapping("/member/listOrderAgeUser")
    public R<List<MerOrderAgeUserVo>> listOrderAgeUser(@RequestBody MerTotalDto merTotalDto);

    /**
     * @description  获取未回复数量
     * @author  jqs
     * @date    2023/7/5 12:49
     * @param
     * @return  R<Integer>
     * @return R<Integer>
     * @description 获取未回复数量
     * @author jqs
     * @date 2023/7/5 12:49
     */
    @PostMapping("/member/getUnReplaySuggestVo")
    public R<Integer> getUnReplaySuggestVo();


    /**
     * @description  获取核销奖品
     * @author  jqs
     * @date    2023/7/8 17:43
     * @param verifyPrize
     * @return  R<MemberGiftRecord>
     * @return R<MemberGiftRecord>
     * @description 获取核销奖品
     * @author jqs
     * @date 2023/7/8 17:43
     */
    @PostMapping("/member/getVerifyPrize")
    public R<MemberGiftRecord> getVerifyPrize(@RequestBody String verifyPrize);


    /**
     * @description  积分变动
     * @author  jqs
     * @date    2023/7/12 17:04
     * @param integralChangeDto
     * @return  R
     * @return R
     * @description 积分变动
     * @author jqs
     * @date 2023/7/12 17:04
     */
    @PostMapping("/member/changeIntegral")
    public R signShare(@RequestBody IntegralChangeDto integralChangeDto);


    /**
     * @description  统计商户今日新增会员
     * @author  jqs
     * @date    2023/7/14 20:00
     * @param shopIdList
     * @return  R<Integer>
     * @return R<Integer>
     * @description 统计商户今日新增会员
     * @author jqs
     * @date 2023/7/14 20:00
     */
    @PostMapping("/member/getAreaNewMember")
    public R<Integer> getAreaNewMember(@RequestBody List<Long> shopIdList);


    /**
     * @description  更新会员绑定商户名
     * @author  jqs
     * @date    2023/7/26 17:07
     * @param mgtMemberShopNameDto
     * @return  R
     * @return R
     * @description 更新会员绑定商户名
     * @author jqs
     * @date 2023/7/26 17:07
     */
    @PostMapping("/member/updateMemberShopName")
    public R updateMemberShopName(@RequestBody MgtMemberShopNameDto mgtMemberShopNameDto);
}

    /**
     * @description
     * @author  jqs
     * @date    2023/8/9 19:39
     * @param
     * @return  R<BirthdayCard>
     */
    @PostMapping("/member/getBirthdayCard")
    public R<BirthdayCard> getBirthdayCard();
}

 ruoyi-auth/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
@@ -35,8 +35,8 @@
      datasource:
        ds1:
          nacos:
            server-addr: 47.109.78.184:5000
            #server-addr: 127.0.0.1:8848
            #server-addr: 47.109.78.184:5000
            server-addr: 127.0.0.1:8848
            dataId: sentinel-ruoyi-gateway
            groupId: DEFAULT_GROUP
            data-type: json

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ActivityCodeServiceImpl.java

@@ -35,7 +35,7 @@
    @Override
    public String createActivityCode(String url, String fileName) throws Exception {
        File qrCodeFile = new File("/home/image/qrcode.png");// 生成二维码
        QrCodeUtil.generate(url, 100, 100, qrCodeFile);
        QrCodeUtil.generate(url, 200, 200, qrCodeFile);
        InputStream codeStream = new FileInputStream(qrCodeFile);
        String fileUrl =  OBSUploadUtils.uploadInputStream(codeStream,fileName);
        return fileUrl;
@@ -76,7 +76,7 @@
        String fileUrl = null;
        File qrCodeFile = new File("/home/image/qrcode.png");
        // 二维码内容
        String text = "https://wxapp.hhhrt.cn/mini/activity?"+activityId;
        String text = "https://wxapp.hhhrt.cn/mini/activity?id="+activityId;
        // 生成二维码
        QrCodeUtil.generate(text, 200, 200, qrCodeFile);
        ByteArrayOutputStream out = new ByteArrayOutputStream();

 ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -19,12 +19,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java

@@ -18,7 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
//@EnableScheduling
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api"),@ComponentScan("com.ruoyi.common.security.utils")})
public class RuoYiGoodsApplication
{

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MerGoodsPageDto.java

@@ -1,6 +1,5 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +20,6 @@
    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;



    @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
    private Integer sort;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

@@ -131,7 +131,7 @@
            activityTotal.setOrderMoneyTotal(BigDecimal.ZERO);
            activityTotalService.save(activityTotal);
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+activityId;
            String url = "https://wxapp.hhhrt.cn/mini/activity?id="+activityId;
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("activity-"+activityId);
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();

 ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -231,6 +231,9 @@
                </otherwise>
            </choose>
        </if>
        <if test="param.sort ==null">
            ORDER BY tgt.buy_num_count,tg.create_time DESC
        </if>
    </select>

    <!--分页获取搜索商品列表-->
@@ -311,7 +314,31 @@
        <if test="param.goodsName != null and param.goodsName != ''">
            AND tg.goods_name LIKE CONCAT('%',#{param.goodsName},'%')
        </if>
        ORDER BY tg.create_time DESC
        <if test="param.sort != null and param.sort != ''">
            <choose>
                <when test="param.sort==2">
                    ORDER BY salesPrice ASC,tg.create_time DESC
                </when>
                <when test="param.sort==3">
                    ORDER BY salesPrice DESC,tg.create_time DESC
                </when>
                <when test="param.sort==4">
                    ORDER BY tgt.buy_num_count ASC,tg.create_time DESC
                </when>
                <when test="param.sort==5">
                    ORDER BY tgt.buy_num_count DESC,tg.create_time DESC
                </when>
                <when test="param.sort==1">
                    ORDER BY tgt.buy_num_count,tg.create_time DESC
                </when>
                <otherwise>
                    ORDER BY tgt.buy_num_count,tg.create_time DESC
                </otherwise>
            </choose>
        </if>
        <if test="param.sort ==null">
            ORDER BY tg.create_time DESC
        </if>
    </select>

    <select id="listMerCycleGoods" resultType="com.ruoyi.goods.domain.vo.MerGoodsPageVo">

 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/RuoYiMemberApplication.java

@@ -18,7 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
//@EnableScheduling
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api"),@ComponentScan("com.ruoyi.common.security.utils")})
public class RuoYiMemberApplication
{

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -2,17 +2,22 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.member.service.birthday.BirthdayCardService;
import com.ruoyi.member.service.member.MemberGiftRecordService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;
@@ -29,6 +34,9 @@

    @Resource
    private MemberGiftRecordService memberGiftRecordService;

    @Resource
    private BirthdayCardService birthdayCardService;

    /**
    * @description: getMember
@@ -331,4 +339,11 @@
        memberService.updateMemberShopName(mgtMemberShopNameDto);
        return R.ok();
    }

    @PostMapping("/getBirthdayCard")
    public R<BirthdayCard> getBirthdayCard()
    {
        BirthdayCard birthdayCard = birthdayCardService.getBirthdayCard();
        return R.ok(birthdayCard);
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java

@@ -106,8 +106,7 @@
        Member member = memberService.getByUserId(userId);
        AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
        appBirthdayCardVo.setCheckBirthdayCard(0);
        if(member.getBindingFlag()==1){
            Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId());
            Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId(),member.getBindingFlag());
            if(check==1){
                appBirthdayCardVo.setCheckBirthdayCard(1);
                if(StringUtils.isNotBlank(member.getBirthday())){
@@ -129,7 +128,7 @@
                    appBirthdayCardVo.setHaveBirthdayFlag(0);
                }
            }
        }

        return R.ok(appBirthdayCardVo);
    }


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java

@@ -73,4 +73,10 @@

    @ApiModelProperty(value="拒绝理由")
    private String auditReason;

    @ApiModelProperty(value = "优惠券二维码")
    private String couponCode;

    @ApiModelProperty(value = "宣传海报")
    private String propagandaPoster;
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java

@@ -74,4 +74,7 @@

    @ApiModelProperty(value = "关联用户集合")
    private List<MgtCouponMemberListVo> relUserList;

    @ApiModelProperty(value = "宣传海报")
    private String propagandaPoster;
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/birthday/BirthdayCardMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.member.mapper.birthday;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.member.domain.pojo.birthday.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.member.domain.vo.AppMemberPrizePageVo;
import org.apache.ibatis.annotations.Param;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java

@@ -5,7 +5,7 @@
import com.ruoyi.member.domain.dto.MerBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
import com.ruoyi.member.domain.pojo.birthday.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.member.domain.vo.*;

import java.util.List;
@@ -120,5 +120,14 @@
     * @param
     * @return  void
     */
    Integer checkBirthdayCard(Long shopId);
    Integer checkBirthdayCard(Long shopId,Integer bindingFlag);

    /**
     * @description  获取平台生日卡
     * @author  jqs
     * @date    2023/8/9 19:35
     * @param
     * @return  BirthdayCard
     */
    BirthdayCard getBirthdayCard();
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/birthday/BirthdayCardServiceImpl.java

@@ -11,7 +11,7 @@
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGiftDto;
import com.ruoyi.member.domain.pojo.birthday.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.member.domain.pojo.birthday.BirthdayGift;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.mapper.birthday.BirthdayCardMapper;
@@ -22,6 +22,7 @@
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.stereotype.Service;
@@ -194,6 +195,10 @@
        MerBirthdayGetVo birthdayGetVo = new MerBirthdayGetVo();
        // 获取平台生日卡信息
        BirthdayCard birthdayCard = birthdayCardMapper.getPlatformBirthdayCard(shopId);
        Shop shop = remoteShopService.getShop(shopId).getData();
        if(birthdayCard.getAreaFlag()==2&&birthdayCard.getShopFlag()==1&&!StringUtils.checkString(birthdayCard.getDesignatedArea(),shop.getShopCityCode())){
            birthdayCard = null;
        }
        // 如果生日卡存在
        if (birthdayCard != null) {
            String giftDesc = "";
@@ -698,13 +703,19 @@
     * @return  void
     */
    @Override
    public Integer checkBirthdayCard(Long shopId){
    public Integer checkBirthdayCard(Long shopId,Integer bindingFlag){
        // 获取平台生日卡信息
        Boolean platformBirthdayCardOpen = true;
        BirthdayCard plBirthdayCard = birthdayCardMapper.getMerShopBirthdayCard(0L);
        if (plBirthdayCard == null || plBirthdayCard.getCardStatus()!=1) {
            platformBirthdayCardOpen = false;
        }else{
            if(plBirthdayCard.getShopFlag()==2&&plBirthdayCard.getAreaFlag()==1){
                Shop shop = remoteShopService.getShop(shopId).getData();
                if(!StringUtils.checkString(plBirthdayCard.getDesignatedArea(),shop.getShopCityCode())){
                    platformBirthdayCardOpen = false;
                }
            }
            if(plBirthdayCard.getAreaFlag()==2&&!StringUtils.checkString(plBirthdayCard.getApplicableShop(),shopId.toString())){
                platformBirthdayCardOpen = false;
            }
@@ -712,11 +723,15 @@
        BirthdayCard shopBirthdayCard = birthdayCardMapper.getMerShopBirthdayCard(shopId);
        // 如果生日卡存在
        Boolean shopBirthdayCardOpen  = true;
        if (shopBirthdayCard == null || shopBirthdayCard.getCardStatus()!=1) {
            shopBirthdayCardOpen = false;
        }
        Integer marketingStatus = remoteShopService.getShopMarketingStatus(shopId).getData();
        if(marketingStatus<=1){
        if(bindingFlag==1){
            if (shopBirthdayCard == null || shopBirthdayCard.getCardStatus()!=1) {
                shopBirthdayCardOpen = false;
            }
            Integer marketingStatus = remoteShopService.getShopMarketingStatus(shopId).getData();
            if(marketingStatus<=1){
                shopBirthdayCardOpen = false;
            }
        }else{
            shopBirthdayCardOpen = false;
        }
        if(platformBirthdayCardOpen||shopBirthdayCardOpen){
@@ -725,4 +740,21 @@
            return 0;
        }
    }

    /**
     * @description  获取平台生日卡
     * @author  jqs
     * @date    2023/8/9 19:35
     * @param
     * @return  BirthdayCard
     */
    @Override
    public BirthdayCard getBirthdayCard(){
        LambdaQueryWrapper<BirthdayCard> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(BirthdayCard::getDelFlag,0);
        queryWrapper.eq(BirthdayCard::getShopId,0L);
        queryWrapper.eq(BirthdayCard::getCardStatus,1);
        BirthdayCard shopBirthdayCard = this.getOne(queryWrapper,false);
        return shopBirthdayCard;
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java

@@ -866,6 +866,7 @@
                    validTime = "领取之日起" + validDay.toString() + "天";
                }
                merCouponPageVo.setValidTime(validTime);
                merCouponPageVo.setCouponCode("https://hongruitang.oss-cn-beijing.aliyuncs.com/2023/8/3/couponCode.jpg");
            }
        }
        return couponPageVoList;

 ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.member.mapper.birthday.BirthdayCardMapper">

    <select id="getPlatformBirthdayCard" resultType="com.ruoyi.member.domain.pojo.birthday.BirthdayCard">
    <select id="getPlatformBirthdayCard" resultType="com.ruoyi.system.api.domain.poji.member.BirthdayCard">
        SELECT *
        FROM t_birthday_card
        WHERE del_flag = 0 AND card_status = 1 AND shop_id = 0
@@ -10,7 +10,7 @@

    </select>

    <select id="getMerShopBirthdayCard" resultType="com.ruoyi.member.domain.pojo.birthday.BirthdayCard">
    <select id="getMerShopBirthdayCard" resultType="com.ruoyi.system.api.domain.poji.member.BirthdayCard">
        SELECT *
        FROM t_birthday_card
        WHERE del_flag = 0 AND card_status = 1

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml

@@ -165,7 +165,7 @@
        FROM t_member tm
        INNER JOIN t_member_total tmt ON tm.member_id = tmt.member_id
        WHERE tm.relation_shop_id = #{param.shopId} AND tm.binding_flag = 1
        <if test="param.memberGender != null and param.memberGender != ''">
        <if test="param.memberGender != null">
            AND tm.gender = #{param.memberGender}
        </if>
        <if test="param.memberType != null and param.memberType != ''">
@@ -183,6 +183,9 @@
        <if test="param.memberFrom != null and param.memberFrom != ''">
            AND tm.customer_source = #{param.memberFrom}
        </if>
        <if test="param.memberLevel != null and param.memberLevel != ''">
            AND tm.member_level = #{param.memberLevel}
        </if>
        <if test="param.taskStartDate!=null and param.taskStartDate!=''">
            AND Date(tmt.next_task_time) &gt;= #{param.taskStartDate}
        </if>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/RuoYiOrderApplication.java

@@ -7,7 +7,6 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans;
import org.springframework.scheduling.annotation.EnableScheduling;

/**
 * 系统模块
@@ -17,7 +16,7 @@
@EnableCustomConfig
@EnableCustomSwagger2
@EnableRyFeignClients
@EnableScheduling
//@EnableScheduling
@SpringBootApplication
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api"),@ComponentScan("com.ruoyi.common.security.utils")})
public class RuoYiOrderApplication

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppGoodsInfoVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -39,12 +41,14 @@
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsNurses;

    @ApiModelProperty(value="服务次数")
    private Integer serviceNum;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "商品详情")
@@ -57,6 +61,7 @@
    private Integer activityFlag;

    @ApiModelProperty(value = "商品活动价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "售罄标记0否1是")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPanicBuyVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -16,12 +18,15 @@
public class AppPanicBuyVo {

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "订单支付订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderPayDeposit;

    @ApiModelProperty(value = "订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderPayMoney;

    @ApiModelProperty(value = "活动Id")
@@ -46,18 +51,23 @@
    private Integer buyNum;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "活动售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsTotalPrice;

    @ApiModelProperty(value = "商品订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsDeposit;

    @ApiModelProperty(value = "商品实际价格")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsRealPrice;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java

@@ -2,6 +2,8 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -28,9 +30,11 @@
    private Integer payType;

    @ApiModelProperty(value = "支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value = "未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unpaidMoney;

    @ApiModelProperty(value = "支付截止时间")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppShoppingCartVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -40,6 +42,7 @@
    private String goodsNurses;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "购买数量")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleActivityGoodsVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -34,12 +36,15 @@
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsNurses;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "商品活动价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "活动销售数量")
@@ -49,6 +54,7 @@
    private Integer salesNumber;

    @ApiModelProperty(value = "已售比例")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPercent;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSimpleGoodsVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,6 +39,7 @@
    private String goodsNurses;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPrice;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,24 +41,30 @@
    private String memberCouponId;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "活动售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsTotalPrice;

    @ApiModelProperty(value = "商品订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsDeposit;

    @ApiModelProperty(value = "是否计算优惠券0否1是")
    private Integer useCoupon;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "商品实际价格")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsRealPrice;

    @ApiModelProperty(value = "优惠券列表")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -18,15 +20,19 @@


    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "订单支付订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderPayDeposit;

    @ApiModelProperty(value = "订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderPayMoney;

    @ApiModelProperty(value = "订单商品列表")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -31,19 +33,24 @@
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;


    @ApiModelProperty(value="待支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unpaidMoney;


@@ -56,6 +63,7 @@


    @ApiModelProperty(value="订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="商户id")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -40,9 +42,11 @@
    private Integer buyNum;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "商品实际价格")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsRealPrice;

    @ApiModelProperty(value="周期标记")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -34,6 +36,7 @@
    private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;

    @ApiModelProperty(value="订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="商品数量")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerGoodsPageVo.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -38,9 +39,11 @@
    private String goodsNurses;

    @ApiModelProperty(value = "商品建议售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal suggestSalesPrice;;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesPrice;;

    @ApiModelProperty(value="周期次数标记0否1是")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -27,27 +29,37 @@
    private Integer orderStatus;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;

    @ApiModelProperty(value="实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="已收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="未收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @ApiModelProperty(value="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
    private String thisReceiveType;
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -27,24 +29,31 @@
    private Integer orderStatus;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;

    @ApiModelProperty(value="实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="已收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="未收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @ApiModelProperty(value="收款时间")
@@ -52,6 +61,7 @@
    private Date receiveMoneyTime;

    @ApiModelProperty(value="收款金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal thisReceiveMoney;

    @ApiModelProperty(value="收款方式")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderDistributionTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -22,6 +24,7 @@
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单金额value")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal[] orderMoneyValue;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -43,24 +45,31 @@
    private Integer payType;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;

    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="订单已收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="订单未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @ApiModelProperty(value="订单备注")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -37,24 +39,31 @@
    private Integer serviceTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "线上订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal onlineMoney;

    @ApiModelProperty(value = "线下订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal offlineMoney;

    @ApiModelProperty(value = "活动订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityMoney;

    @ApiModelProperty(value = "周期订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal cycleMoney;

    @ApiModelProperty(value = "体验订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal experienceMoney;

    @ApiModelProperty(value = "服务订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal serviceMoney;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -20,17 +22,22 @@
    private Integer orderTotal;

    @ApiModelProperty(value = "应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value = "实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal relReceiveMoney;

    @ApiModelProperty(value = "已收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal relPayMoney;

    @ApiModelProperty(value = "未收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unpaidMoney;

    @ApiModelProperty(value = "总订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -31,21 +33,26 @@
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;

    @ApiModelProperty(value="订单商品列表")
    private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;

    @ApiModelProperty(value="订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="创建时间")
@@ -73,12 +80,15 @@
    private String userMobile;

    @ApiModelProperty(value="实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal realReceiveMoney;

    @ApiModelProperty(value="已收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="未收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unReceiveMoney;

    @ApiModelProperty(value="支付方式1.全款2订金")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -51,6 +53,7 @@

    @Excel(name = "秒杀价格", width = 30)
    @ApiModelProperty(value = "秒杀价格")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityPrice;

    @Excel(name = "购买数量", width = 30)
@@ -59,10 +62,12 @@

    @Excel(name = "订单金额", width = 30)
    @ApiModelProperty(value="订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @Excel(name = "应付金额", width = 30)
    @ApiModelProperty(value="应付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -72,10 +77,12 @@

    @Excel(name = "订单实际支付金额", width = 30)
    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @Excel(name = "订单未支付金额", width = 30)
    @ApiModelProperty(value="订单未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @ApiModelProperty(value="核销店铺id")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMapTotalPlusVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -22,6 +24,7 @@
    private Integer mapValueFirst;

    @ApiModelProperty(value = "mapValueSecond")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal mapValueSecond;

    @ApiModelProperty(value = "mapValueThird")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,25 +42,31 @@

    @Excel(name = "订单总价", width = 30)
    @ApiModelProperty(value = "订单总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @Excel(name = "优惠券抵扣", width = 30)
    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal discountMoney;

    @Excel(name = "应收金额", width = 30)
    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @Excel(name = "订单实收金额", width = 30)
    @ApiModelProperty(value = "实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receiveMoney;

    @Excel(name = "订单未支付金额", width = 30)
    @ApiModelProperty(value="订单未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,17 +21,22 @@
    private Integer orderTotal;

    @ApiModelProperty(value = "订单总金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalOrderMoney;

    @ApiModelProperty(value = "应收总金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalReceivableMoney;

    @ApiModelProperty(value = "优惠总金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalDiscountMoney;

    @ApiModelProperty(value = "支付总金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalPayMoney;

    @ApiModelProperty(value = "实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalReceiveMoney;
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -46,15 +48,19 @@
    private String orderFrom;

    @ApiModelProperty(value="订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value="应付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="订单未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @ApiModelProperty(value="秒杀活动")
@@ -65,9 +71,11 @@
    private Date createTime;

    @ApiModelProperty(value="线上支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal onlinePayMoney;

    @ApiModelProperty(value="线下支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal offlinePayMoney;

    @ApiModelProperty(value="线上支付时间")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderGoodsDetailVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -35,9 +37,11 @@
    private Integer buyNum;

    @ApiModelProperty(value = "商品售价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal goodsTotalPrice;

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderPayListVo.java

@@ -1,5 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -17,9 +20,11 @@
public class MgtOrderPayListVo {

    @ApiModelProperty(value="支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date payTime;

    @ApiModelProperty(value="支付类型")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,29 +21,36 @@
    private Integer orderTotal;

    @ApiModelProperty(value="订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoneyTotal;

    @ApiModelProperty(value="门店订单总数")
    private Integer shopOrderTotal;

    @ApiModelProperty(value="门店订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopOrderMoneyTotal;

    @ApiModelProperty(value="门店订单已付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopPayMoneyTotal;

    @ApiModelProperty(value="门店订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopUnPayMoneyTotal;

    @ApiModelProperty(value="活动订单总数")
    private Integer activityOrderTotal;

    @ApiModelProperty(value="活动订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityOrderMoneyTotal;

    @ApiModelProperty(value="活动订单已付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityPayMoneyTotal;

    @ApiModelProperty(value="活动订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityUnPayMoneyTotal;
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
@@ -31,15 +33,19 @@
    private Integer serviceTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "周期订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal cycleMoney;

    @ApiModelProperty(value = "体验订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal experienceMoney;

    @ApiModelProperty(value = "服务订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal serviceMoney;

    @ApiModelProperty(value = "总人数")
@@ -61,6 +67,7 @@
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单数量value")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal[] orderMoneyValue;

    @ApiModelProperty(value = "商品类型数量")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -40,22 +42,30 @@

    @Excel(name = "订单金额", width = 30)
    @ApiModelProperty(value="订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @Excel(name = "优惠金额", width = 30)
    @ApiModelProperty(value="优惠金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal discountMoney;

    @Excel(name = "应付金额", width = 30)
    @ApiModelProperty(value="应付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @Excel(name = "订单实际支付金额", width = 30)
    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @Excel(name = "订单来源", width = 30)
    @ApiModelProperty(value="订单来源")
    private String orderFrom;

    @Excel(name = "订单状态", width = 30)
    @ApiModelProperty(value="订单状态")
    private String orderStatus;

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderTotal.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,9 +21,11 @@
    private Integer orderTotal;

    @ApiModelProperty(value = "订单总金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalOrderMoney;

    @ApiModelProperty(value = "实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalReceiveMoney;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java

@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -50,6 +52,7 @@

    @Excel(name = "订单金额", width = 30)
    @ApiModelProperty(value="订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -59,18 +62,22 @@

    @Excel(name = "优惠金额", width = 30)
    @ApiModelProperty(value="优惠金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal discountMoney;

    @Excel(name = "应付金额", width = 30)
    @ApiModelProperty(value="应付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @Excel(name = "订单实际支付金额", width = 30)
    @ApiModelProperty(value="订单实际支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @Excel(name = "订单未支付金额", width = 30)
    @ApiModelProperty(value="订单未支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unPaidMoney;

    @Excel(name = "订单来源", width = 30)

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
@@ -31,15 +33,19 @@
    private Integer serviceTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "周期订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal cycleMoney;

    @ApiModelProperty(value = "体验订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal experienceMoney;

    @ApiModelProperty(value = "服务订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal serviceMoney;

    @ApiModelProperty(value = "总人数")
@@ -61,6 +67,7 @@
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单金额value")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal[] orderMoneyValue;

    @ApiModelProperty(value = "商品类型数量")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalDataTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,6 +21,7 @@
    private String shopName;

    @ApiModelProperty(value = "营业额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal salesTotal;

    @ApiModelProperty(value = "总人数")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
@@ -40,24 +42,31 @@
    private Integer serviceTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "线上订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal onlineMoney;

    @ApiModelProperty(value = "线下订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal offlineMoney;

    @ApiModelProperty(value = "活动订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal activityMoney;

    @ApiModelProperty(value = "周期订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal cycleMoney;

    @ApiModelProperty(value = "体验订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal experienceMoney;

    @ApiModelProperty(value = "服务订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal serviceMoney;

    @ApiModelProperty(value = "订单数量key")
@@ -67,6 +76,7 @@
    private Integer[] orderTotalValue;

    @ApiModelProperty(value = "订单金额value")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal[] orderMoneyValue;

    @ApiModelProperty(value = "商品类型数量")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/StaffActivityOrderTotalVo.java

@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -19,6 +21,7 @@
    private Integer orderTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "周期订单数")

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -41,6 +41,7 @@
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
@@ -1307,7 +1308,11 @@
        merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
        merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
        merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
        merVerifyOrderVo.setReceivableMoney(order.getReceivableMoney());
        if(order.getPayType()==1){
            merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
        }else{
            merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
        }
        merVerifyOrderVo.setPayMoney(order.getPayMoney());
        merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
        merVerifyOrderVo.setCreateTime(order.getCreateTime());
@@ -1325,7 +1330,7 @@
                merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
            }
        }
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
        // 根据订单用户ID获取用户信息
        Member member = remoteMemberService.getMember(order.getUserId()).getData();
        merVerifyOrderVo.setUserId(order.getUserId());
@@ -1451,7 +1456,11 @@
        merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
        merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
        merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
        merVerifyOrderVo.setReceivableMoney(order.getReceivableMoney());
        if(order.getPayType()==1){
            merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
        }else{
            merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
        }
        merVerifyOrderVo.setPayMoney(order.getPayMoney());
        merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
        merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
@@ -1469,7 +1478,7 @@
                merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
            }
        }
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
        Member member = remoteMemberService.getMember(order.getUserId()).getData();
        merVerifyOrderVo.setUserId(order.getUserId());
        merVerifyOrderVo.setUserName(member.getRealName());
@@ -3190,10 +3199,39 @@
        if (memberGiftRecord == null || memberGiftRecord.getVerifyStatus() != 1) {
            throw new ServiceException(AppErrorConstant.COUPON_USED);
        }
        Shop shop = null;
        if (memberGiftRecord.getGiftFrom() == 1) {
            BirthdayCard birthdayCard = remoteMemberService.getBirthdayCard().getData();
            if(birthdayCard!=null){
                shop = remoteShopService.getShop(shopId).getData();
                //判断指定区域全部店铺
                if(birthdayCard.getAreaFlag()==2&&birthdayCard.getShopFlag()==1&&!StringUtils.checkString(birthdayCard.getDesignatedArea(),shop.getShopCityCode())){
                    throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
                }
                //判断指定店铺
                if(birthdayCard.getShopFlag()==2&&!StringUtils.checkString(birthdayCard.getApplicableShop(),shopId.toString())){
                    throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
                }
            }else{
                throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
            }
        }
        if (memberGiftRecord.getGiftFrom() == 2 && !memberGiftRecord.getShopId().equals(shopId)) {
            throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
        }
        Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
        if(member.getBindingFlag()==0){
            //绑定用户
            if(shop==null){
                shop = remoteShopService.getShop(shopId).getData();
            }
            AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
            appMemberBindingDto.setBindingFlag(1);
            appMemberBindingDto.setShopId(shopId);
            appMemberBindingDto.setShopName(shop.getShopName());
            appMemberBindingDto.setUserId(memberGiftRecord.getUserId());
            remoteMemberService.updateMemberBinding(appMemberBindingDto);
        }
        merVerifyAwardVo.setUserName(member.getRealName());
        merVerifyAwardVo.setUserMobile(member.getMobile());
        if (memberGiftRecord.getGiftFrom() == 1) {
@@ -3201,8 +3239,8 @@
        } else {
            merVerifyAwardVo.setGiftFrom("商户生日卡");
        }

        merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
        //礼物类型1优惠券2商品3现金4实物
        switch (memberGiftRecord.getGiftType()) {
            case 1:
                merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());

 ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -120,6 +120,7 @@
        <result column="discountMoney" property="discountMoney"/>
        <result column="payMoney" property="payMoney"/>
        <result column="orderFrom" property="orderFrom"/>
        <result column="orderStatus" property="orderStatus"/>
        <collection property="mgtOrderGoodsPageVoList" ofType="com.ruoyi.order.domain.vo.MgtOrderGoodsPageVo">
            <result column="goodsName" property="goodsName"/>
            <result column="buyNum" property="buyNum"/>
@@ -1551,7 +1552,13 @@
        toc.discount_money discountMoney,
        toc.receivable_money receivableMoney,
        toc.pay_money payMoney,
        CASE toc.order_from WHEN 1 THEN '小程序' WHEN 2 THEN CONCAT('秒杀活动(',toc.activity_name,')') WHEN 3 THEN '线下创建' END orderFrom
        CASE toc.order_from WHEN 1 THEN '小程序' WHEN 2 THEN CONCAT('秒杀活动(',toc.activity_name,')') WHEN 3 THEN '线下创建' END orderFrom,
        CASE toc.order_status
        WHEN 0 THEN "已取消"
        WHEN 1 THEN "待支付"
        WHEN 2 THEN "待核销"
        WHEN 3 THEN "已完成"
        END orderStatus
        FROM t_order toc
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
        WHERE toc.del_flag = 0 AND (toc.order_from = 1 OR toc.order_from = 3)

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/UserServiceRecordMapper.xml

@@ -123,17 +123,11 @@

    <select id="getMgtMemberServiceTotal" resultType="com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo">
        SELECT
        COUNT(temp.consumerGoodsId) cycleTotal,
        IFNULL(SUM(temp.cycleCount),0) cycleCount,
        IFNULL(SUM(temp.surpCycleCount),0) surpCycleCount
        FROM (SELECT
        tsrd.consumer_goods_id consumerGoodsId,
        IFNULL(SUM(tsrd.service_num),0) cycleCount,
        IFNULL(SUM(tsrd.surp_num),0) surpCycleCount
        FROM t_user_service_record tusr
        LEFT JOIN t_service_record_detail tsrd ON tsrd.record_id = tusr.id
        WHERE tusr.del_flag = 0 AND tusr.user_id = #{userId} AND tusr.service_type = 1
        GROUP BY tsrd.consumer_goods_id) AS temp
        COUNT(consumer_goods_id) cycleTotal,
        IFNULL(SUM(service_num),0) cycleCount,
        IFNULL(SUM(service_num-used_num),0) surpCycleCount
        FROM t_consumer_goods
        WHERE del_flag = 0 AND goods_type = 1 AND cycle_num_flag = 1 AND user_id = #{userId}
    </select>

    <select id="countShopServicePerson" resultType="java.lang.Integer">

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiShopApplication.java

@@ -18,7 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
//@EnableScheduling
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api"),@ComponentScan("com.ruoyi.common.security.utils")})
public class RuoYiShopApplication
{

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -193,9 +193,10 @@
        //验证商户名唯一
        Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
        if(mgtEditShopDto.getShopId()!=null){
            if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
            //取消验重
            /*if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
                throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
            }
            }*/
            shop = this.getById(mgtEditShopDto.getShopId());
            shop.setUpdateTime(new Date());
            shop.setUpdateUserId(mgtEditShopDto.getUserId());
@@ -214,9 +215,10 @@
                remoteMemberService.updateMemberShopName(mgtMemberShopNameDto);
            }
        }else{
            if(shopSame!=null){
            //取消验重
            /*if(shopSame!=null){
                throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
            }
            }*/
            shop.setDelFlag(0);
            shop.setShopStatus(3);
            shop.setCreateTime(new Date());
@@ -310,7 +312,7 @@
            //生成商户关联记录
            initNewShop(shop,mgtEditShopDto.getUserId());
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/shop?shopId="+shop.getShopId();
            String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("shop-"+shop.getShopId());
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java

@@ -90,7 +90,7 @@
            merStaffInfoVo.setShopCodeUrl(shop.getShopCode());
        }else{
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/shop?shopId="+shop.getShopId();
            String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("shop-"+shop.getShopId());
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopTotalServiceImpl.java

@@ -125,6 +125,7 @@
                shopTotal.setTotalCycleService(shopTotal.getTotalCycleService()+shopTotalChangeDto.getCycleService());
                shopTotal.setUseableCycleService(shopTotal.getUseableCycleService()+shopTotalChangeDto.getCycleService());
                shopTotal.setTotalCyclePerson(shopTotal.getTotalCyclePerson()+shopTotalChangeDto.getCyclePerson());
                shopTotal.setUseableCyclePerson(shopTotal.getUseableCyclePerson()+shopTotalChangeDto.getCyclePerson());
                serviceCount = serviceCount + shopTotalChangeDto.getCycleService();
            }
            haveService = true;
@@ -139,6 +140,7 @@
                shopTotal.setTotalServiceService(shopTotal.getTotalServiceService()+shopTotalChangeDto.getServiceService());
                shopTotal.setUseableServiceService(shopTotal.getUseableServiceService()+shopTotalChangeDto.getServiceService());
                shopTotal.setTotalServicePerson(shopTotal.getTotalServicePerson()+shopTotalChangeDto.getServicePerson());
                shopTotal.setUseableServicePerson(shopTotal.getUseableServicePerson()+shopTotalChangeDto.getServicePerson());
                serviceCount = serviceCount + shopTotalChangeDto.getServiceService();
            }
            haveService = true;
@@ -153,6 +155,7 @@
                shopTotal.setTotalExperienceService(shopTotal.getTotalExperienceService()+shopTotalChangeDto.getExperienceService());
                shopTotal.setUseableExperienceService(shopTotal.getUseableExperienceService()+shopTotalChangeDto.getExperienceService());
                shopTotal.setTotalExperiencePerson(shopTotal.getTotalExperiencePerson()+shopTotalChangeDto.getExperiencePerson());
                shopTotal.setUseableExperiencePerson(shopTotal.getUseableExperiencePerson()+shopTotalChangeDto.getExperiencePerson());
                serviceCount = serviceCount + shopTotalChangeDto.getExperienceService();
            }
            haveService = true;

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskRecordServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto;
import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto;
import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord;
@@ -81,6 +82,9 @@
     */
    @Override
    public List<MgtMemberFollowPageVo> pageMgtMemberFollow( MgtMemberTaskPageDto mgtMemberTaskPageDto){
        if(mgtMemberTaskPageDto.getTaskDate()==null){
            mgtMemberTaskPageDto.setTaskDate(DateUtils.getDate());
        }
        List<MgtMemberFollowPageVo> mgtMemberFollowPageVoList = memberTaskRecordMapper.pageMgtMemberFollow( mgtMemberTaskPageDto);
        if(mgtMemberFollowPageVoList!=null&&!mgtMemberFollowPageVoList.isEmpty()){
            Long followId;

 ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopCertificateMapper.xml

@@ -92,6 +92,7 @@
        <if test="param.status != null and param.status == 2">
            AND (cer_status = 0 OR  cer_status = 2)
        </if>
        ORDER BY create_time DESC
    </select>
    <select id="pageMgtShopCertificate" resultType="com.ruoyi.shop.domain.vo.MgtShopCertificatePageVo">
        SELECT
@@ -119,5 +120,6 @@
        <if test="param.createEndTime!=null and param.createEndTime!=''">
            AND Date(tsc.create_time) &lt;= #{param.createEndTime}
        </if>
        ORDER BY tsc.create_time DESC
    </select>
</mapper>

 ruoyi-modules/ruoyi-system/pom.xml

@@ -114,11 +114,11 @@
            <scope>test</scope>
        </dependency>

        <dependency>
        <!--<dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
            <version>2.3</version>
        </dependency>
        </dependency>-->
    </dependencies>

    <build>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java

@@ -16,7 +16,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@EnableScheduling
//@EnableScheduling
public class RuoYiSystemApplication
{
    public static void main(String[] args)

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtStaffPageVo.java

@@ -18,6 +18,9 @@
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "部门id")
    private Long deptId;
    /**
     * 员工姓名
     */

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysMenuMapper.java

@@ -117,6 +117,14 @@
    public List<SysMenu> selectMenuTreeByUserId(Long userId);

    /**
     * 根据用户ID查询菜单
     *
     * @param userId 用户ID
     * @return 菜单列表
     */
    public List<SysMenu> selectStaffMenuTreeByUserId(Long userId);

    /**
     * 根据角色ID查询菜单树信息
     * 
     * @param roleId 角色ID

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysClassificationServiceImpl.java

@@ -147,7 +147,8 @@
        LambdaQueryWrapper<SysClassification> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(SysClassification::getDelFlag,0)
                .eq(SysClassification::getClassType,classType)
                .orderByDesc(SysClassification::getClassSort);
                .orderByDesc(SysClassification::getClassSort)
                .orderByDesc(SysClassification::getCreateTime);
        List<SysClassification> sysClassificationList = this.list(queryWrapper);
        List<AppClassListVo> classListVos = sysClassificationList.stream().map(sysClassification ->{
            AppClassListVo appClassListVo = new AppClassListVo();

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysMenuServiceImpl.java

@@ -208,9 +208,11 @@
        {
            menus = menuMapper.selectMenuTreeAll();
        }
        else
        else if(userId.equals(1L)||userId.equals(2L))
        {
            menus = menuMapper.selectMenuTreeByUserId(userId);
        }else{
            menus = menuMapper.selectStaffMenuTreeByUserId(userId);
        }
        return getChildPerms(menus, 0);
    }

 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/staff/SysStaffMapper.xml

@@ -39,6 +39,7 @@
    <select id="pageMgtStaff" resultType="com.ruoyi.system.domain.vo.MgtStaffPageVo">
        SELECT
        su.user_id userId,
        su.dept_id deptId,
        tss.staff_name staffName,
        tss.staff_mobile staffMobile,
        tss.staff_email staffEmail,

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/sys/SysMenuMapper.xml

@@ -151,6 +151,14 @@
        where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0'  AND ro.status = 0 AND menu_from = 1
        order by m.parent_id, m.order_num
    </select>

    <select id="selectStaffMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
        from sys_menu m
                 left join sys_user_menu rm on m.menu_id = rm.menu_id
        where rm.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0' AND m.menu_from = 1
        order by m.parent_id, m.order_num
    </select>
    
    <select id="selectMenuListByRoleId" resultType="Long">
        select m.menu_id

 ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -14,12 +14,12 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
      config:
        # 配置中心地址
        server-addr: 47.109.78.184:5000
        #server-addr: 127.0.0.1:8848
        #server-addr: 47.109.78.184:5000
        server-addr: 127.0.0.1:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置