From 3d5f77b68bf28291c76306b274a230dd726838d2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:03:37 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java | 5
server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java | 38 +++
server/services/src/main/java/com/doumee/core/utils/GeoUtils.java | 41 +++
server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java | 86 +++++++
server/web/src/main/java/com/doumee/api/web/UserApi.java | 22 +
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 39 +++
server/services/src/main/java/com/doumee/core/constants/Constants.java | 3
server/services/src/main/java/com/doumee/dao/dto/WithdrawalDTO.java | 23 ++
server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java | 5
server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java | 61 +++++
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java | 3
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 23 +
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 4
server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java | 3
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 193 +++++++++++++++++
server/services/src/main/java/com/doumee/dao/business/model/Member.java | 17 +
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 62 +++++
17 files changed, 616 insertions(+), 12 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 76c8c19..20d9879 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -64,6 +64,7 @@
public static final String INENTITY_FILES = "INENTITY_FILES";
public static final String MEMBER_FILES = "MEMBER_FILES";
public static final String CATEGORY_FILES = "CATEGORY_FILES";
+ public static final String ORDERS_FILES = "ORDERS_FILES";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -82,7 +83,7 @@
interface CacheKey {
}
public interface RedisKeys {
- public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
+ public static final String ORDER_CODE = "ORDER_CODE";
}
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
diff --git a/server/services/src/main/java/com/doumee/core/utils/GeoUtils.java b/server/services/src/main/java/com/doumee/core/utils/GeoUtils.java
new file mode 100644
index 0000000..71846fc
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/core/utils/GeoUtils.java
@@ -0,0 +1,41 @@
+package com.doumee.core.utils;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/7/15 9:57
+ */
+public class GeoUtils {
+ // 灏嗚搴﹁浆鎹负寮у害
+ private static double toRadians(double angle) {
+ return angle * Math.PI / 180.0;
+ }
+
+ // 璁＄畻涓ょ偣闂寸殑璺濈锛堝崟浣嶏細鍏噷锛�
+ public static double haversineDistance(double lat1, double lon1, double lat2, double lon2) {
+ // 灏嗙粡绾害杞崲涓哄姬搴�
+ double dLat = toRadians(lat2 - lat1);
+ double dLon = toRadians(lon2 - lon1);
+ lat1 = toRadians(lat1);
+ lat2 = toRadians(lat2);
+
+ // 搴旂敤Haversine鍏紡
+ double a = Math.pow(Math.sin(dLat / 2), 2) + Math.pow(Math.sin(dLon / 2), 2) * Math.cos(lat1) * Math.cos(lat2);
+ double c = 2 * Math.asin(Math.sqrt(a));
+ // 鍦扮悆鍗婂緞锛屽崟浣嶏細鍏噷
+ int R = 6371;
+ return R * c;
+ }
+
+ public static void main(String[] args) {
+ double lat1 = 30.660622; // 绾界害绾害
+ double lon1 = 114.172; // 绾界害缁忓害
+ double lat2 = 30.621857; // 娲涙潐鐭剁含搴�
+ double lon2 = 114.12311; // 娲涙潐鐭剁粡搴�
+
+ double distance = haversineDistance(lat1, lon1, lat2, lon2);
+ System.out.printf("Distance: %.2f km%n", distance);
+ }
+
+}
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
new file mode 100644
index 0000000..e463111
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConfig.java
@@ -0,0 +1,61 @@
+package com.doumee.core.utils.redis;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * @author jiangping
+ * @date 2021-8-10 14:40:35
+ * redis閰嶇疆
+ */
+@Configuration
+public class RedisConfig {
+
+ @Bean
+ @SuppressWarnings("all")
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+ template.setConnectionFactory(factory);
+ Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
+ ObjectMapper om = new ObjectMapper();
+ om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+ om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+ jackson2JsonRedisSerializer.setObjectMapper(om);
+ StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+ // key閲囩敤String鐨勫簭鍒楀寲鏂瑰紡
+ template.setKeySerializer(stringRedisSerializer);
+ // hash鐨刱ey涔熼噰鐢⊿tring鐨勫簭鍒楀寲鏂瑰紡
+ template.setHashKeySerializer(stringRedisSerializer);
+ // value搴忓垪鍖栨柟寮忛噰鐢╦ackson
+ template.setValueSerializer(jackson2JsonRedisSerializer);
+ // hash鐨剉alue搴忓垪鍖栨柟寮忛噰鐢╦ackson
+ template.setHashValueSerializer(jackson2JsonRedisSerializer);
+ template.afterPropertiesSet();
+ return template;
+ }
+}
+/*@Configuration
+public class RedisConfig {
+
+ *//**
+ * @param factory
+ * @return 鑷畾涔塺edisTemplate锛岃嚜甯︾殑bean娌℃湁搴忓垪鍖栧櫒
+ *//*
+ @Bean
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+ redisTemplate.setConnectionFactory(factory);
+ redisTemplate.setKeySerializer(new StringRedisSerializer());//璁剧疆key鐨勫簭鍒楀寲鍣�
+ redisTemplate.setValueSerializer(new RedisConverter());//璁剧疆鍊肩殑搴忓垪鍖栧櫒
+ return redisTemplate;
+ }
+
+}*/
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
new file mode 100644
index 0000000..ff27fcd
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/core/utils/redis/RedisConverter.java
@@ -0,0 +1,38 @@
+package com.doumee.core.utils.redis;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.serializer.support.DeserializingConverter;
+import org.springframework.core.serializer.support.SerializingConverter;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+/**
+ * @author 褰紵
+ * @date 2018/8/28 9:31
+ */
+public class RedisConverter implements RedisSerializer<Object> {
+ private Converter<Object, byte[]> serializer = new SerializingConverter();//搴忓垪鍖栧櫒
+ private Converter<byte[], Object> deserializer = new DeserializingConverter();//鍙嶅簭鍒楀寲鍣�
+
+ @Override
+ public byte[] serialize(Object o) throws SerializationException {//灏嗗璞″簭鍒楀寲鎴愬瓧鑺傛暟缁�
+ if (o == null) return new byte[0];
+ try {
+ return serializer.convert(o);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return new byte[0];
+ }
+ }
+
+ @Override
+ public Object deserialize(byte[] bytes) throws SerializationException {//灏嗗瓧鑺傛暟缁勫弽搴忓垪鍖栨垚瀵硅薄
+ if (bytes == null || bytes.length == 0) return null;
+ try {
+ return deserializer.convert(bytes);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+}
diff --git a/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java b/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
new file mode 100644
index 0000000..28d5cb9
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/core/utils/redis/RedisUtil.java
@@ -0,0 +1,86 @@
+package com.doumee.core.utils.redis;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.concurrent.TimeUnit;
+
+public class RedisUtil {
+ /**
+ * 娣诲姞涓�涓猇alue涓篠tring
+ * @param stringRedisTemplate
+ * @param key
+ * @param str
+ */
+ public static void addString( StringRedisTemplate stringRedisTemplate, String key, String str) {
+ //1,娣诲姞涓�涓猇alue涓篠tring
+ stringRedisTemplate.opsForValue().set(key, str);
+
+ }
+
+ /**
+ * 鏍规嵁key鍒犻櫎瀛楃涓茬紦瀛�
+ * @param stringRedisTemplate
+ * @param key
+ */
+ public static void delString( StringRedisTemplate stringRedisTemplate, String key ) {
+ //1,娣诲姞涓�涓猇alue涓篠tring
+ stringRedisTemplate.delete(key);
+
+ }
+
+ /**
+ * 鏍规嵁key鍒犻櫎瀵硅薄鏁版嵁
+ * @param redisTemplate
+ * @param key
+ */
+ public static void deleteObject( RedisTemplate<String, Object> redisTemplate , String key ) {
+
+ redisTemplate.delete(key);
+
+ }
+ /**
+ * 娣诲姞涓�涓猇alue涓哄璞�
+ * @param redisTemplate
+ * @param key
+ * @param obj
+ */
+ public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj) {
+ redisTemplate.opsForValue().set(key, obj);
+ }
+ /**
+ * 娣诲姞涓�涓猇alue涓哄璞�
+ * @param redisTemplate
+ * @param key
+ * @param obj
+ */
+ public static void addObject(RedisTemplate<String, Object> redisTemplate , String key, Object obj,long time) {
+// redisTemplate.opsForValue().set(key, obj);
+ redisTemplate.opsForValue().set(key,obj,time, TimeUnit.SECONDS);
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+ * @param stringRedisTemplate
+ * @param key
+ * @return
+ */
+ public static String getString(StringRedisTemplate stringRedisTemplate, String key){
+ String val = stringRedisTemplate.opsForValue().get(key);
+ return val;
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟瀵硅薄绫诲瀷锛岃繑鍥炵浉搴旂紦瀛樺璞℃暟鎹�
+ * @param redisTemplate
+ * @param key
+ * @param clazz
+ * @param <T>
+ * @return
+ */
+ public static <T> T getObject(RedisTemplate<String, Object> redisTemplate , String key,Class<T> clazz){
+ T t = (T) redisTemplate.opsForValue().get(key);
+ return t;
+ }
+
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java b/server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java
index cc67a58..f9d3086 100644
--- a/server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/OrdersMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Orders;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
-public interface OrdersMapper extends BaseMapper<Orders> {
+public interface OrdersMapper extends MPJBaseMapper<Orders> {
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Member.java b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
index a32a200..fbbcd18 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -156,7 +156,6 @@
@ExcelColumn(name="鏄惁鎺ュ彈鑷姩娲惧崟:0=鍚︼紱1=鏄紱")
private Integer autoReceiveStatus;
-
@ApiModelProperty(value = "褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;", example = "1")
@ExcelColumn(name="褰撳墠浣跨敤韬唤:0=鐢ㄥ伐鍙戝竷鏂�;1=鐢ㄥ伐鎺ュ崟鏂�;")
private Integer useIdentity;
@@ -174,4 +173,20 @@
@TableField(exist = false)
private Integer type;
+ @ApiModelProperty(value = "澶村儚鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String fullCoverImage;
+
+ @ApiModelProperty(value = "鐢ㄥ伐韬唤", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo workerIdentityModel;
+
+ @ApiModelProperty(value = "鍙告満韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo driverIdentityModel;
+
+ @ApiModelProperty(value = "閫侀韬唤淇℃伅", example = "1")
+ @TableField(exist = false)
+ private IdentityInfo chefIdentityModel;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
index 742ec07..db46db3 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
@@ -103,4 +103,7 @@
@TableField(exist = false)
@ExcelColumn(name="鐢ㄦ埛openid" ,index = 1,width = 6)
private String openid;
+ @ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸�;1=鍒嗘嫞宸�;2=鍖呰宸�", example = "1")
+ @TableField(exist = false)
+ private Integer workType;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 9e7fde9..384a0f5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -153,7 +153,7 @@
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣鍦板潃")
+ @ExcelColumn(name = "鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
@@ -246,7 +246,7 @@
private Integer totalDays;
@ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
- @ExcelColumn(name="鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
+ @ExcelColumn(name = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
private Integer cancelType;
@ApiModelProperty(value = "鍥剧墖")
@@ -261,11 +261,26 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
-
- @ApiModelProperty(value = "绉诲姩绔敤鎴�",hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
@TableField(exist = false)
private Member member;
+ @ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryMyOrderType;
+
+ @ApiModelProperty(value = "闇�姹傜被鍨�")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "杩愯緭鍝佺")
+ @TableField(exist = false)
+ private String transportTypeName;
+
+ @ApiModelProperty(value = "璺濈 鍗曚綅km")
+ @TableField(exist = false)
+ private double distance;
}
+
diff --git a/server/services/src/main/java/com/doumee/dao/dto/WithdrawalDTO.java b/server/services/src/main/java/com/doumee/dao/dto/WithdrawalDTO.java
new file mode 100644
index 0000000..912899d
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/dto/WithdrawalDTO.java
@@ -0,0 +1,23 @@
+package com.doumee.dao.dto;
+
+import com.doumee.dao.business.model.Member;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:50
+ */
+@Data
+@ApiModel("鎻愮幇鐢宠")
+public class WithdrawalDTO {
+
+ @ApiModelProperty(value = "鎻愮幇閲戦 (鍗曚綅锛氬垎)")
+ private Long amount;
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅",hidden = true)
+ private Member member;
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/OrdersService.java b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
index c690a4c..c501dc0 100644
--- a/server/services/src/main/java/com/doumee/service/business/OrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
@@ -126,4 +126,8 @@
String payNotify(String preOrderId,String paymentNo);
void platformCancel(Integer orderId, LoginUserInfo loginUserInfo);
+
+ PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);
+
+ Orders getDetail(Integer id,Integer userType);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java b/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
index ed032a9..3f99a0f 100644
--- a/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/WithdrawalOrdersService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.WithdrawalOrders;
+import com.doumee.dao.dto.WithdrawalDTO;
+
import java.util.List;
/**
@@ -94,4 +96,7 @@
* @return long
*/
long count(WithdrawalOrders withdrawalOrders);
+
+ void applyWithdrawal(WithdrawalDTO withdrawalDTO);
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
index 2763bf4..a24c980 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.dao.business.MemberRevenueMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
+import com.doumee.dao.business.model.Orders;
import com.doumee.service.business.MemberRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -97,7 +98,9 @@
.selectAs(Member::getName,MemberRevenue::getMemberName)
.selectAs(Member::getNickName,MemberRevenue::getMemberNickname)
.selectAs(Member::getTelephone,MemberRevenue::getMemberPhone)
- .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId);
+ .selectAs(Orders::getWorkType,MemberRevenue::getWorkType)
+ .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId)
+ .leftJoin(Orders.class,Orders::getId,MemberRevenue::getObjId);
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setDeleted(Constants.ZERO);
queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());
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 50586b7..320b2ea 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
@@ -12,7 +12,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.GeoUtils;
import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.dto.*;
@@ -21,14 +23,17 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Amount;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Payer;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayRequest;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse;
import jodd.util.StringUtil;
+import nonapi.io.github.classgraph.json.Id;
import org.apache.poi.sl.image.ImageHeaderEMF;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -70,7 +75,13 @@
private MemberRevenueMapper memberRevenueMapper;
@Autowired
+ private IdentityInfoMapper identityInfoMapper;
+
+ @Autowired
private WxMiniUtilService wxMiniUtilService;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -79,8 +90,8 @@
this.initVerification(orders);
orders.setCreateTime(new Date());
orders.setPayStatus(Constants.ZERO);
- //TODO 璁㈠崟缂栧彿瑙勫垯
-
+ //璁㈠崟缂栧彿
+ orders.setCode(this.getNextCode(orders.getType()));
Category category = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
.eq(Category::getDeleted,Constants.ZERO).eq(Category::getType,Constants.THREE)
.eq(Category::getName,orders.getType())
@@ -1133,4 +1144,182 @@
return ("澶勭悊鎴愬姛!");
}
+
+ @Override
+ public PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap) {
+ IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Orders> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ Orders model = pageWrap.getModel();
+ queryWrapper.selectAll(Orders.class)
+ .select("c1.name",Orders::getCategoryName)
+ .select("c2.name",Orders::getTransportTypeName)
+ .leftJoin(" category c1 on t.category_id = c1.id ")
+ .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ");
+ if(Objects.nonNull(model.getQueryMyOrderType())){
+ if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){
+ //鍙戝崟鏂� 鎴戠殑璁㈠崟
+ queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId());
+ }else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){
+ //鎺ュ崟鏂� 鎴戠殑璁㈠崟
+ queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId());
+ }else{
+ //鎺ュ崟澶у巺
+ queryWrapper.and(i->
+ i.eq(Constants.equalsInteger(model.getMember().getWorkerIdentity(),Constants.TWO),Orders::getType,Constants.ZERO)
+ .or()
+ .eq(Constants.equalsInteger(model.getMember().getDriverIdentity(),Constants.TWO),Orders::getType,Constants.ONE)
+ .or()
+ .eq(Constants.equalsInteger(model.getMember().getChefIdentity(),Constants.TWO),Orders::getType,Constants.TWO)
+ );
+ queryWrapper.eq(Orders::getStatus,Constants.ONE);
+ }
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper);
+ if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){
+ if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){
+ model.getMember().setWorkerIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.ZERO)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ model.getMember().setDriverIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.ONE)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ model.getMember().setChefIdentityModel(
+ identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,model.getMember().getId())
+ .eq(IdentityInfo::getType,Constants.TWO)
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ )
+ );
+ }
+ for (Orders orders:iPage.getRecords()) {
+ this.getDistance(model.getMember(),orders);
+ }
+ }
+ return PageData.from(iPage);
+ }
+
+
+
+
+ //瀹氫綅璺濈
+ public void getDistance(Member member,Orders orders){
+
+ if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ if(Objects.nonNull(member.getWorkerIdentityModel())&&Objects.nonNull(member.getWorkerIdentityModel().getLgt())
+ &&Objects.nonNull(member.getWorkerIdentityModel().getLat())){
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getWorkerIdentityModel().getLgt().doubleValue(),
+ member.getWorkerIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+
+ }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
+ if(Objects.nonNull(member.getDriverIdentityModel())&&Objects.nonNull(member.getDriverIdentityModel().getLgt())
+ &&Objects.nonNull(member.getDriverIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
+ member.getDriverIdentityModel().getLgt().doubleValue(),
+ member.getDriverIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+ }else{
+ if(Objects.nonNull(member.getChefIdentityModel())&&Objects.nonNull(member.getChefIdentityModel().getLgt())
+ &&Objects.nonNull(member.getChefIdentityModel().getLat())) {
+ orders.setDistance(
+ GeoUtils.haversineDistance(
+ orders.getLgt().doubleValue(),orders.getLat().doubleValue(),
+ member.getChefIdentityModel().getLgt().doubleValue(),
+ member.getChefIdentityModel().getLat().doubleValue()
+ )
+ );
+ }
+ }
+ }
+
+
+
+ @Override
+ public Orders getDetail(Integer id,Integer userType) {
+ Orders orders = ordersMapper.selectJoinOne(Orders.class,new MPJLambdaWrapper<Orders>()
+ .selectAll(Orders.class)
+ .select("c1.name",Orders::getCategoryName)
+ .select("c2.name",Orders::getTransportTypeName)
+ .leftJoin(" category c1 on t.category_id = c1.id ")
+ .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ")
+ .eq(Orders::getId,id)
+ );
+ if(Objects.isNull(orders)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Objects.nonNull(userType)){
+ Member member = memberMapper.selectById(
+ Constants.equalsInteger(userType,Constants.ZERO)?orders.getReleaseMemberId():orders.getAcceptMemberId()
+ );
+ if(Objects.nonNull(member)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getCoverImage())){
+ //澶村儚淇℃伅
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
+ member.setFullCoverImage(path + member.getCoverImage());
+ }
+ orders.setMember(member);
+ }
+ }
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORDERS_FILES).getCode();
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ orders.setMultifileList(multifileList);
+ }
+
+
+ return orders;
+ }
+
+
+
+
+ public synchronized String getNextCode(Integer type){
+ String prefix = "YG";
+ if(!Constants.equalsInteger(type,Constants.ZERO)){
+ prefix = (Constants.equalsInteger(type,Constants.ONE)?"YC-":"SC-");
+ }
+ prefix = DateUtil.getDate(new Date(),"yyyyMMdd") +"-";
+ Integer countNum = RedisUtil.getObject(redisTemplate, Constants.RedisKeys.ORDER_CODE, Integer.class);
+ countNum = Constants.formatIntegerNum(countNum)+1;
+ //鏇存柊缂撳瓨
+ RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ORDER_CODE,countNum);
+ String nextIndex =Integer.toString( countNum );
+ return prefix + org.apache.commons.lang3.StringUtils.leftPad(nextIndex,3,"0");
+ }
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
index 03b55af..6c9445e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
@@ -1,10 +1,18 @@
package com.doumee.service.business.impl;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.MemberRevenueMapper;
import com.doumee.dao.business.WithdrawalOrdersMapper;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.business.model.WithdrawalOrders;
+import com.doumee.dao.dto.WithdrawalDTO;
import com.doumee.service.business.WithdrawalOrdersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -12,9 +20,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鎻愮幇鐢宠璁板綍Service瀹炵幇
@@ -26,6 +37,12 @@
@Autowired
private WithdrawalOrdersMapper withdrawalOrdersMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private MemberRevenueMapper memberRevenueMapper;
@Override
public Integer create(WithdrawalOrders withdrawalOrders) {
@@ -146,4 +163,49 @@
QueryWrapper<WithdrawalOrders> wrapper = new QueryWrapper<>(withdrawalOrders);
return withdrawalOrdersMapper.selectCount(wrapper);
}
+
+
+ /************************************绉诲姩绔帴鍙�*******************************************/
+
+ /**
+ * 鎻愮幇鐢宠
+ * @param withdrawalDTO
+ */
+
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void applyWithdrawal(WithdrawalDTO withdrawalDTO){
+ if(Objects.isNull(withdrawalDTO)
+ || Objects.isNull(withdrawalDTO.getAmount())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(withdrawalDTO.getMember().getId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛淇℃伅寮傚父,璇疯仈绯荤鐞嗗憳");
+ }
+ if(member.getAmount() < withdrawalDTO.getAmount()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙彁鐜颁綑棰濅笉瓒炽��");
+ }
+ WithdrawalOrders withdrawalOrders = new WithdrawalOrders();
+ withdrawalOrders.setCreateTime(new Date());
+ withdrawalOrders.setMemberId(member.getId());
+ withdrawalOrders.setAmount(withdrawalDTO.getAmount());
+ withdrawalOrders.setStatus(Constants.ZERO);
+ withdrawalOrders.setType(Constants.ZERO);
+
+ //TODO 鍙戣捣鎻愮幇鐢宠
+
+
+
+ //鏇存柊鐢ㄦ埛浣欓
+
+
+ //瀛樺偍娴佹按璁板綍
+
+
+
+ }
+
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index 36c03d3..21be535 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -4,9 +4,12 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.CommentDTO;
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
@@ -18,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -136,7 +140,7 @@
@LoginRequired
@ApiOperation(value = "瀹屾垚璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/doneOrder")
+ @PostMapping("/doneOrder")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
@@ -146,5 +150,38 @@
}
+ @LoginRequired
+ @ApiOperation(value = "璁㈠崟璇勪环 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
+ @PostMapping("/comment")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse comment(@RequestBody CommentDTO commentDTO) {
+ commentDTO.setMember(this.getMemberResponse());
+ ordersService.comment(commentDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
+ pageWrap.getModel().setMember(this.getMemberResponse());
+ return ApiResponse.success(ordersService.findPageForMini(pageWrap));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "璁㈠崟璇︽儏", notes = "灏忕▼搴忕")
+ @GetMapping("/getDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
+ }
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/UserApi.java b/server/web/src/main/java/com/doumee/api/web/UserApi.java
index fea1b3d..ebc7de0 100644
--- a/server/web/src/main/java/com/doumee/api/web/UserApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/UserApi.java
@@ -3,17 +3,23 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
import com.doumee.service.business.IdentityInfoService;
+import com.doumee.service.business.MemberRevenueService;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,8 +43,11 @@
@Autowired
private IdentityInfoService identityInfoService;
+ @Autowired
+ private MemberRevenueService memberRevenueService;
+
@LoginRequired
- @ApiOperation(value = "缂栬緫涓汉淇℃伅", notes = "灏忕▼搴忕")
+ @ApiOperation(value = "鑾峰彇涓汉淇℃伅", notes = "灏忕▼搴忕")
@GetMapping("/getMemberInfo")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -124,4 +133,15 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @LoginRequired
+ @ApiOperation("浣欓鏄庣粏")
+ @PostMapping("/revenuePage")
+ public ApiResponse<PageData<MemberRevenue>> revenuePage (@RequestBody PageWrap<MemberRevenue> pageWrap) {
+ pageWrap.getModel().setMemberId(this.getMemberId());
+ return ApiResponse.success(memberRevenueService.findPage(pageWrap));
+ }
+
+
+
}
--
Gitblit v1.9.3