拆分订单和商品服务

jiangqs

2023-05-23 687dbd8e6ababc010a3da5503b95cd62cecf9f02

拆分订单和商品服务

 pom.xml

@@ -207,6 +207,7 @@
                <version>${ruoyi.version}</version>
            </dependency>


            <!-- lombok -->
            <dependency>
                <groupId>org.projectlombok</groupId>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShopGoodsGetDto.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.system.api.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShopGoodsGetDto
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@Data
public class AppShopGoodsGetDto {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商户id")
    private Long shopId;


}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AppShoppingCartDelDto.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.system.api.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShoppingCartDelDto
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@Data
public class AppShoppingCartDelDto {


    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "用户id")
    private Long userId;
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/Goods.java

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

import java.math.BigDecimal;
import java.util.Date;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/GoodsFile.java

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/goods/ShopGoods.java

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

import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;

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

@@ -1,19 +1,12 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteActivityService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 活动服务

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

@@ -1,15 +1,12 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;


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

@@ -6,7 +6,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.domain.poji.sys.SysFile;

/**

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

New file
@@ -0,0 +1,51 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
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.service.RemoteGoodsService;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * @author jqs34
 * @ClassName RemoteGoodsFallbackFactory
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@Component
public class RemoteGoodsFallbackFactory implements FallbackFactory<RemoteGoodsService> {

    private static final Logger log = LoggerFactory.getLogger(RemoteMemberFallbackFactory.class);

    @Override
    public RemoteGoodsService create(Throwable throwable)
    {
        log.error("商品服务调用失败:{}", throwable.getMessage());
        return new RemoteGoodsService()
        {


            @Override
            public R<Goods> getGoods(String goodsId) {
                return R.fail("获取商品失败:" + throwable.getMessage());
            }

            @Override
            public R<GoodsFile> getGoodsFile(String goodsId) {
                return R.fail("获取商品图片失败:" + throwable.getMessage());
            }

            @Override
            public R<ShopGoods> getShopGoods(AppShopGoodsGetDto appShopGoodsGetDto) {
                return R.fail("获取商户商品失败:" + throwable.getMessage());
            }
        };
    }
}

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

@@ -5,7 +5,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteLogService;
import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysLogininfor;
import com.ruoyi.system.api.domain.poji.sys.SysOperLog;


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

@@ -1,23 +1,17 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.sys.SysFile;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.QwUserDetailDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;


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

@@ -1,8 +1,7 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.slf4j.Logger;

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

@@ -1,8 +1,7 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteShopService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import org.slf4j.Logger;

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

New file
@@ -0,0 +1,36 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
import com.ruoyi.system.api.service.RemoteShoppingCartService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * @author jqs34
 * @ClassName RemoteShoppingCartFallbackFactory
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@Component
public class RemoteShoppingCartFallbackFactory implements FallbackFactory<RemoteShoppingCartService> {

    private static final Logger log = LoggerFactory.getLogger(RemoteMemberFallbackFactory.class);

    @Override
    public RemoteShoppingCartService create(Throwable throwable)
    {
        log.error("购物车服务调用失败:{}", throwable.getMessage());
        return new RemoteShoppingCartService()
        {

            @Override
            public R deleteShoppingCart(AppShoppingCartDelDto appShoppingCartDelDto) {
                return R.fail("删除购物车户失败:" + throwable.getMessage());
            }
        };
    }
}

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

@@ -8,7 +8,7 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;

/**

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteActivityService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
@@ -16,7 +16,7 @@
 * @description: TODO
 * @date 2023 2023/4/30 15:12
 */
