From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 251 +++++++++++++++++++++++++++----------------------
1 files changed, 138 insertions(+), 113 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
index 3905395..fba2703 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
@@ -44,6 +44,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -163,7 +164,6 @@
orderLambdaQueryWrapper.eq(Order::getPaymentStatus, status);
}
orderLambdaQueryWrapper.in(Order::getOrderFrom,longs);
- orderLambdaQueryWrapper.ne(Order::getRefundStatus, 3);
List<Order> list = orderService.list(orderLambdaQueryWrapper);
return R.ok(list);
}
@@ -370,9 +370,16 @@
waterExport.setUserName(byId1.getNickname());
waterExport.setCellphone(byId1.getCellPhone());
}
- waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
- waterExport.setCommissionAmount("￥"+(record.getCommissionAmount()==null?new BigDecimal("0")+"":record.getCommissionAmount()+""));
- waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
+ if (record.getPaymentStatus()!=2){
+ waterExport.setRealPayAmount("￥"+0);
+ waterExport.setCommissionAmount("￥"+0);
+ waterExport.setPlatformMoney("￥"+0);
+ }else{
+ waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
+ waterExport.setCommissionAmount("￥"+(record.getCommissionAmount()==null?new BigDecimal("0")+"":record.getCommissionAmount()+""));
+ waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
+ }
+
waterExport.setBuyContent(record.getBuyContent());
waterExport.setOrderFrom(record.getOrderFrom()+"");
waterExport.setPayType(record.getPayType());
@@ -416,28 +423,25 @@
startTime = split[0]+" 00:00:00";
endTime = split[1]+" 23:59:59";
}
- List<Integer> payType1 = new ArrayList<>();
- payType1.add(1);
- payType1.add(5);
- List<Integer> payType2 = new ArrayList<>();
- payType2.add(2);
- payType2.add(6);
- List<Integer> payType3 = new ArrayList<>();
- payType3.add(3);
- payType3.add(7);
+
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- if (courseDTO.getPayType()!=null){
- courseLambdaQueryWrapper.eq(Order::getPayType, courseDTO.getPayType());
+ if (StringUtils.hasLength(courseDTO.getPayType())){
+ courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
}
- if (courseDTO.getPaymentStatus()!=null){
- courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
+ if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
+ if (courseDTO.getPaymentStatus().equals("4")){
+ courseLambdaQueryWrapper.eq(Order::getRefundStatus,3);
+ }else{
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
+
+ }
}
- if (courseDTO.getOrderFrom()!=null){
- courseLambdaQueryWrapper.eq(Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (StringUtils.hasLength(courseDTO.getOrderFrom())){
+ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
}
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
@@ -496,6 +500,12 @@
order.setOrderFrom(5);
order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
order.setPayType(4);
+ // 提现订单
+ if (appUserWithdraw.getWithdrawStatus()==2){
+ order.setRefundStatus(3);
+ }else{
+ order.setRefundStatus(1);
+ }
order.setTotalAmount(appUserWithdraw.getAmount());
order.setRealPayAmount(appUserWithdraw.getAmount());
order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
@@ -508,6 +518,7 @@
objectPage.setCurrent(courseDTO.getPageCurr());
objectPage.setSize(courseDTO.getPageSize());
for (Order record : page) {
+
record.setUid(record.getId().toString());
record.setPlatformMoney((record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount()).subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData();
@@ -551,6 +562,11 @@
break;
}
+ }
+ if (record.getPaymentStatus()!=2){
+ record.setPlatformMoney(null);
+ record.setRealPayAmount(null);
+ record.setCommissionAmount(null);
}
}
// 手动分页
@@ -600,14 +616,19 @@
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- if (courseDTO.getPayType()!=null){
- courseLambdaQueryWrapper.eq(Order::getPayType,courseDTO.getPayType());
+ if (StringUtils.hasLength(courseDTO.getPayType())){
+ courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
}
- if (courseDTO.getPaymentStatus()!=null){
- courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
+ if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
+ if (courseDTO.getPaymentStatus().equals("4")){
+ courseLambdaQueryWrapper.eq(Order::getRefundStatus,3);
+ }else{
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
+
+ }
}
- if (courseDTO.getOrderFrom()!=null){
- courseLambdaQueryWrapper.eq(Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (StringUtils.hasLength(courseDTO.getOrderFrom())){
+ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
}
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
@@ -665,6 +686,12 @@
order.setOrderFrom(5);
order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
order.setPayType(4);
+ // 提现订单
+ if (appUserWithdraw.getWithdrawStatus()==2){
+ order.setRefundStatus(3);
+ }else{
+ order.setRefundStatus(1);
+ }
order.setTotalAmount(appUserWithdraw.getAmount());
order.setRealPayAmount(appUserWithdraw.getAmount());
order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
@@ -732,26 +759,17 @@
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
- }
courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (StringUtils.hasLength(courseDTO.getPayType())){
+ courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
+ }
+ if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
+ }
+ if (StringUtils.hasLength(courseDTO.getOrderFrom())){
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getOrderFrom().split(",")));
+ }
courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
@@ -887,44 +905,19 @@
startTime = split[0]+" 00:00:00";
endTime = split[1]+" 23:59:59";
}
- List<Integer> payType1 = new ArrayList<>();
- payType1.add(1);
- payType1.add(5);
- List<Integer> payType2 = new ArrayList<>();
- payType2.add(2);
- payType2.add(6);
- List<Integer> payType3 = new ArrayList<>();
- payType3.add(3);
- payType3.add(7);
- List<Integer> payType4 = new ArrayList<>();
- payType4.add(4);
- payType4.add(5);
- payType4.add(6);
- payType4.add(7);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
+ if (StringUtils.hasLength(courseDTO.getPayType())){
+ courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
}
- courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
- courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
+ }
+ if (StringUtils.hasLength(courseDTO.getOrderFrom())){
+ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
+ }
courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
@@ -989,7 +982,12 @@
if (data!=null){
record.setCategoryMeditationName(data.getCategoryName());
record.setMeditationTitle(data.getMeditationTitle());
- record.setCoverUrl(data.getCoverUrl());
+ String[] split = data.getCoverUrl().split(",");
+ if (split.length>=2){
+ record.setCoverUrl(split[0]);
+ }else {
+ record.setCoverUrl(data.getCoverUrl());
+ }
record.setIconUrl(StringUtils.hasLength(data.getCoverUrl())?data.getCoverUrl().split(",")[0]:"");
record.setDetailDescription(data.getDetailDescription());
record.setGeneralPriceMeditation(record.getRealPayAmount());
@@ -1030,44 +1028,20 @@
startTime = split[0]+" 00:00:00";
endTime = split[1]+" 23:59:59";
}
- List<Integer> payType1 = new ArrayList<>();
- payType1.add(1);
- payType1.add(5);
- List<Integer> payType2 = new ArrayList<>();
- payType2.add(2);
- payType2.add(6);
- List<Integer> payType3 = new ArrayList<>();
- payType3.add(3);
- payType3.add(7);
- List<Integer> payType4 = new ArrayList<>();
- payType4.add(4);
- payType4.add(5);
- payType4.add(6);
- payType4.add(7);
+
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
+ if (StringUtils.hasLength(courseDTO.getPayType())){
+ courseLambdaQueryWrapper.in(Order::getPayType,Arrays.asList(courseDTO.getPayType().split(",")));
}
- courseLambdaQueryWrapper.ne(Order::getOrderFrom, 4);
- courseLambdaQueryWrapper.ne(Order::getOrderFrom, 5);
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (StringUtils.hasLength(courseDTO.getPaymentStatus())){
+ courseLambdaQueryWrapper.in(Order::getPaymentStatus, Arrays.asList(courseDTO.getPaymentStatus().split(",")));
+ }
+ if (StringUtils.hasLength(courseDTO.getOrderFrom())){
+ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
+ }
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
@@ -1130,7 +1104,7 @@
}
}
if (record.getRealPayAmount()!=null){
- totalMoney = totalMoney.add(record.getRealPayAmount());
+ totalMoney = totalMoney.add(record.getTotalAmount());
}
}
orderCountVO.setTotalCount(page.size());
@@ -1144,7 +1118,16 @@
@GetMapping("/detailOrder")
@ApiOperation(value = "查看详情订单列表管理", tags = "管理后台-订单列表管理")
public R<Order> detailOrder(String uid) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Order record = orderService.getById(uid);
+
+ if (record.getGiveUserId()!=null){
+ AppUser data1 = remoteAppUserService.getAppUserById(record.getGiveUserId() + "").getData();
+ record.setUserNameGive(data1.getNickname());
+ }
+
+ record.setPlatformMoney(record.getRealPayAmount()==null?new BigDecimal("0"):(record.getRealPayAmount().subtract(
+ record.getCommissionAmount()==null?new BigDecimal("0"):record.getCommissionAmount())));
if (record.getOrderFrom()!=null){
switch (record.getOrderFrom()){
case 1:
@@ -1230,10 +1213,46 @@
}
break;
case 6:
- record.setPaymentType("支付宝(￥"+record.getRealPayAmount()+")");
+ if (!list.isEmpty()){
+ OrderPaymentRecord orderPaymentRecord = list.get(1);
+ OrderPaymentRecord orderPaymentRecord1 = list.get(0);
+ switch (orderPaymentRecord.getPaymentType()){
+ case 1:
+ record.setPaymentType("微信(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+ break;
+ case 2:
+ record.setPaymentType("支付宝(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+
+ break;
+ case 3:
+ record.setPaymentType("内购(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+ break;
+ }
+ }
break;
case 7:
- record.setPaymentType("内购(￥"+record.getRealPayAmount()+")");
+ if (!list.isEmpty()){
+ OrderPaymentRecord orderPaymentRecord = list.get(1);
+ OrderPaymentRecord orderPaymentRecord1 = list.get(0);
+ switch (orderPaymentRecord.getPaymentType()){
+ case 1:
+ record.setPaymentType("微信(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+ break;
+ case 2:
+ record.setPaymentType("支付宝(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+
+ break;
+ case 3:
+ record.setPaymentType("内购(￥"+(orderPaymentRecord.getPayAmount()==null?"":orderPaymentRecord.getPayAmount())+")"
+ +" + 余额(￥"+orderPaymentRecord1.getPayAmount()+")");
+ break;
+ }
+ }
break;
}
}
@@ -1256,6 +1275,11 @@
}
}
}
+ if (record.getRefundStatus()==3){
+ // 已退款
+ record.setPaymentStatus(4);
+ record.setCancelTime(record.getRefundTime());
+ }
return R.ok(record);
}
@GetMapping("/cancel")
@@ -1263,6 +1287,7 @@
public R updateState(String uid) {
Order byId = orderService.getById(uid);
byId.setPaymentStatus(3);
+ byId.setCancelTime(LocalDateTime.now());
orderService.updateById(byId);
return R.ok();
}
--
Gitblit v1.7.1