| Pass |
- 21:56:37 |
+ 17:30:25 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十一月 21, 2024 21:56:37
+
十一月 25, 2024 17:30:25
Ended
-
十一月 21, 2024 21:56:37
+
十一月 25, 2024 17:30:25
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
index bbf9edfe..1bf6bdf1 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/SaleMapper.java
@@ -72,6 +72,15 @@ public interface SaleMapper extends BaseMapper {
List getByUserId(@Param("userId") String userId);
+ /**
+ * 鏍规嵁寮鍗曚汉鏌ヨ
+ * @author 鐜嬪瘜搴
+ * @date 2024/11/25
+ * @param createBy
+ * @return List
+ */
+ List getByCreUserId(@Param("createBy") String createBy);
+
List getBySupplierId(@Param("supplierId") String supplierId);
List getSupplierBuyProductLogDetailLog(@Param("supplierId") String supplierId, @Param("shopId") String shopId, @Param("productIds") List productIds);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
index 23196122..7a48a061 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
@@ -432,8 +432,14 @@ public class SaleServiceImpl extends ServiceImpl implements Sa
for (CustomerBuyProductLogVo record : records) {
productIds.add(record.getProductId());
}
+ List customerBuySaleVoList = new ArrayList<>();
// 鑾峰彇鍘嗘閿鍞崟鐨勪俊鎭
- final List customerBuySaleVoList = saleMapper.getByUserId(userId);
+ if(StringUtils.isNotEmpty(userId)){
+ customerBuySaleVoList = saleMapper.getByUserId(userId);
+ }
+ if(StringUtils.isNotEmpty(salePageQuery.getCreateBy())){
+ customerBuySaleVoList = saleMapper.getByCreUserId(salePageQuery.getCreateBy());
+ }
final Map customerBuySaleVoMap = new HashMap<>();
for (CustomerBuySaleVo customerBuySaleVo : customerBuySaleVoList) {
customerBuySaleVoMap.put(customerBuySaleVo.getId(), customerBuySaleVo);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
index 1e8e34a4..95c2e581 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java
@@ -106,7 +106,7 @@ public class AliOcrUtil {
messages.add(systemMessage);
messages.add(userMessage);
final MultiModalConversationParam param = MultiModalConversationParam.builder()
- .model("qwen-vl-max")
+ .model("qwen-vl-ocr")
.messages(messages)
.build();
stopWatch.start("涓杞細璇");
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
index 50b87eca..310c83cb 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
@@ -899,7 +899,15 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
t_sale_detail
WHERE
shop_id = #{salePageQuery.shopId}
- and sale_id IN ( SELECT id FROM t_sale WHERE user_id = #{salePageQuery.userId} and status not in ('2','6','7'))
+ and sale_id IN ( SELECT id FROM t_sale WHERE status not in ('2','6','7')
+
+
+ and user_id = #{salePageQuery.userId}
+
+
+ and create_by = #{salePageQuery.createBy}
+
+ )
and create_time BETWEEN #{salePageQuery.startDate} AND #{salePageQuery.endDate}
@@ -931,6 +939,15 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
and status not in ('2','6','7')
+
+