@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
@FeignClient(contextId = "remoteActivityService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteActivityFallbackFactory.class)
public interface RemoteActivityService {

    @PostMapping("/activity/getActivityGoods")

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteConfigService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;

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

New file
@@ -0,0 +1,34 @@
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
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.factory.RemoteGoodsFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author jqs34
 * @ClassName RemoteGoodsService
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@FeignClient(contextId = "remoteGoodsService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteGoodsFallbackFactory.class)
public interface RemoteGoodsService {



    @PostMapping("/goods/getGoods")
    public R<Goods> getGoods(@RequestBody String goodsId);

    @PostMapping("/goods/getGoodsFile")
    public R<GoodsFile> getGoodsFile(@RequestBody String goodsId);

    @PostMapping("/goods/getShopGoods")
    public R<ShopGoods> getShopGoods(@RequestBody AppShopGoodsGetDto appShopGoodsGetDto);
}

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteMemberService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
@@ -7,10 +7,8 @@
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory;
import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.QwUserDetailDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteOrderService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteShopService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;

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

New file
@@ -0,0 +1,23 @@
package com.ruoyi.system.api.service;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
import com.ruoyi.system.api.factory.RemoteShoppingCartFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author jqs34
 * @ClassName RemoteShoppingCartService
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@FeignClient(contextId = "remoteShoppingCartService", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = RemoteShoppingCartFallbackFactory.class)
public interface RemoteShoppingCartService {

    @PostMapping("/shoppingCart/deleteShoppingCart")
    public R deleteShoppingCart(@RequestBody AppShoppingCartDelDto appShoppingCartDelDto);
}

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

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.api;
package com.ruoyi.system.api.service;

import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;

 ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,10 @@
com.ruoyi.system.api.factory.RemoteUserFallbackFactory
com.ruoyi.system.api.factory.RemoteLogFallbackFactory
com.ruoyi.system.api.factory.RemoteActivityFallbackFactory
com.ruoyi.system.api.factory.RemoteConfigFallbackFactory
com.ruoyi.system.api.factory.RemoteFileFallbackFactory
com.ruoyi.system.api.factory.RemoteMemberFallbackFactory
com.ruoyi.system.api.factory.RemoteOrderFallbackFactory
com.ruoyi.system.api.factory.RemoteShopFallbackFactory
com.ruoyi.system.api.factory.RemoteUserFallbackFactory
com.ruoyi.system.api.factory.RemoteMemberFallbackFactory

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -1,7 +1,7 @@
package com.ruoyi.auth.service;

import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteShopService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;

/**

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java

@@ -6,7 +6,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.system.api.RemoteLogService;
import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysLogininfor;

/**

 ruoyi-auth/src/main/resources/banner.txt

File was deleted

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -27,4 +27,6 @@
    public static final String SHOP_SERVICE = "ruoyi-shop";

    public static final String ORDER_SERVICE = "ruoyi-order";

    public static final String GOODS_SERVICE = "ruoyi-goods";
}

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java

@@ -4,7 +4,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.system.api.RemoteLogService;
import com.ruoyi.system.api.service.RemoteLogService;
import com.ruoyi.system.api.domain.poji.sys.SysOperLog;

/**

 ruoyi-gateway/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/pom.xml

@@ -16,6 +16,7 @@
        <module>ruoyi-member</module>
        <module>ruoyi-shop</module>
        <module>ruoyi-order</module>
        <module>ruoyi-goods</module>
    </modules>

    <artifactId>ruoyi-modules</artifactId>

 ruoyi-modules/ruoyi-file/pom.xml

@@ -59,6 +59,7 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-system</artifactId>
        </dependency>

        
        <!-- RuoYi Common Swagger -->
        <dependency>

 ruoyi-modules/ruoyi-file/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-goods/pom.xml

New file
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
        <version>3.6.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
	
    <artifactId>ruoyi-modules-goods</artifactId>

    <description>
        ruoyi-modules-goods商品模块
    </description>
	
    <dependencies>
    	
        <!-- SpringCloud Alibaba Nacos -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
        </dependency>
        
        <!-- SpringCloud Alibaba Nacos Config -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
        </dependency>
        
        <!-- SpringCloud Alibaba Sentinel -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
        </dependency>
        
        <!-- SpringBoot Actuator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
		
        <!-- Swagger UI -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
            <version>${swagger.fox.version}</version>
        </dependency>
		
        <!-- Mysql Connector -->
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>
        
        <!-- RuoYi Common DataSource -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-datasource</artifactId>
        </dependency>
        
        <!-- RuoYi Common DataScope -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-datascope</artifactId>
        </dependency>
        
        <!-- RuoYi Common Log -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-log</artifactId>
        </dependency>
        
        <!-- RuoYi Common Swagger -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-swagger</artifactId>
        </dependency>

        <!-- lombok -->
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.1</version>
            <!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
            <exclusions>
                <exclusion>
                    <groupId>com.github.jsqlparser</groupId>
                    <artifactId>jsqlparser</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-annotation</artifactId>
            <version>3.4.1</version>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generate</artifactId>
            <version>2.3</version>
        </dependency>


    </dependencies>

    <build>
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
   
</project>

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

New file
@@ -0,0 +1,37 @@
package com.ruoyi.goods;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans;

/**
 * 商品模块
 * 
 * @author jqs
 */
@EnableCustomConfig
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api")})
public class RuoYiGoodsApplication
{
    public static void main(String[] args)
    {
        SpringApplication.run(RuoYiGoodsApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  商品模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                " .-------.       ____     __        \n" +
                " |  _ _   \\      \\   \\   /  /    \n" +
                " | ( ' )  |       \\  _. /  '       \n" +
                " |(_ o _) /        _( )_ .'         \n" +
                " | (_,_).' __  ___(_ o _)'          \n" +
                " |  |\\ \\  |  ||   |(_,_)'         \n" +
                " |  | \\ `'   /|   `-'  /           \n" +
                " |  |  \\    /  \\      /           \n" +
                " ''-'   `'-'    `-..-'              ");
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MyBatisPlusConfig.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.goods.config;


import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * @author jqs34
 * @ClassName MyBatisPlusConfig
 * @description: TODO
 * @date 2023年05月09日
 * @version: 1.0
 */

@Configuration
public class MyBatisPlusConfig {

    /**
     * MyBatisPlus拦截器（用于分页）
     */
    @Bean
    @ConditionalOnMissingBean
    public PaginationInterceptor paginationInterceptor() {
        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
        return paginationInterceptor;
    }



}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerGoodsController.java
@@ -1,14 +1,14 @@
package com.ruoyi.order.controller.business;
package com.ruoyi.goods.controller.business;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.AppConsumerPageDto;
import com.ruoyi.order.domain.dto.MerGoodsPageDto;
import com.ruoyi.order.domain.dto.MerShopGoodsEditDto;
import com.ruoyi.order.domain.vo.AppConsumerPageVo;
import com.ruoyi.order.domain.vo.MerGoodsPageVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.goods.domain.dto.AppConsumerPageDto;
import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
import com.ruoyi.goods.domain.dto.MerShopGoodsEditDto;
import com.ruoyi.goods.domain.vo.AppConsumerPageVo;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/ActivityController.java
@@ -1,8 +1,7 @@
package com.ruoyi.order.controller.concole;
package com.ruoyi.goods.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +21,7 @@
public class ActivityController {



    @Autowired
    private ActivityGoodsService activityGoodsService;


 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java

New file
@@ -0,0 +1,59 @@
package com.ruoyi.goods.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.goods.GoodsFileService;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShopGoodsService;
import com.ruoyi.system.api.domain.dto.AppShopGoodsGetDto;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
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 org.springframework.beans.factory.annotation.Autowired;
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;

/**
 * @author jqs34
 * @ClassName GoodsController
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@RestController
@RequestMapping("/goods")
public class GoodsController {

    @Autowired
    private GoodsService goodsService;

    @Autowired
    private GoodsFileService goodsFileService;

    @Autowired
    private ShopGoodsService shopGoodsService;

    @PostMapping("/getGoods")
    public R<Goods> getGoods(@RequestBody String goodsId)
    {
        Goods goods = goodsService.getById(goodsId);
        return R.ok(goods);
    }

    @PostMapping("/getGoodsFile")
    public R<GoodsFile> getGoodsFile(@RequestBody String goodsId)
    {
        GoodsFile goodsFile = goodsFileService.getGoodsPicture(goodsId);
        return R.ok(goodsFile);
    }

    @PostMapping("/getShopGoods")
    public R<ShopGoods> getShopGoods(@RequestBody AppShopGoodsGetDto appShopGoodsGetDto)
    {
        ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appShopGoodsGetDto.getShopId(),appShopGoodsGetDto.getGoodsId());
        return R.ok(shopGoods);
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.goods.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.AppShoppingCartDelDto;
import org.springframework.beans.factory.annotation.Autowired;
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  com.ruoyi.goods.service.goods.ShoppingCartService;
/**
 * @author jqs34
 * @ClassName ShoppingCartController
 * @description: TODO
 * @date 2023年05月23日
 * @version: 1.0
 */
@RestController
@RequestMapping("/shoppingCart")
public class ShoppingCartController {

    @Autowired
    private ShoppingCartService shoppingCartService;

    @PostMapping("/deleteShoppingCart")
    public R deleteShoppingCart(@RequestBody AppShoppingCartDelDto appShoppingCartDelDto)
    {
        shoppingCartService.deleteByUserIdAndGoodsId(appShoppingCartDelDto.getUserId(),appShoppingCartDelDto.getGoodsId());
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppGoodsController.java
@@ -1,20 +1,19 @@
package com.ruoyi.order.controller.miniapp;
package com.ruoyi.goods.controller.miniapp;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseDto;
import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -1,18 +1,17 @@
package com.ruoyi.order.controller.miniapp;
package com.ruoyi.goods.controller.miniapp;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

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

New file
@@ -0,0 +1,28 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @version 1.0
 * @classname AppBuyNowDto
 * @description: TODO
 * @date 2023 2023/5/2 20:52
 */

@Data
public class AppBuyGoodsDto extends AppBaseDto {


    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;

    @ApiModelProperty(value = "用户优惠券id")
    private Long userCouponId;

}

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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppConsumerPageDto
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppConsumerPageDto extends AppPageDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty("商品类型1周期2服务3体验4单品")
    private Integer goodsType;
}

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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppGoodsInfoGetDto
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppGoodsInfoGetDto extends AppBaseGetDto {

    @ApiModelProperty(value = "是否活动跳转0否1是")
    private Integer activityFlag;

    @ApiModelProperty(value = "商户id",hidden = true)
    private Long shopId;
}

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

New file
@@ -0,0 +1,31 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author jqs34
 * @version 1.0
 * @classname AppShoppingcartDto
 * @description: TODO
 * @date 2023 2023/5/2 20:54
 */
@Data
public class AppPlaceOrderDto extends AppBaseDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

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

    @ApiModelProperty(value = "订单备注")
    private String orderRemark;

    @ApiModelProperty(value = "购物车列表")
    List<AppBuyGoodsDto> appBuyGoodsDtoList;

}

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

New file
@@ -0,0 +1,23 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShopGoodsPageDto
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppSearchGoodsPageDto extends AppPageDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;

}

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

New file
@@ -0,0 +1,31 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShopGoodsPageDto
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppShopGoodsPageDto extends AppPageDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品分类id")
    private Long goodsClassId;

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

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShoppingCartAddDto
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */
@Data
public class AppShoppingCartAddDto extends AppBaseDto {

    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;
}

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppShoppingCartAddDto
 * @description: TODO
 * @date 2023年04月26日
 * @version: 1.0
 */
@Data
public class AppShoppingCartChangeDto extends AppBaseDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "购物车id")
    private Long shoppingCartId;

    @ApiModelProperty(value = "变化后数量")
    private Integer buyNum;
}

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author jqs34
 * @version 1.0
 * @classname AppShoppingcartDto
 * @description: TODO
 * @date 2023 2023/5/2 20:54
 */
@Data
public class AppSureOrderDto extends AppBaseDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "购物车列表")
    List<AppBuyGoodsDto> appBuyGoodsDtoList;

}

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppUserOrderPageDto
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppUserOrderPageDto extends AppPageDto {

    @ApiModelProperty(value = "shopId",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;
}

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

New file
@@ -0,0 +1,27 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName MerCloseOrderDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerCloseOrderDto extends MerBaseDto {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value = "支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty(value = "支付备注")
    private String payRemark;
}

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

New file
@@ -0,0 +1,23 @@
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;

/**
 * @author jqs34
 * @ClassName MerConsumerGoodsDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerConsumerGoodsDto extends MerBaseDto {

    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty("商品类型1周期2服务3体验")
    private Integer goodsType;
}

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

New file
@@ -0,0 +1,23 @@
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;

/**
 * @author jqs34
 * @ClassName MerConsumerGoodsDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerConsumerGoodsPageDto extends MerPageDto {

    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty("商品类型1周期2服务3体验")
    private Integer goodsType;
}

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

New file
@@ -0,0 +1,23 @@
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;

/**
 * @author jqs34
 * @ClassName MerGoodsPageDto
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerGoodsPageDto extends MerPageDto {

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;
}

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

New file
@@ -0,0 +1,21 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerMemberNoClearOrderDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerMemberNoClearOrderDto extends MerPageDto {


    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

}

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

New file
@@ -0,0 +1,40 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author jqs34
 * @ClassName MerNewOrderDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerNewOrderDto extends MerBaseDto {

    @ApiModelProperty(value = "购买用户id")
    private Long buyUserId;

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "手机号")
    private String mobile;

    @ApiModelProperty(value = "购买列表")
    private List<AppBuyGoodsDto> appBuyGoodsDtoList;

    @ApiModelProperty(value = "支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty(value = "支付方式")
    private Integer payType;

    @ApiModelProperty(value = "订单备注")
    private String orderRemark;
}

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

New file
@@ -0,0 +1,36 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerMemberNoClearOrderDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerOrderPageDto extends MerPageDto {



    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;

    @ApiModelProperty(value = "1.全部2.待核销3.已核销")
    private Integer type;

    @ApiModelProperty(value = "订单开始时间")
    private String startOrderDate;

    @ApiModelProperty(value = "订单结束时间")
    private String endOrderDate;

    @ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
    private Integer orderFrom;
}

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

New file
@@ -0,0 +1,21 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppConsumerPageDto
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class MerServiceRecordPageDto extends MerPageDto {


    @ApiModelProperty("会员用户id")
    private Long memberUserId;
}

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

New file
@@ -0,0 +1,28 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName MerShopGoodsEditDto
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerShopGoodsEditDto extends MerBaseDto {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "售价")
    private BigDecimal salePrice;

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

}

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author jqs34
 * @ClassName MerSureConsumerGoodsDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerSureConsumerGoodsDto extends MerBaseDto {

    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(value = "确认服务列表")
    private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;

}

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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.goods.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerSureConsumerGoodsListDto
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerSureConsumerGoodsListDto {


    @ApiModelProperty(value = "服务id")
    private String consumerGoodsId;

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

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

New file
@@ -0,0 +1,19 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerVerifyCodeDto
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyCodeDto extends MerBaseDto {

    @ApiModelProperty(value = "核销码")
    private String verifyCode;
}

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

New file
@@ -0,0 +1,27 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName MerVerifyCodeDto
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyOrderDto extends MerBaseDto {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value = "实收金额")
    private BigDecimal relReceiveMoney;

    @ApiModelProperty(value = "实收金额")
    private BigDecimal relPayMoney;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelNurse.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelNurse.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo.goods;
package com.ruoyi.goods.domain.pojo.goods;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsRelTag.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsRelTag.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo.goods;
package com.ruoyi.goods.domain.pojo.goods;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/GoodsTotal.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/goods/GoodsTotal.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo.goods;
package com.ruoyi.goods.domain.pojo.goods;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/goods/ShoppingCart.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/ShoppingCart.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.domain.pojo.order;
package com.ruoyi.goods.domain.pojo.goods;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppConsumerPageVo.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppConsumerPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppConsumerPageVo {

    @ApiModelProperty("服务id")
    private String consumerGoodsId;

    @ApiModelProperty("服务状态-1删除1未完成2完成")
    private Integer serviceStatus;

    @ApiModelProperty("商户id")
    private Long shopId;

    @ApiModelProperty("商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty("商品名称")
    private String goodsName;

    @ApiModelProperty("商品图片")
    private String goodsPicture;

    @ApiModelProperty("商品调理问题")
    private String goodsNurses;

    @ApiModelProperty("周期标记")
    private Integer cycleNumFlag;

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

    @ApiModelProperty("消耗次数")
    private Integer usedNum;

}

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

New file
@@ -0,0 +1,68 @@
package com.ruoyi.goods.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author jqs34
 * @ClassName AppGoodsInfoVo
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppGoodsInfoVo {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品视频")
    private String goodsVideo;

    @ApiModelProperty(value = "商品banner")
    private String goodsBanners;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    private BigDecimal goodsNurses;

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

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "商品详情")
    private String goodsDetail;

    @ApiModelProperty(value = "销售数量")
    private Integer salesNum;

    @ApiModelProperty(value = "是否活动跳转0否1是")
    private Integer activityFlag;

    @ApiModelProperty(value = "商品活动价")
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "售罄标记0否1是")
    private Integer sellOutFlag;

    @ApiModelProperty(value = "活动截止时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date activityDeadline;
}

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

New file
@@ -0,0 +1,58 @@
package com.ruoyi.goods.domain.vo;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName AppResettlement
 * @description: TODO
 * @date 2023年02月27日
 * @version: 1.0
 */
@Data
public class AppPlaceOrderVo {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value = "订单编号")
    private String orderNo;

    @ApiModelProperty(value = "支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty(value = "未支付金额")
    private BigDecimal unpaidMoney;

    @ApiModelProperty(value = "支付截止时间")
    private String payDeadlineTime;

    @ApiModelProperty(value = "appId")
    private String appId;

    @ApiModelProperty(value = "商户号")
    private String mchId;

    @ApiModelProperty(value = "时间戳")
    private String timeStamp;

    @ApiModelProperty(value = "随机串防重发")
    private String nonceStr;

    @ApiModelProperty(value = "package")
    @JsonProperty("package")
    private String packageStr;

    @ApiModelProperty(value = "签名方式")
    private String tradeType;

    @ApiModelProperty(value = "签名")
    private String paySign;

    @ApiModelProperty(value = "预支付回话标识")
    private String prepayId;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppServiceRecordPageVo.java

New file
@@ -0,0 +1,31 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author jqs34
 * @ClassName AppServiceRecordPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppServiceRecordPageVo {


    @ApiModelProperty("服务名称")
    private String consumerGoodsNames;

    @ApiModelProperty("服务类型1.周期2.服务3.体验")
    private Integer serviceType;

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

}

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

New file
@@ -0,0 +1,48 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName AppShoppingCartVo
 * @description: TODO
 * @date 2023年05月06日
 * @version: 1.0
 */
@Data
public class AppShoppingCartVo {

    @ApiModelProperty(value = "购物车id")
    private Long shoppingCartId;

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    private String goodsNurses;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;

}

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

New file
@@ -0,0 +1,55 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName AppSimpleGoodsVo
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppSimpleActivityGoodsVo {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    private BigDecimal goodsNurses;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "商品活动价")
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "活动销售数量")
    private Integer activityNumber;

    @ApiModelProperty(value = "已售数量")
    private Integer salesNumber;

    @ApiModelProperty(value = "已售比例")
    private BigDecimal salesPercent;


}

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

New file
@@ -0,0 +1,43 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName AppSimpleGoodsVo
 * @description: TODO
 * @date 2023年04月20日
 * @version: 1.0
 */
@Data
public class AppSimpleGoodsVo {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品调理问题")
    private String goodsNurses;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;


}

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

New file
@@ -0,0 +1,62 @@
package com.ruoyi.goods.domain.vo;

import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author jqs34
 * @version 1.0
 * @classname AppSureOrderGoodsVo
 * @description: TODO
 * @date 2023 2023/5/2 21:07
 */
@Data
public class AppSureOrderGoodsVo {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;

    @ApiModelProperty(value = "优惠券id")
    private Long userCouponId;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal goodsTotalPrice;

    @ApiModelProperty(value = "商品订金")
    private BigDecimal goodsDeposit;

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

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "商品实际价格")
    private BigDecimal goodsRealPrice;

    @ApiModelProperty(value = "优惠券列表")
    private List<AppUserCouponVo> appUserCouponVoList;

}

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

