小红点bug修改

mall-service/pom.xml

@@ -132,6 +132,18 @@
             <version>1.6.15</version>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>io.springfox</groupId>-->
+<!--            <artifactId>springfox-boot-starter</artifactId>-->
+<!--            <version>3.0.0</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.cloud</groupId>-->
+<!--                    <artifactId>spring-cloud-context</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>

mall-service/src/main/java/com/txz/mall/configurer/SwaggerConfig.java

@@ -1,32 +1,31 @@
 //package com.txz.mall.configurer;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.models.Components;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Contact;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.parameters.Parameter;
-import org.springdoc.core.GroupedOpenApi;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Fcx
- */
+//
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.v3.oas.models.Components;
+//import io.swagger.v3.oas.models.OpenAPI;
+//import io.swagger.v3.oas.models.info.Contact;
+//import io.swagger.v3.oas.models.info.Info;
+//import io.swagger.v3.oas.models.info.License;
+//import io.swagger.v3.oas.models.parameters.Parameter;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Profile;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.ParameterBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.schema.ModelRef;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * @author Fcx
+// */
 //@Configuration
 //@Profile({"dev", "test"})
 //public class SwaggerConfig {
@@ -57,33 +56,4 @@ import java.util.List;
 //                                .name("Apache 2.0")
 //                                .url("http://localhost/swagger-ui.html")));
 //    }
-//
-//    @Bean
-//    public GroupedOpenApi mallApi() {
-//        return GroupedOpenApi.builder()
-//                .group("mall") // 分组名，需与网关配置匹配
-//                .pathsToMatch("/**") // 匹配 mall 服务的所有接口
-//                .build();
-//    }
-//
-//
-//
-// //   @Bean
-////    public OpenAPI customOpenAPI() {
-////        return new OpenAPI()
-////                // 文档基本信息
-////                .info(new Info()
-////                        .title("mall API")  // 文档标题
-////                        .description("基于 Spring Boot + SpringDoc 的接口文档")  // 文档描述
-////                        .version("v1.0.0")  // 接口版本
-////                        // 联系人信息
-////                        .contact(new Contact()
-////                                .name("开发团队")
-////                                .email("dev@example.com")
-////                                .url("http://localhost/swagger-ui.html"))
-////                        // 许可证信息（可选）
-////                        .license(new License()
-////                                .name("Apache 2.0")
-////                                .url("https://www.apache.org/licenses/LICENSE-2.0.html")));
-////    }
 //}

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -2459,6 +2459,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 中奖未填写收获地址数量
         Condition conditionStoreStorePinkPaid = new Condition(StorePink.class);
         Example.Criteria criteriaStorePinkPaid = conditionStoreStorePinkPaid.createCriteria();
+        criteriaStorePinkPaid.andEqualTo("lId", 1);
         criteriaStorePinkPaid.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_PAID.getKey());
         criteriaStorePinkPaid.andEqualTo("isDelete", 0);
         criteriaStorePinkPaid.andEqualTo("uid", tokenUserId);

mall-service/src/main/resources/bootstrap.properties

@@ -113,4 +113,4 @@ xxl.job.executor.port=4444
 xxl.job.executor.logpath=/var/logs/xxljob/${spring.application.name}/jobhandler
 xxl.job.executor.logretentiondays=4
 
-server.host=124.222.152.234
+server.host=124.222.152.234