From 6e8357b2e9f33588bac63d5269da1833e435e334 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 06 五月 2026 14:11:20 +0800
Subject: [PATCH] 支付宝支付dddadd
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 04cd73b..e5e9a24 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -49,6 +49,7 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1391,6 +1392,25 @@
}
return urls;
}
+ private List<Multifile> getFileUrlsByidList(List<Integer> orderId, int objType, String prefix) {
+ if(orderId ==null || orderId.size()==0){
+ return null;
+ }
+ List<Multifile> files = multifileMapper.selectList(
+ new QueryWrapper<Multifile>().lambda()
+ .in(Multifile::getObjId, orderId)
+ .eq(Multifile::getObjType, objType)
+ .eq(Multifile::getIsdeleted, Constants.ZERO)
+ .orderByAsc(Multifile::getSortnum));
+ if (files != null) {
+ for (Multifile f : files) {
+ if (StringUtils.isNotBlank(f.getFileurl())) {
+ f.setFileurl(prefix + f.getFileurl());
+ }
+ }
+ }
+ return files;
+ }
/**
* 璁＄畻骞惰缃鍗曡柂閰垎閰嶏紙鍙告満銆佸瓨浠堕棬搴椼�佸彇浠堕棬搴楋級
@@ -1499,8 +1519,13 @@
IPage<Orders> orderPage = ordersMapper.selectJoinPage(p, Orders.class, wrapper);
List<MyOrderVO> voList = new ArrayList<>();
- if (orderPage != null && orderPage.getRecords() != null) {
-
+ if (orderPage != null && orderPage.getRecords() != null && orderPage.getRecords().size()>0) {
+ String imgPrefix = getOrdersPrefix();
+ List<Integer> idList =new ArrayList<>();
+ for (Orders o : orderPage.getRecords()) {
+ idList.add(o.getId());
+ }
+ List<Multifile> files = getFileUrlsByidList(idList,Constants.FileType.ORDER_FILE.getKey(), imgPrefix);
for (Orders o : orderPage.getRecords()) {
MyOrderVO vo = new MyOrderVO();
vo.setId(o.getId());
@@ -1545,16 +1570,20 @@
// 璇勪环鐘舵��
vo.setCommentStatus(o.getCommentStatus());
+ //搴忓彿
+ vo.setSortnum(Constants.formatIntegerNum(o.getDepositShopId())+"-"+o.getId());
+ if(o.getTakeShopId()!=null){
+ vo.setSortnumTake(Constants.formatIntegerNum(o.getTakeShopId())+"-"+o.getId());
+ }
// 鏌ヨ鐗╁搧鏄庣粏锛堜竴娆℃煡璇紝鍚屾椂鐢ㄤ簬鐗╁搧鍒楄〃鍜岄�炬湡璁＄畻锛�
List<OrdersDetail> details = ordersDetailMapper.selectList(
new QueryWrapper<OrdersDetail>().lambda()
.eq(OrdersDetail::getOrderId, o.getId())
.eq(OrdersDetail::getDeleted, Constants.ZERO));
-
// 鐗╁搧鏄庣粏
vo.setDetailList(buildDetailList(details));
-
+ vo.setOrderImages(getFileUrlsFromList(o.getId(),files));
// 閫炬湡鐘舵��
fillOverdueStatus(vo, o, details);
voList.add(vo);
@@ -1568,6 +1597,22 @@
pageData.setPage(orderPage.getCurrent());
pageData.setCapacity(orderPage.getSize());
return pageData;
+ }
+
+ private List<String> getFileUrlsFromList(Integer id, List<Multifile> files) {
+ List<String> urls = new ArrayList<>();
+ try {
+ if(files!=null){
+ for(Multifile f : files){
+ if(Constants.equalsInteger(f.getObjId(),id)){
+ urls.add(f.getFileurl());
+ }
+ }
+ }
+ }catch (Exception e){
+ }
+
+ return urls;
}
@Override
@@ -1674,8 +1719,6 @@
.eq(OrdersDetail::getDeleted, Constants.ZERO));
vo.setDetailList(buildDetailList(details));
-
-
// 閫炬湡鐘舵��
fillOverdueStatus(vo, o, details);
@@ -1775,7 +1818,11 @@
if (Constants.equalsInteger(order.getStatus(), Constants.OrderStatus.waitPay.getStatus())) {
vo.setPayCountdownMs(calcPayCountdownMs(order));
}
-
+ //搴忓彿
+ vo.setSortnum(Constants.formatIntegerNum(order.getDepositShopId())+"-"+order.getId());
+ if(order.getTakeShopId()!=null){
+ vo.setSortnumTake(Constants.formatIntegerNum(order.getTakeShopId())+"-"+order.getId());
+ }
// 瀛樹欢闂ㄥ簵
if (order.getDepositShopId() != null) {
ShopInfo depositShop = shopInfoMapper.selectById(order.getDepositShopId());
@@ -4131,7 +4178,7 @@
if (!Constants.equalsInteger(orders.getDepositShopId(), shopId)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠闂ㄥ簵涓嶆槸璇ヨ鍗曠殑瀛樹欢闂ㄥ簵");
}
- if (orders.getStatus() < 2 || orders.getStatus() > 5) {
+ if (orders.getStatus() < 1 || orders.getStatus() > 7) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠璁㈠崟鐘舵�佷笉鍏佽鎵撳嵃");
}
ShopInfo shop = shopInfoMapper.selectById(shopId);
@@ -4152,7 +4199,11 @@
userInfo += "锛�" + phone.substring(phone.length() - 4) + "锛�";
}
}
- String content = printService.getPrintContent(shop.getName(), detailList, userInfo, orders.getCode(), orders.getRemark(),
+
+ //搴忓彿
+ String sort = Constants.formatIntegerNum(shopId)+"-"+orders.getId();
+// String content = printService.getPrintContent(shop.getName(), detailList, userInfo, orders.getCode(), orders.getRemark(),
+ String content = printService.getPrintContent(shop.getName(), detailList, userInfo, orders.getCode(), sort,
orders.getTakeLocationRemark(),
orders.getPayTime() != null ? new SimpleDateFormat("yyyy-MM-dd HH:mm").format(orders.getPayTime()) : "",
orders.getExpectedTakeTime() != null ? new SimpleDateFormat("yyyy-MM-dd HH:mm").format(orders.getExpectedTakeTime()) : "");
--
Gitblit v1.9.3