diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java index 17718706..fa727e23 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java @@ -226,6 +226,8 @@ public class OrderController { } + + /** * 待抢单的订单类型 *
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/OrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/OrderServiceImpl.java
index 7c55ae85..8e341b83 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/OrderServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/OrderServiceImpl.java
@@ -248,6 +248,10 @@ public class OrderServiceImpl implements OrderService {
}
// 拉包工
+ if (CharSequenceUtil.isNotBlank(orderQueryVO.getOrderByWorker())) {
+ list.add(cb.equal(orderByWorkerField, orderQueryVO.getOrderByWorker()));
+ }
+
if (CharSequenceUtil.isNotBlank(orderQueryVO.getWorkerName())) {
list.add(cb.like(workerNameField, '%' + orderQueryVO.getWorkerName() + '%'));
}
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 11ccfa72..5bd4c519 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
@@ -61,6 +61,7 @@ public class AliOcrUtil {
*/
public static JSONObject multiRoundConversationCall(PurchaseOcrPicture purchaseOcrPicture, PurchaseOcrExample purchaseOcrExample, ProductService productService, PurchaseDetailService purchaseDetailService) throws ApiException, NoApiKeyException, UploadFileException {
final JSONObject jsonObject = new JSONObject();
+ final String ocrPictureId = purchaseOcrPicture.getId();
final String picturePath = purchaseOcrPicture.getOcrPicture();
final Integer count = purchaseOcrPicture.getCount();
final String orderId = purchaseOcrPicture.getOrderId();
@@ -76,7 +77,7 @@ public class AliOcrUtil {
productSnExample += indexStr;
productNameExample += indexStr;
}
- final StopWatch stopWatch = new StopWatch("Ai回答计时");
+ final StopWatch stopWatch = new StopWatch(ocrPictureId+"Ai回答计时");
Constants.apiKey = "sk-bcfa4865b89548acb8225f910f13d682";
final CopyOnWriteArrayList