From e2a878cf46999412c138fbd158586e47d9b8366a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 13:35:54 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/model/TOrder.java | 2 +-
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 6 +++++-
manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java | 16 ++++++++++++++++
manage/src/main/resources/mapping/TOrderAftersalesMapper.xml | 16 ++++++++++------
manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java | 10 +++++-----
manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java | 5 ++++-
6 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
index ba40429..588a034 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -174,7 +174,11 @@
if(Objects.nonNull(user)){
dto.setStoreId(user.getStoreId());
}
-
+ if (dto.getUserId()!=null){
+ TAppUser byId = tAppUserService.getById(dto.getUserId());
+ dto.setName(byId.getName());
+ dto.setPhone(byId.getPhone());
+ }
orderService.save(dto);
List<TOptometryDetail> optometryDetails = dto.getOptometryDetails();
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrder.java b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
index 1b543af..48cdb84 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -158,7 +158,7 @@
private Integer gender;
@ApiModelProperty(value = "微信昵称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "支付方式")
@TableField("payTypeName")
private String payTypeName;
diff --git a/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java b/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
index ccecfea..cffe0a4 100644
--- a/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
+++ b/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "订单售后查询参数")
public class TOrderAftersalesQuery extends BasePage {
@@ -21,5 +23,6 @@
private String startTime;
@ApiModelProperty(value = "结束时间 2023-11-11")
private String endTime;
-
+ @ApiModelProperty(value = "用户ids 前端忽略")
+ private List<Integer> userIds;
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
index 4766ad5..280fd6d 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
@@ -1,6 +1,9 @@
package com.jilongda.manage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.mapper.TAppUserMapper;
+import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TOrderAftersales;
import com.jilongda.manage.mapper.TOrderAftersalesMapper;
import com.jilongda.manage.query.TOrderAftersalesQuery;
@@ -8,9 +11,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jilongda.manage.vo.TOrderAftersalesVO;
import com.jilongda.manage.vo.TSupplierVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -23,8 +30,17 @@
@Service
public class TOrderAftersalesServiceImpl extends ServiceImpl<TOrderAftersalesMapper, TOrderAftersales> implements TOrderAftersalesService {
+ @Autowired
+ private TAppUserMapper appUserMapper;
@Override
public PageInfo<TOrderAftersalesVO> pageList(TOrderAftersalesQuery query) {
+ if (StringUtils.hasLength(query.getName())){
+ List<Integer> collect = appUserMapper.selectList(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getName, query.getName())).stream()
+ .map(TAppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty())collect.add(-1);
+ query.setUserIds(collect);
+ }
PageInfo<TOrderAftersalesVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TOrderAftersalesVO> list = this.baseMapper.pageList(query,pageInfo);
pageInfo.setRecords(list);
diff --git a/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java b/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java
index 6be2764..7bac528 100644
--- a/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java
+++ b/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java
@@ -10,11 +10,11 @@
public class OssUploadUtil {
//OSS图片访问域名
- public static String oss_domain = "https://we-park-life.oss-cn-beijing.aliyuncs.com/";
- public static String accessKeyId = "LTAI47eyqWWhBPXM";
- public static String accessKeySecret = "orsYX78NvgXS9KbN7wCwRja1wkUwPc";
- public static String bucketName="we-park-life";
- public static String endpoint = "oss-cn-beijing.aliyuncs.com";
+ public static String oss_domain = "https://yandu66.oss-cn-shenzhen.aliyuncs.com/";
+ public static String accessKeyId = "LTAI5tL1dE1DzT4ZYdDQZ8k7";
+ public static String accessKeySecret = "4SZBtTyLhOoYRcfMS4SVAtGz8ZnxRP";
+ public static String bucketName="yandu66";
+ public static String endpoint = "oss-cn-shenzhen.aliyuncs.com";
public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
diff --git a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
index 3bfaa97..a6f7e18 100644
--- a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
@@ -24,17 +24,21 @@
</sql>
<select id="pageList" resultType="com.jilongda.manage.vo.TOrderAftersalesVO">
select toa.id, toa.code, toa.sysId, toa.optometristId, toa.orderId, toa.reason, toa.handleResult, toa.createTime, toa.updateTime,
- toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.name as storeName, o.orderMoney
+ toa.createBy, toa.updateBy, toa.isDelete, ts.name as storeName, o.orderMoney,tau.`name` as `name`,
+ o.realName
from t_order_aftersales toa
- left join t_app_user tau on toa.sysId = tau.id
left join t_order o on toa.orderId = o.id
left join t_store ts on o.storeId = ts.id
+ left join t_app_user tau on o.userId = tau.id
<where>
- <if test="query.name != null and query.name != ''">
- and tau.name like concat('%',#{query.name},'%')
- </if>
<if test="query.phone != null and query.phone != ''">
- and tau.phone like concat('%',#{query.phone},'%')
+ and o.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.userIds != null and query.userIds.size()>0">
+ AND o.userId IN
+ <foreach collection="query.userIds" close=")" open="(" item="id" separator=",">
+ #{id}
+ </foreach>
</if>
<if test="query.storeId != null">
and o.storeId = #{query.phone}
--
Gitblit v1.7.1