From 7c63ed19b08869dbea4a6ff41719c83f29dc52ea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 16:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java | 6 +++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 8 ++++++--
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 4 ++--
doc/a.json | 1 +
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 6 ++++--
7 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/doc/a.json b/doc/a.json
new file mode 100644
index 0000000..7aac0f7
--- /dev/null
+++ b/doc/a.json
@@ -0,0 +1 @@
+{"address":"四川省成都市武侯区锦辉西二街天府新谷9号楼二单元1005A","days":10,"name":"平台退货地址嘎嘎嘎嘎","phone":"19912351325"}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 4519f1b..e6a2346 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -213,7 +213,7 @@
}
// 生成核销码BASE64
try {
- String base64 = QRCodeGenerator.generateQRCodeBase64(order.getOrderNumber(), 124, 124);
+ String base64 = QRCodeGenerator.generateQRCodeBase64(String.valueOf(order.getId()), 124, 124);
orderDetailVO.setWriteOffCode(base64);
} catch (Exception e) {
e.printStackTrace();
@@ -328,7 +328,7 @@
orderPageListVo.setUserName(appUser.getName());
orderPageListVo.setPhone(appUser.getPhone());
}
- RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
+ RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
}
return pageInfo.setRecords(list);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
index b909179..ffc8d6b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java
@@ -1,8 +1,11 @@
package com.ruoyi.order.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.time.LocalDateTime;
/**
* @author zhibing.pu
@@ -20,7 +23,8 @@
@ApiModelProperty("联系电话")
private String phone;
@ApiModelProperty("申请时间")
- private String createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
@ApiModelProperty("售后类型（1退货退款2仅退款）")
private Integer refundMethod;
@ApiModelProperty("申请原因")
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
index 28f8142..cdb63ef 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml
@@ -8,7 +8,7 @@
a.id,
b.order_number as orderNumber,
b.app_user_id as appUserId,
- DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m:%s') as createTime,
+ a.create_time as createTime,
a.refund_method as refundMethod,
a.refund_reason as refundReason,
a.pass_status as passStatus,
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
index 0e0a518..b0954d3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java
@@ -41,9 +41,9 @@
List<Region> list = regionService.list();
List<Region> collect = list.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList());
for (Region region : collect) {
- List<Region> collect1 = list.stream().filter(s -> s.getParentId() == region.getId()).collect(Collectors.toList());
+ List<Region> collect1 = list.stream().filter(s -> s.getParentId().equals(region.getId())).collect(Collectors.toList());
for (Region region1 : collect1) {
- List<Region> collect2 = list.stream().filter(s -> s.getParentId() == region1.getId()).collect(Collectors.toList());
+ List<Region> collect2 = list.stream().filter(s -> s.getParentId().equals(region1.getId())).collect(Collectors.toList());
region1.setChilds(collect2);
}
region.setChilds(collect1);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index ffbdf33..138fa96 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -114,6 +114,9 @@
shop.setCustomOrderNumber(0);
shop.setAppUserId(appUser.getId());
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ if(!StringUtils.hasLength(city)){
+ city = "510100";
+ }
shop.setProvinceCode(city.substring(0, 2) + "0000");
shop.setCityCode(city.substring(0, 4) + "00");
shop.setDistrictCode(city);
@@ -216,9 +219,10 @@
// 查询有没有门店绑定这个被删除的门店
List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
for (Shop shop1 : shops) {
- shop1.setPid(0);
+ LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
+ .eq(Shop::getId,shop1.getId());
+ shopService.update(set);
}
- shopService.updateBatchById(shops);
appUserClient.clearBindShop(shop.getId());
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index b1df1da..193e2f6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -72,8 +72,10 @@
if(first.isPresent()){
AppUserShop appUserShop = first.get();
Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId())
- .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 1));
- technicianId = technician.getId();
+ .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2));
+ if(null != technician){
+ technicianId = technician.getId();
+ }
}
List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status, technicianId);
for (TechnicianSubscribeVO technicianSubscribeVO : list) {
--
Gitblit v1.7.1