| Pass |
- 9:27:40 |
+ 22:06:18 |
Test passed
|
@@ -128,13 +128,13 @@
Started
-
十一月 26, 2024 09:27:39
+
十一月 27, 2024 22:06:17
Ended
-
十一月 26, 2024 09:27:40
+
十一月 27, 2024 22:06:18
diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java
index c18b6db1..30b92230 100644
--- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java
+++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java
@@ -44,4 +44,8 @@ public class StatisticsVo {
// 鎬婚噸閲
@ApiModelProperty(value = "鎬婚噸閲")
private BigDecimal totalWeight;
+
+ // 鎬讳欢鏁
+ @ApiModelProperty(value = "鎬讳欢鏁")
+ private BigDecimal totalCount;
}
diff --git a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml
index e07d6622..827979ef 100644
--- a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml
+++ b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml
@@ -217,7 +217,8 @@
COUNT(*) AS total_order,
SUM(t.tips) AS total_tips,
SUM(t.premium) AS total_insurance_fee,
- SUM(t.weight) AS total_weight
+ SUM(t.weight) AS total_weight,
+ SUM(t.count) AS total_count
FROM
t_logistics_order t
WHERE
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
index 07ccfe4b..3c0520c5 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/SaleController.java
@@ -238,7 +238,9 @@ public class SaleController {
sale.setCreateBy(currUser.getId());
sale.setCreateByName(currUser.getNickname());
sale.setCreateByPhone(currUser.getMobile());
- sale.setCreateTime(new Date());
+ if(sale.getCreateTime() == null) {
+ sale.setCreateTime(new Date());
+ }
sale.setDelFlag(CommonConstant.DEL_FLAG_FALSE);
sale.setStatus(SaleConstant.SALE_STATUS[4]);
saleService.save(sale);
@@ -252,6 +254,12 @@ public class SaleController {
final SaleReturnDTO saleReturnDTO = saleQueryDTO.getSaleReturnDTO();
// 鍥炲～閿鍞崟id
saleReturnDTO.getReturnSale().setSaleId(sale.getId());
+ // 鏃堕棿
+ if(sale.getCreateTime() == null) {
+ saleReturnDTO.getReturnSale().setCreateTime(new Date());
+ }else{
+ saleReturnDTO.getReturnSale().setCreateTime(sale.getCreateTime());
+ }
// 鐢宠閫璐
final ReturnSale returnSale = salesAndDetailsService.handleBackSalesDetails(saleReturnDTO);
// 濡傜‘璁ら璐
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java
index 6fac7372..16ee2a5a 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnSale.java
@@ -1,27 +1,62 @@
package cc.hiver.mall.entity;
-import cc.hiver.core.base.HiverBaseEntity;
+import cc.hiver.core.common.constant.CommonConstant;
import cc.hiver.core.common.utils.SnowFlakeUtil;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Id;
+import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.Date;
@Data
@ApiModel(value = "閫璐у崟涓昏〃")
@TableName(value = "t_return_sale", autoResultMap = true)
-public class ReturnSale extends HiverBaseEntity {
+public class ReturnSale implements Serializable {
+ private static final long serialVersionUID = 1L;
@Id
@TableId
@ApiModelProperty(value = "鍞竴鏍囪瘑")
private String id = "TD" + SnowFlakeUtil.nextId();
+ @ApiModelProperty(value = "鍒涘缓鑰")
+ @CreatedBy
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
+
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊鑰")
+ @LastModifiedBy
+ @TableField(fill = FieldFill.UPDATE)
+ private String updateBy;
+
+ @LastModifiedDate
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織 榛樿0")
+ private Integer delFlag = CommonConstant.STATUS_NORMAL;
+
+
private String saleId;
@ApiModelProperty(value = "鎿嶄綔浜哄鍚")
@@ -95,5 +130,4 @@ public class ReturnSale extends HiverBaseEntity {
@ApiModelProperty(value = "涓嬪崟鎬讳欢鏁")
private String workerName;
- private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
index 389a00e9..bee4e812 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
@@ -334,7 +334,7 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
final User user = securityUtil.getCurrUser();
returnSale.setCreateBy(user.getId());
returnSale.setCreateByName(user.getNickname());
- returnSale.setCreateTime(new Date());
+ // returnSale.setCreateTime(new Date());
// 涓嬫父瀹㈡埛淇℃伅
returnSale.setUserId(sale.getUserId());
returnSale.setUserName(sale.getUserName());
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 7c26f179..3f5102ad 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-1119")
+ .model("qwen-vl-max")
.messages(messages)
.build();
stopWatch.start("涓杞細璇");
@@ -841,7 +841,7 @@ public class AliOcrUtil {
"1.productSn鐨勮繑鍥炲间腑鍘绘帀棰滆壊锛屽昂鐮佺瓑淇℃伅锛孿n" +
"2.濡傛灉璇嗗埆鍒板绉嶉鑹诧紝鎸変笉鍚岄鑹叉媶鍒嗚繑鍥炪傚鏋滄病鏈夎瘑鍒埌\"color\"鐨勫唴瀹癸紝鍒橽"color\"璧嬪尖滃潎鑹测濄傚鏋滄病鏈夎瘑鍒埌\"size\"鐨勫唴瀹癸紝鍒橽"size\"璧嬪尖滃潎鐮佲濓紝杩斿洖1鏉SON鏁版嵁鍗冲彲銆俓n" +
"3.濡傛灉鎸囦护鍐呭涓湁\"SYYS鑹瞈"鍒橽"color\"瀛楁杩斿洖鈥淪YYS鑹测濆嵆鍙紝濡傛灉鎸囦护鍐呭涓湁\"SYCM鐮乗"鍒橽"size\"瀛楁杩斿洖鈥淪YCM鐮佲濆嵆鍙紝娌℃湁鍒欏拷鐣ャ俓n" +
- "4. 濡傛灉鏁伴噺涓鸿礋鏁帮紝鍒檖roductCount杩斿洖璐熸暟銆" +
+ "4.濡傛灉鏌愪釜瑙勬牸鏁伴噺涓鸿礋鏁帮紝鍒欒瑙勬牸瀵瑰簲鐨刾roductCount杩斿洖璐熸暟銆備笉瑕佸奖鍝嶅叾浠栬鏍" +
"5.濡傛灉鎸囦护涓湁鈥滃悇N浠垛濓紝鍒欐瘡涓昂鐮佹暟閲忚繑鍥濶銆俓n" +
"6.濡傛灉鎸囦护涓昂鐮佹槸锛熺爜鍒帮紵鐮侊紝璇峰畬鏁磋繑鍥炶法搴﹀唴鎵鏈夊昂鐮丣SON銆佷笉瑕佺渷鐣ヤ腑闂寸殑灏虹爜銆傦紙甯歌鐨勫昂鐮侀『搴忥細S鐮-M鐮-L鐮-XL鐮-2XL鐮-3XL鐮-4XL鐮-5XL鐮-6XL鐮-7XL鐮......锛夈俓n" +
"7.濡傛灉娌℃湁璇嗗埆鍒癨"wholesalePrice\"鐨勫唴瀹癸紝鍒橽"wholesalePrice\"璧嬪糪"0\"銆俓n" +
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 9a5e6ee0..8bbb5cc7 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleMapper.xml
@@ -931,6 +931,9 @@ trans_company, company_name, product_count, remark, sale_name, company_phone, cr
and create_by = #{createBy}
)
+
+ and create_time BETWEEN #{startTime} AND #{endTime}
+
and product_id in
#{listItem}