New file
@@ -0,0 +1,39 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author jqs34
 * @version 1.0
 * @classname AppSureOrderVo
 * @description: TODO
 * @date 2023 2023/5/2 20:57
 */
@Data
public class AppSureOrderVo {


    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "订单支付订金")
    private BigDecimal orderPayDeposit;

    @ApiModelProperty(value = "订单支付金额")
    private BigDecimal orderPayMoney;

    @ApiModelProperty(value = "订单商品列表")
    List<AppSureOrderGoodsVo> appSureOrderGoodsVoList;





}

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

New file
@@ -0,0 +1,82 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @author jqs34
 * @ClassName AppUserOrderPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppUserOrderGetVo {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty("应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("应收订金")
    private BigDecimal receivableDeposit;

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

    @ApiModelProperty("订单支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty("商户id")
    private Long shopId;

    @ApiModelProperty("商户名称")
    private String shopName;

    @ApiModelProperty(value = "是否绑定商户0否1是")
    private Integer sameShop;

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

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

    @ApiModelProperty("核销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useTime;

    @ApiModelProperty("取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date cancelTime;

    @ApiModelProperty("订单备注")
    private String orderRemark;

    @ApiModelProperty(value = "核销码")
    private String verifyCode;
}

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

New file
@@ -0,0 +1,50 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName AppUserOrderPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppUserOrderGoodsPageVo {

    @ApiModelProperty("订单商品id")
    private String orderGoodsId;

    @ApiModelProperty("商品id")
    private String goodsId;

    @ApiModelProperty("商品名称")
    private String goodsName;

    @ApiModelProperty("商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "购买数量")
    private Integer buyNum;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "商品实际价格")
    private BigDecimal goodsRealPrice;

    @ApiModelProperty("周期标记")
    private Integer cycleNumFlag;

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


}

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

New file
@@ -0,0 +1,56 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * @author jqs34
 * @ClassName AppUserOrderPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class AppUserOrderPageVo {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty("订单来源1.商城订单2.秒杀活动3.线下创建")
    private Integer orderFrom;

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

    @ApiModelProperty("订单支付金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("商品数量")
    private Integer goodsNum;

    @ApiModelProperty("商户id")
    private Long shopId;

    @ApiModelProperty("商户名称")
    private String shopName;

    @ApiModelProperty("商户服务电话")
    private String shopServicePhone;

    @ApiModelProperty(value = "是否绑定商户0否1是")
    private Integer sameShop;

    @ApiModelProperty(value = "核销码")
    private String verifyCode;

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsListVo.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerConsumerGoodsVo
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerConsumerGoodsListVo {

    @ApiModelProperty("服务id")
    private String consumerGoodsId;

    @ApiModelProperty("服务状态-1删除1未完成2完成")
    private Integer serviceStatus;

    @ApiModelProperty("商户id")
    private Long shopId;

    @ApiModelProperty("商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty("商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty("商品图片")
    private String goodsPicture;

    @ApiModelProperty("商品调理问题")
    private String goodsNurses;

    @ApiModelProperty("周期标记")
    private Integer cycleNumFlag;

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

    @ApiModelProperty("消耗次数")
    private Integer usedNum;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerConsumerGoodsVo.java

New file
@@ -0,0 +1,25 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author jqs34
 * @ClassName MerConsumerGoodsVo
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerConsumerGoodsVo {

    @ApiModelProperty("未确认商品")
    private List<MerConsumerGoodsListVo> noSureList;

    @ApiModelProperty("确认商品")
    private List<MerConsumerGoodsListVo> sureList;


}

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

New file
@@ -0,0 +1,54 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName MerGoodsPageVo
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerGoodsPageVo {

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "商品标签")
    private String goodsTag;

    @ApiModelProperty(value = "商品图片")
    private String goodsPicture;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品调理问题")
    private String goodsNurses;

    @ApiModelProperty(value = "商品建议售价")
    private BigDecimal suggestSalesPrice;;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesPrice;;

    @ApiModelProperty("周期次数标记0否1是")
    private Integer cycleNumFlag;

    @ApiModelProperty(value = "商品默认服务次数")
    private Integer defaultServiceNum;;

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

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

New file
@@ -0,0 +1,51 @@
package com.ruoyi.goods.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @author jqs34
 * @ClassName MerMemberUnclearOrder
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerMemberNoClearOrderVo {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty("订单状态")
    private Integer orderStatus;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty("应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("应收订金")
    private BigDecimal receivableDeposit;

    @ApiModelProperty("订单实际支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty("订单未支付金额")
    private BigDecimal unPaidMoney;

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

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerOrderGoodsPageVo.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerOrderGoodsVo
 * @description: TODO
 * @date 2023年05月06日
 * @version: 1.0
 */
@Data
public class MerOrderGoodsPageVo {

    @ApiModelProperty("商品名字")
    private String goodsName;

    @ApiModelProperty("购买数量")
    private Integer buyNum;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;
}

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

New file
@@ -0,0 +1,73 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @author jqs34
 * @ClassName MerMemberUnclearOrder
 * @description: TODO
 * @date 2023年05月05日
 * @version: 1.0
 */
@Data
public class MerOrderPageVo {

    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "用户姓名")
    private String userName;

    @ApiModelProperty(value = "用户电话")
    private String userMobile;

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty("应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("应收订金")
    private BigDecimal receivableDeposit;

    @ApiModelProperty("订单实际支付金额")
    private BigDecimal payMoney;

    @ApiModelProperty("订单未支付金额")
    private BigDecimal unPaidMoney;

    @ApiModelProperty("订单备注")
    private String orderRemark;

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

    @ApiModelProperty("订单来源")
    private Integer orderFrom;

    @ApiModelProperty("订单来源")
    private String orderFromDesc;

    @ApiModelProperty("订单商品列表")
    private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerServiceRecordPageVo.java

New file
@@ -0,0 +1,30 @@
package com.ruoyi.goods.domain.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author jqs34
 * @ClassName AppServiceRecordPageVo
 * @description: TODO
 * @date 2023年05月03日
 * @version: 1.0
 */
@Data
public class MerServiceRecordPageVo {


    @ApiModelProperty("服务名称")
    private String consumerGoodsNames;

    @ApiModelProperty("服务类型1.周期2.服务3.体验")
    private Integer serviceType;

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

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyAwardVo.java

New file
@@ -0,0 +1,14 @@
package com.ruoyi.goods.domain.vo;

import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerVerifyAwardVo
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyAwardVo {
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCodeVo.java

New file
@@ -0,0 +1,28 @@
package com.ruoyi.goods.domain.vo;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerVerifyCodeDto
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyCodeVo{

    @ApiModelProperty(value = "核销类型1订单2优惠券3奖品")
    private Integer verifyType;

    @ApiModelProperty(value = "核销订单信息")
    private MerVerifyOrderVo merVerifyOrderVo;

    @ApiModelProperty(value = "核销优惠券信息")
    private MerVerifyCouponVo merVerifyCouponVo;

    @ApiModelProperty(value = "核销奖品信息")
    private MerVerifyAwardVo merVerifyAwardVo;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/MerVerifyCouponVo.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.goods.domain.vo;

import lombok.Data;

/**
 * @author jqs34
 * @ClassName MerVerifyCouponVo
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyCouponVo {

}

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

New file
@@ -0,0 +1,75 @@
package com.ruoyi.goods.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @author jqs34
 * @ClassName MerVerifyOrderVo
 * @description: TODO
 * @date 2023年05月04日
 * @version: 1.0
 */
@Data
public class MerVerifyOrderVo {

    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty("应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty("应收订金")
    private BigDecimal receivableDeposit;

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

    @ApiModelProperty("订单支付金额")
    private BigDecimal payMoney;

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

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

    @ApiModelProperty("核销时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useTime;

    @ApiModelProperty("订单备注")
    private String orderRemark;

    @ApiModelProperty(value = "用户姓名")
    private String userName;

    @ApiModelProperty(value = "用户电话")
    private String userMobile;

    @ApiModelProperty("结清标记0否1是")
    private Integer closeFlag;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ParamsAuthFilter.java

New file
@@ -0,0 +1,103 @@
package com.ruoyi.goods.fliter;


import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.utils.StringUtils;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Component;

import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;

@Component
@Log4j2
public class ParamsAuthFilter implements Filter {

    // 令牌自定义标识
    //@Value("${token.header}")
    private String header = "Authorization";


    @Override
    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
        HttpServletRequest request = (HttpServletRequest) servletRequest;
        HttpServletResponse response = (HttpServletResponse) servletResponse;

        RepeatedlyRequestWrapper wrapper = new RepeatedlyRequestWrapper(request, response);
        getRequestParams(wrapper);

        ResponseWrapper responseWrapper = new ResponseWrapper(response);
        filterChain.doFilter(wrapper, responseWrapper);

        // 返回的结果
        String content = responseWrapper.getTextContent();
        String requestUrl = request.getRequestURI();
        log.info("-------------------- Response Data ----------------------");
        log.info(requestUrl + " -> " + content);

        response.getOutputStream().write(content.getBytes());
    }


    private void getRequestParams(HttpServletRequest request){
        Map<String, String> params = getUrlParams(request);
        try {
            String requestUrl = request.getRequestURI();
            Map<String, String> urlParams = getUrlParams(request);
            Map<String, String> bodyParams = getBodyParams(request);

            params.putAll(urlParams);
            params.putAll(bodyParams);
            log.info("-------------------- request header ----------------------");
            log.info(header + " -> " + request.getHeader(header));
            log.info("-------------------- request params ----------------------");
            log.info(requestUrl + " -> " + JSONObject.toJSONString(params));

        }catch (Exception e){
            e.printStackTrace();
        }
    }

    private Map<String, String> getBodyParams(HttpServletRequest request) throws IOException {
        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(request.getInputStream()));
        StringBuilder stringBuilder = new StringBuilder();
        String buffer = "";
        while((buffer  = bufferedReader.readLine()) != null){
            stringBuilder.append(buffer);
        }
        String requestBodyStr = stringBuilder.toString();
        if(StringUtils.isNotBlank(requestBodyStr)){
            return JSONObject.parseObject(stringBuilder.toString(), Map.class);
        }
        return new HashMap<>();
    }

    private Map<String, String> getUrlParams(HttpServletRequest request){
        String queryParams = "";
        try {
            queryParams = request.getQueryString();
            if(StringUtils.isNotBlank(queryParams)) {
                queryParams = URLDecoder.decode(request.getQueryString(), "utf-8");
            }
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        }
        Map<String, String> result = new HashMap<>();
        if(StringUtils.isNotBlank(queryParams)) {
            String[] spilt = queryParams.split("&");
            for (String s : spilt) {
                int index = s.indexOf("=");
                result.put(s.substring(0, index), s.substring(index + 1));
            }
        }
        return result;
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/RepeatedlyRequestWrapper.java

New file
@@ -0,0 +1,111 @@
package com.ruoyi.goods.fliter;

import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.exception.ExceptionUtils;

import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.*;
import java.nio.charset.Charset;

/**
 * 构建可重复读取inputStream的request
 *
 * @author linzhang
 */
@Log4j2
public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
{
    private final byte[] body;

    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException
    {
        super(request);
        request.setCharacterEncoding("UTF-8");
        response.setCharacterEncoding("UTF-8");

        body = getBodyString(request).getBytes("UTF-8");
    }

    public static String getBodyString(ServletRequest request)
    {
        StringBuilder sb = new StringBuilder();
        BufferedReader reader = null;
        try (InputStream inputStream = request.getInputStream())
        {
            reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
            String line = "";
            while ((line = reader.readLine()) != null)
            {
                sb.append(line);
            }
        }
        catch (IOException e)
        {
            log.warn("getBodyString出现问题！");
        }
        finally
        {
            if (reader != null)
            {
                try
                {
                    reader.close();
                }
                catch (IOException e)
                {
                    log.error(ExceptionUtils.getMessage(e));
                }
            }
        }
        return sb.toString();
    }

    @Override
    public BufferedReader getReader() throws IOException
    {
        return new BufferedReader(new InputStreamReader(getInputStream()));
    }

    @Override
    public ServletInputStream getInputStream() throws IOException
    {
        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
        return new ServletInputStream()
        {
            @Override
            public int read() throws IOException
            {
                return bais.read();
            }

            @Override
            public int available() throws IOException
            {
                return body.length;
            }

            @Override
            public boolean isFinished()
            {
                return false;
            }

            @Override
            public boolean isReady()
            {
                return false;
            }

            @Override
            public void setReadListener(ReadListener readListener)
            {

            }
        };
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/fliter/ResponseWrapper.java

New file
@@ -0,0 +1,63 @@
package com.ruoyi.goods.fliter;

import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;

public class ResponseWrapper extends HttpServletResponseWrapper {

    private ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
    private PrintWriter printWriter = new PrintWriter(outputStream);

    public ResponseWrapper(HttpServletResponse response) {
        super(response);
    }

    @Override
    public PrintWriter getWriter() throws IOException {
        return printWriter;
    }

    @Override
    public ServletOutputStream getOutputStream() throws IOException {
        return new ServletOutputStream() {
            @Override
            public boolean isReady() {
                return false;
            }

            @Override
            public void setWriteListener(WriteListener listener) {

            }

            @Override
            public void write(int b) throws IOException {
                outputStream.write(b);
            }
        };
    }
    public void flush(){
        try {
            printWriter.flush();
            printWriter.close();
            outputStream.flush();
            outputStream.close();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }

    public ByteArrayOutputStream getByteArrayOutputStream(){
        return outputStream;
    }

    public String getTextContent() {
        flush();
        return outputStream.toString();
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityGoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/activity/ActivityGoodsMapper.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.mapper.activity;
package com.ruoyi.goods.mapper.activity;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsFileMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsFileMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsMapper.java
@@ -1,14 +1,14 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.domain.dto.MerGoodsPageDto;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelNurseMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelNurseMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsRelTagMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsRelTagMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsTotalMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/GoodsTotalMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShopGoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/goods/ShopGoodsMapper.java
@@ -1,8 +1,8 @@
package com.ruoyi.order.mapper.goods;
package com.ruoyi.goods.mapper.goods;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;

/**
 * <p>

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/ShoppingCartMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ShoppingCartMapper.java
@@ -1,8 +1,8 @@
package com.ruoyi.order.mapper.order;
package com.ruoyi.goods.mapper.goods;

import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/activity/ActivityGoodsService.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.service.activity;
package com.ruoyi.goods.service.activity;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsFileService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsFileService.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelNurseService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelNurseService.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsRelTagService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsRelTagService.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
@@ -1,13 +1,13 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.goods.domain.vo.AppGoodsInfoVo;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;

import java.util.List;


 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsTotalService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsTotalService.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;

import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShopGoodsService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/ShopGoodsService.java
@@ -1,8 +1,8 @@
package com.ruoyi.order.service.goods;
package com.ruoyi.goods.service.goods;


import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;

/**
 * <p>

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/ShoppingCartService.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ShoppingCartService.java
@@ -1,10 +1,10 @@
package com.ruoyi.order.service.order;
package com.ruoyi.goods.service.goods;

import com.ruoyi.order.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/activity/ActivityGoodsServiceImpl.java
@@ -1,10 +1,10 @@
package com.ruoyi.order.service.impl.activity;
package com.ruoyi.goods.service.impl.activity;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.mapper.activity.ActivityGoodsMapper;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.goods.mapper.activity.ActivityGoodsMapper;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;



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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsFileServiceImpl.java
@@ -1,13 +1,12 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.mapper.goods.GoodsFileMapper;
import com.ruoyi.order.service.goods.GoodsFileService;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
import com.ruoyi.goods.mapper.goods.GoodsFileMapper;
import com.ruoyi.goods.service.goods.GoodsFileService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelNurseServiceImpl.java
@@ -1,10 +1,10 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.pojo.goods.GoodsRelNurse;
import com.ruoyi.order.mapper.goods.GoodsRelNurseMapper;
import com.ruoyi.order.service.goods.GoodsRelNurseService;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelNurse;
import com.ruoyi.goods.mapper.goods.GoodsRelNurseMapper;
import com.ruoyi.goods.service.goods.GoodsRelNurseService;
import org.springframework.stereotype.Service;

/**

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsRelTagServiceImpl.java
@@ -1,10 +1,10 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.pojo.goods.GoodsRelTag;
import com.ruoyi.order.mapper.goods.GoodsRelTagMapper;
import com.ruoyi.order.service.goods.GoodsRelTagService;
import com.ruoyi.goods.domain.pojo.goods.GoodsRelTag;
import com.ruoyi.goods.mapper.goods.GoodsRelTagMapper;
import com.ruoyi.goods.service.goods.GoodsRelTagService;
import org.springframework.stereotype.Service;

/**

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsServiceImpl.java
@@ -1,22 +1,21 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.order.domain.vo.MerGoodsPageVo;
import com.ruoyi.order.mapper.goods.GoodsMapper;
import com.ruoyi.order.service.activity.ActivityGoodsService;
import com.ruoyi.order.service.goods.GoodsFileService;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.system.api.RemoteActivityService;
import com.ruoyi.goods.domain.dto.*;
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.goods.domain.vo.AppGoodsInfoVo;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.mapper.goods.GoodsMapper;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.goods.GoodsFileService;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShopGoodsService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import org.springframework.beans.BeanUtils;

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/GoodsTotalServiceImpl.java
@@ -1,10 +1,10 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.pojo.goods.GoodsTotal;
import com.ruoyi.order.mapper.goods.GoodsTotalMapper;
import com.ruoyi.order.service.goods.GoodsTotalService;
import com.ruoyi.goods.domain.pojo.goods.GoodsTotal;
import com.ruoyi.goods.mapper.goods.GoodsTotalMapper;
import com.ruoyi.goods.service.goods.GoodsTotalService;
import org.springframework.stereotype.Service;

/**

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/goods/ShopGoodsServiceImpl.java
@@ -1,11 +1,11 @@
package com.ruoyi.order.service.impl.goods;
package com.ruoyi.goods.service.impl.goods;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.mapper.goods.ShopGoodsMapper;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.system.api.domain.poji.goods.ShopGoods;
import com.ruoyi.goods.mapper.goods.ShopGoodsMapper;
import com.ruoyi.goods.service.goods.ShopGoodsService;
import org.springframework.stereotype.Service;

/**

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ShoppingCartServiceImpl.java
@@ -1,23 +1,22 @@
package com.ruoyi.order.service.impl.order;
package com.ruoyi.goods.service.impl.goods;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.order.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.order.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.domain.vo.AppShoppingCartVo;
import com.ruoyi.order.mapper.order.ShoppingCartMapper;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.mapper.goods.ShoppingCartMapper;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;


 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java

New file
@@ -0,0 +1,154 @@
package com.ruoyi.goods.util;



import com.ruoyi.common.redis.service.RedisService;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.poi.ss.usermodel.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.security.SecureRandom;
import java.util.Date;
import java.util.Random;
import java.util.concurrent.TimeUnit;

/**
 * @author jqs34
 * @ClassName CodeFactoryUtil
 * @description: TODO
 * @date 2023年02月13日
 * @version: 1.0
 */
@Component
public class CodeFactoryUtil {


    //静态住入到自己的类中
    private static RedisService redisService;

    //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Autowired 注入到Spring容器中
    @Autowired
    public void setService(RedisService redisService) {
        CodeFactoryUtil.redisService = redisService;
    }

    /**
     * APP用户编码
     */
    private static final String APP_USER_PREFIX = "HRT_M";

    /**
     * 商户编号
     */
    private static final String SHOP_PREFIX = "HRT_S";

    /**
     * 商户订单前缀
     */
    private static final String ORDER_PREFIX = "SC";

    /**
     * 退款订单前缀
     */
    private static final String ORDER_REFUND_PREFIX = "RO";

    /**
     * 用户id和随机数总长度
     */

    private static final int maxLength = 4;

    /**
     * 更具id进行加密+加随机数组成固定长度编码
     */

    public static void main(String[] args) {
        Long orderId = 1L;
        String userNo = getShopNo(orderId);
        System.out.println(userNo);
    }

    /**
     * 获取商户编号
     *
     * @param shopId
     * @return
     */
    public static String getShopNo(Long shopId) {
        String prefix = SHOP_PREFIX;
        return toFillZeroCode(prefix, maxLength, shopId);
    }

    public static String getShopOrderNo() {
        String orderNo;
        String timeTemp = DateFormatUtils.format(new Date(), "yyyyMMdd");
        String prefix = ORDER_PREFIX + timeTemp;
        String suffixNumber = getSuffixNumber(prefix);
        orderNo = prefix + suffixNumber;
        return orderNo;
    }

    private static String getSuffixNumber(String prefix){
        Integer suffixNumberInt;
        String suffixNumber = "0001";
        if(redisService.hasKey(prefix)){
            suffixNumberInt = redisService.getCacheObject(prefix);
            suffixNumber = toFillZeroSuffixNumber(suffixNumberInt);
            suffixNumberInt = suffixNumberInt + 1;
            redisService.setCacheObject(prefix, suffixNumberInt, 24L, TimeUnit.HOURS);
        }else{
            redisService.setCacheObject(prefix, 1, 24L, TimeUnit.HOURS);
        }
        return suffixNumber;
    }

    private static String toFillZeroSuffixNumber(Integer suffixNumberInt){
        String suffixNumberStr = suffixNumberInt.toString();
        int length = suffixNumberStr.length();
        int fillLength = 4 - length;
        StringBuilder idsbs = new StringBuilder();
        for (int i = 0; i < fillLength; i++) {
            idsbs.append("0");
        }
        return idsbs.append(suffixNumberStr).toString();
    }


    /**
     * 0补位
     *
     * @param prefix
     * @param totalLength
     * @param id
     * @return
     */
    private static String toFillZeroCode(String prefix, int totalLength, Long id) {
        String idStr = id.toString();
        int length = idStr.length();

        int fillLength = totalLength - length;
        StringBuilder idsbs = new StringBuilder(prefix);
        for (int i = 0; i < fillLength; i++) {
            idsbs.append("0");
        }
        return idsbs.append(idStr).toString();
    }

    /**
     * 随机6位数生成
     */
    public static String getRandStr(int num) {
        // 默认6位
        num = num != 0 ? num : 6;
        Random r = new SecureRandom();
        StringBuffer str = new StringBuffer();
        int i = 0;
        while (i < num) {
            str.append(r.nextInt(10));
            i++;
        }
        return str.toString();
    }
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/EmojiUtil.java

New file
@@ -0,0 +1,95 @@
package com.ruoyi.goods.util;

import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class EmojiUtil {
    /**
     * 编码
     *
     * @param str 待转换字符串
     * @return 转换后字符串
     * @throws UnsupportedEncodingException exception
     * @Description 将字符串中的emoji表情转换成可以在utf-8字符集数据库中保存的格式（表情占4个字节，需要utf8mb4字符集）
     */
    public static String emojiEncode(String str)
            throws UnsupportedEncodingException {
        String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";

        Pattern pattern = Pattern.compile(patternString);
        Matcher matcher = pattern.matcher(str);
        StringBuffer sb = new StringBuffer();
        while (matcher.find()) {
            try {
                matcher.appendReplacement(
                        sb,
                        "[["
                                + URLEncoder.encode(matcher.group(1),
                                "UTF-8") + "]]");
            } catch (UnsupportedEncodingException e) {
//                LOG.error("emojiConvert error", e);
                throw e;
            }
        }
        matcher.appendTail(sb);
//        LOG.debug("emojiConvert " + str + " to " + sb.toString()
//                + ", len：" + sb.length());
        return sb.toString();
    }

    /**
     * 解码
     *
     * @param str 转换后的字符串
     * @return 转换前的字符串
     * @throws UnsupportedEncodingException exception
     * @Description 还原utf8数据库中保存的含转换后emoji表情的字符串
     */
    public static String emojiDecode(String str)
            throws UnsupportedEncodingException {
        String patternString = "\\[\\[(.*?)\\]\\]";

        Pattern pattern = Pattern.compile(patternString);
        if (str == null) {
            return str;
        }
        Matcher matcher = pattern.matcher(str);

        StringBuffer sb = new StringBuffer();
        while (matcher.find()) {
            try {
                matcher.appendReplacement(sb,
                        URLDecoder.decode(matcher.group(1), "UTF-8"));
            } catch (UnsupportedEncodingException e) {
//                LOG.error("emojiRecovery error", e);
                throw e;
            }
        }
        matcher.appendTail(sb);
//        LOG.debug("emojiRecovery " + str + " to " + sb.toString());
//        System.out.println("emojiRecovery " + str + " to " + sb.toString());
        return sb.toString();
    }

    /**
     * @param str 待过滤字符串
     * @return 过滤后字符串
     * exception
     * @Description 将字符串中的emoji表情过滤掉
     */
    public static String emojiSub(String str) {
        String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
        Pattern pattern = Pattern.compile(patternString);
        Matcher matcher = pattern.matcher(str);
        StringBuffer sb = new StringBuffer();
        while (matcher.find()) {
            matcher.appendReplacement(sb, "");
        }
        matcher.appendTail(sb);
        return sb.toString();
    }

}

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

New file
@@ -0,0 +1,27 @@
# Tomcat
server:
  port: 10065

# Spring
spring: 
  application:
    # 应用名称
    name: ruoyi-goods
  profiles:
    # 环境配置
    active: dev
  cloud:
    nacos:
      discovery:
        # 服务注册地址
        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
        # 配置文件格式
        file-extension: yml
        # 共享配置
        shared-configs:
          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

 ruoyi-modules/ruoyi-goods/src/main/resources/logback.xml

New file
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
    <!-- 日志存放路径 -->
    <property name="log.path" value="logs/ruoyi-order" />
   <!-- 日志输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

    <!-- 控制台输出 -->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>

    <!-- 系统日志输出 -->
    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/info.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>INFO</level>
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>

    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/error.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
            <level>ERROR</level>
            <!-- 匹配时的操作：接收（记录） -->
            <onMatch>ACCEPT</onMatch>
            <!-- 不匹配时的操作：拒绝（不记录） -->
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>

    <!-- 系统模块日志级别控制  -->
    <logger name="com.ruoyi" level="info" />
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="warn" />

    <root level="info">
        <appender-ref ref="console" />
    </root>
	
    <!--系统操作日志-->
    <root level="info">
        <appender-ref ref="file_info" />
        <appender-ref ref="file_error" />
    </root>
</configuration>

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityGoodsMapper.xml

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/activity/ActivityGoodsMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.activity.ActivityGoodsMapper">
<mapper namespace="com.ruoyi.goods.mapper.activity.ActivityGoodsMapper">

    <resultMap type="com.ruoyi.system.api.domain.poji.activity.ActivityGoods" id="ActivityGoodsResult">
        <result property="agId"    column="ag_id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsFileMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.GoodsFileMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsFileMapper">

    <resultMap type="GoodsFile" id="GoodsFileResult">
        <result property="id"    column="id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.GoodsMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsMapper">

    <resultMap type="Goods" id="GoodsResult">
        <result property="goodsId"    column="goods_id"    />
@@ -147,7 +147,7 @@
    </delete>

    <!--分页获取推荐商品-->
    <select id="pageRecommendGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
    <select id="pageRecommendGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
        SELECT
        tg.goods_id goodsId,
        tg.goods_name goodsName,
@@ -170,7 +170,7 @@
    </select>

    <!--分页获取商城商品列表-->
    <select id="pageShopGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
    <select id="pageShopGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
        SELECT
        tg.goods_id goodsId,
        tg.goods_name goodsName,
@@ -225,7 +225,7 @@
    </select>

    <!--分页获取搜索商品列表-->
    <select id="pageSearchGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleGoodsVo">
    <select id="pageSearchGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleGoodsVo">
        SELECT
        tg.goods_id goodsId,
        tg.goods_name goodsName,
@@ -251,7 +251,7 @@
    </select>

    <!--分页获取搜索活动商品列表-->
    <select id="pageSearchActivityGoods" resultType="com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo">
    <select id="pageSearchActivityGoods" resultType="com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo">
        SELECT
        tg.goods_id goodsId,
        tg.goods_name goodsName,
@@ -280,7 +280,7 @@
        ORDER BY tg.create_time DESC
    </select>

    <select id="pageMerShopGoods" resultType="com.ruoyi.order.domain.vo.MerGoodsPageVo">
    <select id="pageMerShopGoods" resultType="com.ruoyi.goods.domain.vo.MerGoodsPageVo">
        SELECT
        tg.goods_id goodsId,
        tg.goods_name goodsName,

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelNurseMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.GoodsRelNurseMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsRelNurseMapper">

    <resultMap type="GoodsRelNurse" id="GoodsRelNurseResult">
        <result property="id"    column="id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsRelTagMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.GoodsRelTagMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsRelTagMapper">

    <resultMap type="GoodsRelTag" id="GoodsRelTagResult">
        <result property="id"    column="id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/GoodsTotalMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.GoodsTotalMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.GoodsTotalMapper">

    <resultMap type="GoodsTotal" id="GoodsTotalResult">
        <result property="goodsId"    column="goods_id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/goods/ShopGoodsMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.goods.ShopGoodsMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.ShopGoodsMapper">

    <resultMap type="ShopGoods" id="ShopGoodsResult">
        <result property="id"    column="id"    />

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

File was renamed from ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ShoppingCartMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.order.ShoppingCartMapper">
<mapper namespace="com.ruoyi.goods.mapper.goods.ShoppingCartMapper">

    <resultMap type="ShoppingCart" id="ShoppingCartResult">
        <result property="id"    column="id"    />
@@ -79,7 +79,7 @@
        </foreach>
    </delete>

    <select id="listShoppingCartVo" resultType="com.ruoyi.order.domain.vo.AppShoppingCartVo">
    <select id="listShoppingCartVo" resultType="com.ruoyi.goods.domain.vo.AppShoppingCartVo">
        SELECT
        tsc.id shoppingCartId,
        tg.goods_id goodsId,

 ruoyi-modules/ruoyi-job/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java

@@ -35,6 +35,7 @@
    private MemberService memberService;



    @RequestMapping(value = "/pageMerCashMember", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取收银搜索会员列表")
    public R<Page<MerCashMemberPageVo>> pageMerCashMember(@RequestBody MerCashMemberPageDto merCashMemberPageDto) {

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

@@ -19,10 +19,10 @@
import com.ruoyi.member.service.member.MemberNurseService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.RemoteOrderService;
import com.ruoyi.system.api.RemoteShopService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;

 ruoyi-modules/ruoyi-member/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-order/pom.xml

@@ -108,6 +108,7 @@
        </dependency>



    </dependencies>

    <build>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -40,7 +40,7 @@



    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
    /*@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
    @ApiOperation(value = "核销code")
    public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
        Long userId = SecurityUtils.getUserId();
@@ -136,5 +136,5 @@
        log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
        return R.ok(page.setRecords(merMemberNoClearOrderVoList));
    }
    }*/
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java

@@ -26,7 +26,7 @@
    private OrderService orderService;


    @PostMapping("/getAppOrderTotal")
    /*@PostMapping("/getAppOrderTotal")
    public R<AppOrderTotalVo> getAppOrderTotal(@RequestBody Long userId){
        AppOrderTotalVo appOrderTotalVo = orderService.getAppOrderTotal(userId);
        return R.ok(appOrderTotalVo);
@@ -37,5 +37,5 @@
    public R<MerHomeShopTotalVo> getMerHomeTotal(@RequestBody MerHomeShopTotalVo merHomeShopTotalVo){
        merHomeShopTotalVo = orderService.getMerHomeTotal(merHomeShopTotalVo);
        return R.ok(merHomeShopTotalVo);
    }
    }*/
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java

@@ -8,8 +8,8 @@
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java

@@ -8,7 +8,6 @@
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
@@ -34,14 +33,13 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {

    @Autowired
    private RemoteMemberService memberService;


    @Autowired
    private OrderService orderService;


    @RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
    /*@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
    @ApiOperation(value = "购买商品")
    public R<AppSureOrderVo> buyGoods(@RequestBody AppSureOrderDto appSureOrderDto) {
        Long userId = SecurityUtils.getUserId();
@@ -138,6 +136,6 @@
        Long userId = SecurityUtils.getUserId();
        orderService.cancelOrder(appBaseGetDto.getId());
        return R.ok();
    }
    }*/

}

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

@@ -25,6 +25,7 @@
    @Resource
    private OrderGoodsMapper orderGoodsMapper;


    /**
     *
     * @param orderId

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

@@ -10,34 +10,25 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.ruoyi.order.domain.pojo.goods.GoodsFile;
import com.ruoyi.order.domain.pojo.goods.ShopGoods;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.pojo.order.OrderGoods;
import com.ruoyi.order.domain.pojo.order.ShoppingCart;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.goods.GoodsFileService;
import com.ruoyi.order.service.goods.ShopGoodsService;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
import com.ruoyi.order.service.order.ShoppingCartService;
import com.ruoyi.order.util.CodeFactoryUtil;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteShopService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.service.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
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.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.goods.GoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import org.springframework.stereotype.Service;
@@ -63,16 +54,7 @@
    private OrderMapper orderMapper;

    @Resource
    private GoodsService goodsService;

    @Resource
    private ShopGoodsService shopGoodsService;

    @Resource
    private RemoteMemberService remoteMemberService;

    @Resource
    private GoodsFileService goodsFileService;

    @Resource
    private OrderGoodsService orderGoodsService;
@@ -87,7 +69,11 @@
    private ConsumerGoodsService consumerGoodsService;

    @Resource
    private ShoppingCartService shoppingCartService;
    private RemoteGoodsService remoteGoodsService;

    @Resource
    private RemoteShoppingCartService remoteShoppingCartService;


    /**
     * @description: buyGoods
@@ -132,19 +118,22 @@
            goodsId = appBuyGoodsDto.getGoodsId();
            buyNum = appBuyGoodsDto.getBuyNum();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            goods = goodsService.getById(goodsId);
            goods = remoteGoodsService.getGoods(goodsId).getData();
            appSureOrderGoodsVo.setGoodsId(goodsId);
            appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
            appSureOrderGoodsVo.setGoodsIntroduction(goods.getGoodsIntroduction());
            appSureOrderGoodsVo.setGoodsType(goods.getGoodsType());
            //商品图片
            goodsFile = goodsFileService.getGoodsPicture(goodsId);
            goodsFile = remoteGoodsService.getGoodsFile(goodsId).getData();
            appSureOrderGoodsVo.setGoodsPicture(goodsFile.getFileUrl());
            buyNum = appBuyGoodsDto.getBuyNum();
            appSureOrderGoodsVo.setBuyNum(buyNum);
            goodsPrice = goods.getSalesPrice();
            //商户定制价格
            ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appSureOrderDto.getShopId(),goods.getGoodsId());
            AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
            appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
            appShopGoodsGetDto.setShopId(appSureOrderDto.getShopId());
            ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
            if(shopGoods!=null){
                goodsPrice = shopGoods.getSalesPrice();
            }
@@ -250,27 +239,29 @@
        String orderNo = CodeFactoryUtil.getShopOrderNo();
        OrderGoods orderGoods;
        String orderGoodsId;
        ShoppingCart shoppingCart;
        HashSet<String> goodsTypeSet = new HashSet<>();
        for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
            appSureOrderGoodsVo = new AppSureOrderGoodsVo();
            useCoupon = 0;
            goodsId = appBuyGoodsDto.getGoodsId();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            goods = goodsService.getById(goodsId);
            goods = remoteGoodsService.getGoods(goodsId).getData();
            appSureOrderGoodsVo.setGoodsId(goodsId);
            appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
            appSureOrderGoodsVo.setGoodsIntroduction(goods.getGoodsIntroduction());
            appSureOrderGoodsVo.setGoodsType(goods.getGoodsType());
            //商品图片
            goodsFile = goodsFileService.getGoodsPicture(goodsId);
            goodsFile = remoteGoodsService.getGoodsFile(goodsId).getData();
            appSureOrderGoodsVo.setGoodsPicture(goodsFile.getFileUrl());
            buyNum = appBuyGoodsDto.getBuyNum();
            appSureOrderGoodsVo.setBuyNum(buyNum);
            goodsPrice = goods.getSalesPrice();
            serviceNum = goods.getServiceNum();
            //商户定制价格
            ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(appPlaceOrderDto.getShopId(),goods.getGoodsId());
            AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
            appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
            appShopGoodsGetDto.setShopId(appPlaceOrderDto.getShopId());
            ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
            if(shopGoods!=null){
                goodsPrice = shopGoods.getSalesPrice();
                serviceNum = shopGoods.getServiceNum();
@@ -335,7 +326,10 @@
            orderGoods.setGoodsType(goods.getGoodsType());
            orderGoodsService.save(orderGoods);
            //清空购物车
            shoppingCartService.deleteByUserIdAndGoodsId(userId,goodsId);
            AppShoppingCartDelDto appShoppingCartDelDto = new AppShoppingCartDelDto();
            appShoppingCartDelDto.setGoodsId(goodsId);
            appShoppingCartDelDto.setUserId(userId);
            remoteShoppingCartService.deleteShoppingCart(appShoppingCartDelDto);
            if(goods.getGoodsType()==1){
                goodsTypeSet.add("周期");
            }else if(goods.getGoodsType()==2){
@@ -714,12 +708,15 @@
        for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
            goodsId = appBuyGoodsDto.getGoodsId();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            goods = goodsService.getById(goodsId);
            goods = remoteGoodsService.getGoods(goodsId).getData();
            buyNum = appBuyGoodsDto.getBuyNum();
            goodsPrice = goods.getSalesPrice();
            serviceNum = goods.getServiceNum();
            //商户定制价格
            ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merNewOrderDto.getShopId(),goods.getGoodsId());
            AppShopGoodsGetDto appShopGoodsGetDto = new AppShopGoodsGetDto();
            appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
            appShopGoodsGetDto.setShopId(merNewOrderDto.getShopId());
            ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
            if(shopGoods!=null){
                goodsPrice = shopGoods.getSalesPrice();
                serviceNum = shopGoods.getServiceNum();

 ruoyi-modules/ruoyi-order/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -2,12 +2,13 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
import com.ruoyi.shop.domain.vo.AppShopInfoVo;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,8 @@
    @Autowired
    private RemoteMemberService memberService;

    RemoteConfigService remoteConfigService;

    @Autowired
    private ShopService shopService;


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

@@ -11,10 +11,10 @@
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.util.CodeFactoryUtil;
import com.ruoyi.system.api.RemoteConfigService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.RemoteOrderService;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteUserService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.config.SysTag;

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

@@ -5,19 +5,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.shop.domain.pojo.shop.ShopRelTag;
import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

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

@@ -15,8 +15,7 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-shop/src/main/resources/banner.txt

File was deleted

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysProfileController.java

@@ -20,7 +20,7 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.domain.poji.sys.SysFile;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.model.LoginUser;

 ruoyi-modules/ruoyi-system/src/main/resources/banner.txt

File was deleted

 ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt

File was deleted