From 9c90a14b37f37cf6142e4102c52d2b27f524f76f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 10:01:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java | 6 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java | 1
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 13 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java | 17 +++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java | 7 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java | 6 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 15 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 4 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java | 9 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 1
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 4
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 101 +++++++++++++++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java | 1
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 13 ++-
18 files changed, 189 insertions(+), 19 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
index 15ee0ab..7dfd7e9 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
@@ -31,6 +31,9 @@
@ApiModelProperty("用户id")
private Long appUserId;
+ @ApiModelProperty("vip等级id")
+ private Integer vipId;
+
@ApiModelProperty("订单id")
private Long orderId;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
index 0fdfb46..b9a2d7b 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/LogisticsSetDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
@ApiModel(description = "物流设置")
public class LogisticsSetDto {
@@ -17,13 +19,13 @@
* 订单运费
*/
@ApiModelProperty(value = "订单运费")
- private Integer freight;
+ private BigDecimal freight;
/**
* 包邮订单金额
*/
@ApiModelProperty(value = "包邮订单金额")
- private Integer freeFreight;
+ private BigDecimal freeFreight;
/**
* 包邮订单积分
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java
index 3b0ddec..82633b0 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/ShopBalanceStatementClientFallbackFactory.java
@@ -6,6 +6,7 @@
import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
import org.springframework.cloud.openfeign.FallbackFactory;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
@@ -27,6 +28,11 @@
public R<List<ShopBalanceStatement>> getShopBalanceStatementList(Collection<Integer> types, Long objectId) {
return R.fail("获取门店余额流水失败：" + cause.getMessage());
}
+
+ @Override
+ public R<List<ShopBalanceStatement>> getShopBalanceStatementList2(Integer type, LocalDateTime date) {
+ return R.fail();
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java
index 3897c52..e2f2e57 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopBalanceStatementClient.java
@@ -9,6 +9,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
@@ -34,5 +35,9 @@
* @return
*/
@PostMapping("/shop-balance-statement/getShopBalanceStatementList")
- R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam("objectId") Long objectId);
+ R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam(value = "objectId",required = false) Long objectId);
+
+ @PostMapping("/shop-balance-statement/getShopBalanceStatementList2")
+ R<List<ShopBalanceStatement>> getShopBalanceStatementList2(@RequestParam("type") Integer type,
+ @RequestParam(value = "date") LocalDateTime date);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 4aace92..bdc22ca 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -28,13 +28,17 @@
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
+import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.StoreClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -48,8 +52,10 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -99,7 +105,11 @@
@Resource
private OrderClient orderClient;
@Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+ @Resource
private UserCancellationLogService userCancellationLogService;
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
@ResponseBody
@@ -511,7 +521,10 @@
@GetMapping("/select")
@ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
public R<AppUser> select(String phone) {
- AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ AppUser byId = appUserService.lambdaQuery()
+ .eq(AppUser::getPhone, phone)
+ .eq(AppUser::getDelFlag,0)
+ .one();
if (byId == null) {
return R.fail("搜索失败，手机号错误。");
}
@@ -771,6 +784,25 @@
totalUserCommission = totalUserCommission.add(shop.getGiveawayMoney());
}
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), null);
+ List<ShopBalanceStatement> data1 = r.getData();
+ if (!CollectionUtils.isEmpty(data1)){
+ for (ShopBalanceStatement shopBalanceStatement : data1) {
+ String dateKey = shopBalanceStatement.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Integer type = shopBalanceStatement.getType();
+ if (type == 1){
+ type = 8;
+ }else if (type == 2){
+ type = 9;
+ }else {
+ type = 10;
+ }
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(type, shopBalanceStatement.getVariableAmount(), BigDecimal::add);
+ }
+ }
+
+
CommissionDetail commissionDetail = new CommissionDetail();
commissionDetail.setTotalCommission(totalCommission);
commissionDetail.setTotalServiceFee(totalServiceFee);
@@ -799,6 +831,10 @@
BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
.add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
commissionDate.setTotalCommission(add);
+
+ commissionDate.setServiceChargeCommission(dailyCommissions.getOrDefault(10, BigDecimal.ZERO));
+ commissionDate.setAssociatedUserCommission(dailyCommissions.getOrDefault(8, BigDecimal.ZERO));
+ commissionDate.setBindLowerLevelStoresCommission(dailyCommissions.getOrDefault(9, BigDecimal.ZERO));
return commissionDate;
})
.collect(Collectors.toList());
@@ -806,6 +842,69 @@
commissionDetail.setCommissionDateList(commissionDateList);
return R.ok(commissionDetail);
}
+
+
+ public R<CommissionDetail> commissionDetail2(CommissionDetail cd) {
+ if (cd.getStartTime() == null || cd.getEndTime() == null) {
+ return R.fail("请选择时间");
+ }
+ if (cd.getStartTime().isAfter(cd.getEndTime())) {
+ return R.fail("开始时间不能大于结束时间");
+ }
+
+
+ Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
+ getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {
+ for (int i = 1; i < 8; i++){
+ List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ .eq(BalanceChangeRecord::getCreateTime, date)
+ .eq(BalanceChangeRecord::getChangeType,4)
+ .eq(BalanceChangeRecord::getVipId, i));
+ BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(i, reduce, BigDecimal::add);
+ }
+
+ for (int i = 1; i < 4; i++){
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);
+ if (!CollectionUtils.isEmpty(r.getData())){
+ List<ShopBalanceStatement> list = r.getData();
+ BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ int type;
+ if (i == 1){
+ type = 8;
+ }else if (i == 2){
+ type = 9;
+ }else {
+ type = 10;
+ }
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(type, reduce, BigDecimal::add);
+ }
+ }
+ });
+ return null;
+ }
+
+
+ /**
+ * 获取指定时间段内每一天的列表
+ *
+ * @param startDate 开始日期时间
+ * @param endDate 结束日期时间
+ * @return 包含每天日期时间的列表
+ */
+ private static List<LocalDateTime> getDatesBetween(LocalDateTime startDate, LocalDateTime endDate) {
+ // 计算开始日期和结束日期之间的天数差（忽略时间部分）
+ long daysBetween = ChronoUnit.DAYS.between(startDate.toLocalDate(), endDate.toLocalDate());
+
+ // 使用Stream.iterate从开始日期开始迭代，每次增加一天，直到达到天数差+1
+ return Stream.iterate(startDate, date -> date.plus(1, ChronoUnit.DAYS))
+ .limit(daysBetween + 1)
+ .collect(Collectors.toList());
+ }
/**
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 4bcd4c1..06f5dd9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -22,6 +22,7 @@
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.PointSettingClient;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -135,12 +136,14 @@
String phone,
Integer id) {
- Long appUserId = null;
+ List<Long> appUserIds = null;
if (!StringUtils.isEmpty(phone)){
- AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
.like(AppUser::getPhone, phone));
- if (appUser1 != null){
- appUserId = appUser1.getId();
+ if (!CollectionUtils.isEmpty(appUserList)){
+ appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
+ }else {
+ return R.ok(Page.of(pageNum, pageSize));
}
}
@@ -148,7 +151,7 @@
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.eq(UserCoupon::getCouponId, id)
- .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
+ .in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index 999eeff..75701a6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -187,6 +187,7 @@
//流水
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(balanceChangeRecord.getId());
balanceChangeRecord.setChangeType(1);
balanceChangeRecord.setBeforeAmount(balance);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
index 8039212..bea2770 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WithdrawalRequestsController.java
@@ -134,6 +134,7 @@
//添加变动明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(withdrawal.getId());
balanceChangeRecord.setChangeType(2);
balanceChangeRecord.setBeforeAmount(balance);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
index 74cbc9f..8c63510 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WithdrawalRequestsServiceImpl.java
@@ -109,6 +109,7 @@
//添加变动明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(withdrawalRequests.getId());
balanceChangeRecord.setChangeType(2);
balanceChangeRecord.setBeforeAmount(balance);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index e5b1b25..a62c6df 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -16,8 +16,10 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
@@ -69,6 +71,8 @@
private OrderMapper orderMapper;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RefundPassService refundPassService;
/**
@@ -205,6 +209,7 @@
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
order1.setOrderStatus(order.getOrderStatus());
+ order1.setOldOrderStatus(order.getOldOrderStatus());
orderService.updateById(order1);
return R.ok();
}
@@ -266,6 +271,10 @@
@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
+ if (refundPass!=null){
+ orderInfo.setRefundPassId(refundPass.getId().toString());
+ }
return R.ok(orderInfo);
}
@@ -286,8 +295,10 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
- .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+ .orderByAsc(Order::getCreateTime));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 3c86592..e139ff9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -131,7 +132,8 @@
public R<PageInfo<OrderRefundPassList>> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo){
return R.ok(refundPassService.getOrderRefundPassList(refundPassListVo));
}
-
+
+
@ResponseBody
@PostMapping("/authPassStatus")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index 3a3a40b..9960d13 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -174,6 +174,7 @@
if(!inviteUser.getBalance().equals(balance)){
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(inviteUser.getId());
+ balanceChangeRecord.setVipId(inviteUser.getVipId());
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setChangeType(4);
balanceChangeRecord.setBeforeAmount(balance);
@@ -232,6 +233,7 @@
if(!superiorLeader.getBalance().equals(balance)){
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(superiorLeader.getId());
+ balanceChangeRecord.setVipId(superiorLeader.getVipId());
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setChangeType(4);
balanceChangeRecord.setBeforeAmount(balance);
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 27cd8a3..4c347d4 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
@@ -197,6 +197,7 @@
orderDetailVO.setAddressId(userAddress.getId());
orderDetailVO.setRecieveName(userAddress.getRecieveName());
orderDetailVO.setRecievePhone(userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderDetailVO.setRecieveAddress(userAddress.getRecieveAddress());
orderDetailVO.setOrderNumber(order.getOrderNumber());
orderDetailVO.setCreateTime(order.getCreateTime());
@@ -448,6 +449,7 @@
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(paymentAmount);
@@ -528,6 +530,7 @@
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setAppUserId(order.getAppUserId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setChangeType(6);
balanceChangeRecord.setBeforeAmount(balance);
balanceChangeRecord.setChangeAmount(expressAmount);
@@ -759,6 +762,7 @@
if(StringUtils.isNotEmpty(order.getAddressJson())){
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
orderInfo.setAddress(userAddress.getRecieveAddress());
}
if(StringUtils.isNotEmpty(order.getExpressJson()) && !"NULL".equals(order.getExpressJson())){
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index d4d56f8..d6f1b01 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -543,6 +543,7 @@
UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
if(null != userAddress){
userAddress.setIdStr(userAddress.getId().toString());
+ userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
confirmOrderVo.setUserAddress(userAddress);
}
confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
@@ -1238,6 +1239,7 @@
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setChangeType(5);
balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney));
@@ -1361,6 +1363,7 @@
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setChangeType(5);
balanceChangeRecord.setBeforeAmount(balance.add(expressFee));
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
index 578f8af..9f41e2c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java
@@ -16,6 +16,8 @@
public class OrderInfoVo {
@ApiModelProperty("订单id")
private String id;
+ @ApiModelProperty("售后订单id")
+ private String refundPassId;
@ApiModelProperty("订单编号")
private String orderNumber;
@ApiModelProperty("下单时间")
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 830d129..389d80d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -99,6 +99,7 @@
}
share.setDelFlag(0);
share.setAppletShare(1);
+ share.setCreateTime(LocalDateTime.now());
shareService.save(share);
return R.ok();
}
@@ -155,6 +156,9 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
+ if (share.getAuditStatus()==2){
+ share.setAuditStatus(0);
+ }
shareService.updateById(share);
return R.ok();
}
@@ -205,8 +209,13 @@
@ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
@GetMapping("/manage/auth/list")
public R<Page<Share>> authmanagelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
- Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name)
- .eq(addType != null, Share::getAddType, addType).eq(Share::getDelFlag, 0).orderByAsc(Share::getAuditStatus).page(Page.of(pageNum, pageSize));
+ Page<Share> page = shareService.lambdaQuery()
+ .ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name)
+ .eq(addType != null, Share::getAddType, addType)
+ .eq(Share::getDelFlag, 0)
+ .orderByAsc(Share::getAuditStatus)
+ .orderByDesc(Share::getCreateTime)
+ .page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
index 86a05d4..63a0b98 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopBalanceStatementController.java
@@ -25,6 +25,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.List;
@@ -165,9 +166,19 @@
* @return
*/
@PostMapping("/getShopBalanceStatementList")
- public R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam("objectId") Long objectId){
- List<ShopBalanceStatement> list = shopBalanceStatementService.list(new LambdaQueryWrapper<ShopBalanceStatement>().eq(ShopBalanceStatement::getObjectId, objectId)
- .in(ShopBalanceStatement::getType, types));
+ public R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestParam("types") Collection<Integer> types, @RequestParam(value = "objectId",required = false) Long objectId){
+ List<ShopBalanceStatement> list = shopBalanceStatementService.list(new LambdaQueryWrapper<ShopBalanceStatement>()
+ .eq(objectId != null,ShopBalanceStatement::getObjectId, objectId)
+ .in(types !=null && !types.isEmpty(),ShopBalanceStatement::getType, types));
+ return R.ok(list);
+ }
+
+ @PostMapping("/getShopBalanceStatementList2")
+ public R<List<ShopBalanceStatement>> getShopBalanceStatementList2(@RequestParam("type") Integer type,
+ @RequestParam(value = "date") LocalDateTime date){
+ List<ShopBalanceStatement> list = shopBalanceStatementService.list(new LambdaQueryWrapper<ShopBalanceStatement>()
+ .eq(ShopBalanceStatement::getType, type)
+ .in(ShopBalanceStatement::getCreateTime, date));
return R.ok(list);
}
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
index 99fd3de..38d3748 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
import com.ruoyi.other.mapper.GoodsEvaluateMapper;
@@ -33,6 +34,8 @@
private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Resource
private TokenService tokenService;
+ @Resource
+ private OrderClient orderClient;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -51,9 +54,11 @@
}
}
if (CollectionUtil.isNotEmpty(evaluates)){
+ Long orderId = goodsEvaluateVO.getEvaluates().get(0).getOrderId();
+ Order data = orderClient.getOrderById(orderId).getData();
Order order = new Order();
- order.setId(goodsEvaluateVO.getEvaluates().get(0).getOrderId());
- order.setOldOrderStatus(order.getOrderStatus());
+ order.setId(data.getId());
+ order.setOldOrderStatus(data.getOrderStatus());
order.setOrderStatus(8);
R<Void> r = remoteOrderGoodsClient.updateOrderStatus(order);
if (R.isError(r)){
--
Gitblit v1.7.1