Merge remote-tracking branch 'origin/dev' into prod

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiProductLaunchServiceImpl.java

@@ -187,10 +187,10 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
         apiProductLaunchDto.setApiProjectDtoList(apiProjectDtoList(productLaunch.getProjectBizIdList()));
         apiProductLaunchDto.setApiProjectDtoList(apiProjectDtoList(productLaunch.getProjectBizIdList()));
         apiProductLaunchDto.setProjectBizIdList(StringUtils.isNotBlank(productLaunch.getProjectBizIdList()) ? Arrays.asList(productLaunch.getProjectBizIdList().split(";").clone()) : new ArrayList<>());
         apiProductLaunchDto.setProjectBizIdList(StringUtils.isNotBlank(productLaunch.getProjectBizIdList()) ? Arrays.asList(productLaunch.getProjectBizIdList().split(";").clone()) : new ArrayList<>());
 
 
-        if (StringUtils.isNotBlank(productLaunch.getProductBizId())) {
-            Product product = iProductService.queryOne(productLaunch.getProductBizId());
-            apiProductLaunchDto.setTitle(!Objects.isNull(product) ? product.getProductName() : "");
-        }
+//        if (StringUtils.isNotBlank(productLaunch.getProductBizId())) {
+//            Product product = iProductService.queryOne(productLaunch.getProductBizId());
+//            apiProductLaunchDto.setTitle(!Objects.isNull(product) ? product.getProductName() : "");
+//        }
         response.setApiProductLaunchDto(apiProductLaunchDto);
         response.setApiProductLaunchDto(apiProductLaunchDto);
 
 
         //设置的产品上架信息的参数列表
         //设置的产品上架信息的参数列表
@@ -332,6 +332,8 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
         return Result.success(productLaunchBizId);
         return Result.success(productLaunchBizId);
     }
     }
 
 
+
+
     /**
     /**
      * 审核-产品上架信息
      * 审核-产品上架信息
      * @param request
      * @param request

yd-product-service/src/main/resources/mappers/AnnouncementCommissionRatioMapper.xml

@@ -45,7 +45,7 @@
                 AND as1.payment_term = #{request.paymentTerm}
                 AND as1.payment_term = #{request.paymentTerm}
             </if>
             </if>
             <if test="request.effectiveDate != null">
             <if test="request.effectiveDate != null">
-                AND #{request.effectiveDate} BETWEEN acr.effective_start AND acr.effective_end
+                AND DATE(#{request.effectiveDate}) BETWEEN DATE(acr.effective_start) AND DATE(acr.effective_end)
             </if>
             </if>
         </where>
         </where>
         ORDER BY acr.effective_start DESC
         ORDER BY acr.effective_start DESC