| Pass |
- 17:30:25 |
+ 9:27:40 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十一月 25, 2024 17:30:25
+
十一月 26, 2024 09:27:39
Ended
-
十一月 25, 2024 17:30:25
+
十一月 26, 2024 09:27:40
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 1bf6bdf1..e82eac8b 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
@@ -66,7 +66,7 @@ public interface SaleMapper extends BaseMapper {
Page getCustomerBuyProductLog(Page page, @Param("salePageQuery") SalePageQuery salePageQuery);
- List getCustomerBuyProductLogDetailLog(@Param("userId") String userId, @Param("shopId") String shopId, @Param("productIds") List productIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
+ List getCustomerBuyProductLogDetailLog(@Param("userId") String userId,@Param("createBy") String createBy, @Param("shopId") String shopId, @Param("productIds") List productIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
BigDecimal queryTotalAlreadyEarn(@Param("shopId") String shopId, @Param("startTime") String startTime, @Param("endTime") String endTime);
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SalesRankingVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SalesRankingVo.java
index 43b0d925..5ee7a759 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SalesRankingVo.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/SalesRankingVo.java
@@ -10,6 +10,9 @@ import java.io.Serializable;
@Data
public class SalesRankingVo implements Serializable {
+ @ApiModelProperty(value = "閿鍞汉鍛")
+ private String createBy;
+
@ApiModelProperty(value = "閿鍞汉鍛")
private String createByName;
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 7a48a061..65e0fb80 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
@@ -425,6 +425,7 @@ public class SaleServiceImpl extends ServiceImpl implements Sa
// 鍏堟嬁鍒拌瀹㈡埛璐拱鐨勬墍鏈夊晢鍝佷俊鎭
final Page page = new Page<>(salePageQuery.getPageNum(), salePageQuery.getPageSize());
final String userId = salePageQuery.getUserId();
+ final String createBy = salePageQuery.getCreateBy();
final Page salePage = saleMapper.getCustomerBuyProductLog(page, salePageQuery);
final List records = salePage.getRecords();
final List productIds = new ArrayList<>();
@@ -437,8 +438,8 @@ public class SaleServiceImpl extends ServiceImpl implements Sa
if(StringUtils.isNotEmpty(userId)){
customerBuySaleVoList = saleMapper.getByUserId(userId);
}
- if(StringUtils.isNotEmpty(salePageQuery.getCreateBy())){
- customerBuySaleVoList = saleMapper.getByCreUserId(salePageQuery.getCreateBy());
+ if(StringUtils.isNotEmpty(createBy)){
+ customerBuySaleVoList = saleMapper.getByCreUserId(createBy);
}
final Map customerBuySaleVoMap = new HashMap<>();
for (CustomerBuySaleVo customerBuySaleVo : customerBuySaleVoList) {
@@ -446,7 +447,7 @@ public class SaleServiceImpl extends ServiceImpl implements Sa
}
if (!productIds.isEmpty()) {
// 鑾峰彇鍟嗗搧鍚勮鏍煎敭鍗栫殑鏁伴噺
- final List customerBuyProductDetailLogVos = saleMapper.getCustomerBuyProductLogDetailLog(userId, salePageQuery.getShopId(), productIds, salePageQuery.getStartDate(), salePageQuery.getEndDate());
+ final List customerBuyProductDetailLogVos = saleMapper.getCustomerBuyProductLogDetailLog(userId,createBy, salePageQuery.getShopId(), productIds, salePageQuery.getStartDate(), salePageQuery.getEndDate());
// 杩涜鏁版嵁灏佽Map<鍟嗗搧id,Map<閿鍞崟id,鍟嗗搧鏄庣粏>>
final Map>> allMap = new HashMap<>();
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 95c2e581..7c26f179 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-ocr")
+ .model("qwen-vl-max-1119")
.messages(messages)
.build();
stopWatch.start("涓杞細璇");
@@ -841,11 +841,12 @@ public class AliOcrUtil {
"1.productSn鐨勮繑鍥炲间腑鍘绘帀棰滆壊锛屽昂鐮佺瓑淇℃伅锛孿n" +
"2.濡傛灉璇嗗埆鍒板绉嶉鑹诧紝鎸変笉鍚岄鑹叉媶鍒嗚繑鍥炪傚鏋滄病鏈夎瘑鍒埌\"color\"鐨勫唴瀹癸紝鍒橽"color\"璧嬪尖滃潎鑹测濄傚鏋滄病鏈夎瘑鍒埌\"size\"鐨勫唴瀹癸紝鍒橽"size\"璧嬪尖滃潎鐮佲濓紝杩斿洖1鏉SON鏁版嵁鍗冲彲銆俓n" +
"3.濡傛灉鎸囦护鍐呭涓湁\"SYYS鑹瞈"鍒橽"color\"瀛楁杩斿洖鈥淪YYS鑹测濆嵆鍙紝濡傛灉鎸囦护鍐呭涓湁\"SYCM鐮乗"鍒橽"size\"瀛楁杩斿洖鈥淪YCM鐮佲濆嵆鍙紝娌℃湁鍒欏拷鐣ャ俓n" +
- "4.濡傛灉鎸囦护涓湁鈥滃悇N浠垛濓紝鍒欐瘡涓昂鐮佹暟閲忚繑鍥濶銆俓n" +
- "5.濡傛灉鎸囦护涓昂鐮佹槸锛熺爜鍒帮紵鐮侊紝璇峰畬鏁磋繑鍥炶法搴﹀唴鎵鏈夊昂鐮丣SON銆佷笉瑕佺渷鐣ヤ腑闂寸殑灏虹爜銆傦紙甯歌鐨勫昂鐮侀『搴忥細S鐮-M鐮-L鐮-XL鐮-2XL鐮-3XL鐮-4XL鐮-5XL鐮-6XL鐮-7XL鐮......锛夈俓n" +
- "6.濡傛灉娌℃湁璇嗗埆鍒癨"wholesalePrice\"鐨勫唴瀹癸紝鍒橽"wholesalePrice\"璧嬪糪"0\"銆俓n" +
- "7.鍙緭鍑篔SON鏁版嵁鍗冲彲锛岀姝㈣繑鍥為櫎JSON鏁版嵁澶栫殑浠讳綍鍐呭锛" +
- "8.杩斿洖鐨凧SON鏁版嵁涓嶇敤鎹㈣锛屼互鏈蹇殑閫熷害杩斿洖锛";
+ "4. 濡傛灉鏁伴噺涓鸿礋鏁帮紝鍒檖roductCount杩斿洖璐熸暟銆" +
+ "5.濡傛灉鎸囦护涓湁鈥滃悇N浠垛濓紝鍒欐瘡涓昂鐮佹暟閲忚繑鍥濶銆俓n" +
+ "6.濡傛灉鎸囦护涓昂鐮佹槸锛熺爜鍒帮紵鐮侊紝璇峰畬鏁磋繑鍥炶法搴﹀唴鎵鏈夊昂鐮丣SON銆佷笉瑕佺渷鐣ヤ腑闂寸殑灏虹爜銆傦紙甯歌鐨勫昂鐮侀『搴忥細S鐮-M鐮-L鐮-XL鐮-2XL鐮-3XL鐮-4XL鐮-5XL鐮-6XL鐮-7XL鐮......锛夈俓n" +
+ "7.濡傛灉娌℃湁璇嗗埆鍒癨"wholesalePrice\"鐨勫唴瀹癸紝鍒橽"wholesalePrice\"璧嬪糪"0\"銆俓n" +
+ "8.鍙緭鍑篔SON鏁版嵁鍗冲彲锛岀姝㈣繑鍥為櫎JSON鏁版嵁澶栫殑浠讳綍鍐呭锛" +
+ "9.杩斿洖鐨凧SON鏁版嵁涓嶇敤鎹㈣锛屼互鏈蹇殑閫熷害杩斿洖锛";
final Message userMsg = Message.builder().role(Role.USER.getValue()).content(questionMsg).build();
msgManager.add(systemMsg);
msgManager.add(userMsg);
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 310c83cb..9a5e6ee0 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
@@ -779,7 +779,7 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
@@ -923,7 +923,14 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
t_sale_detail
WHERE
shop_id = #{shopId}
- and sale_id in ( SELECT id FROM t_sale WHERE user_id = #{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 = #{userId}
+
+
+ and create_by = #{createBy}
+
+ )
and product_id in
#{listItem}