From d2985d31ba7b387749b2350882172f675b923347 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 16:22:38 +0800
Subject: [PATCH] 订单流程补充
---
oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
index fc2cc34..5e17186 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/MerchantServiceImpl.java
@@ -15,19 +15,21 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.oying.utils.PageUtil;
+
import java.util.List;
import java.util.Map;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.LinkedHashMap;
+
import com.oying.utils.PageResult;
/**
-* @description 服务实现
-* @author lixin
-* @date 2025-05-29
-**/
+ * @author lixin
+ * @description 服务实现
+ * @date 2025-05-29
+ **/
@Service
@RequiredArgsConstructor
public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> implements MerchantService {
@@ -36,12 +38,12 @@
private final UserMerchantService userMerchantService;
@Override
- public PageResult<Merchant> queryAll(MerchantsQueryCriteria criteria, Page<Object> page){
+ public PageResult<Merchant> queryAll(MerchantsQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(merchantMapper.findAll(criteria, page));
}
@Override
- public List<Merchant> queryAll(MerchantsQueryCriteria criteria){
+ public List<Merchant> queryAll(MerchantsQueryCriteria criteria) {
return merchantMapper.findAll(criteria);
}
@@ -76,6 +78,7 @@
List<Map<String, Object>> list = new ArrayList<>();
for (Merchant merchant : all) {
Map<String, Object> map = new LinkedHashMap<>();
+ map.put("商户类型", merchant.getMerchantType());
map.put("名称", merchant.getMerchantName());
map.put("商户编码", merchant.getMerchantCode());
map.put("营业执照号", merchant.getBusinessLicense());
--
Gitblit v1.9.3