gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：订单增加逾期未结判断

Browse Source
This commit is contained in:
yangqingyuan
2024-08-27 17:49:21 +08:00
parent dbd29447b9
commit 512c88155d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
View File

@@ -318,7 +318,7 @@ public class FreezeOrderController extends BaseController {
log.info("请求支付宝冻结接口返回数据：{}", JSON.toJSONString(response));
return fail("未支付押金！");
}
log.info("订单{}已支付押金！", orderId);
log.info("订单{},preAuthType:{},已支付押金！", orderId,response.getPreAuthType());
order.setIsFreeze(1);
if ("CREDIT_AUTH".equals(response.getPreAuthType())){
order.setIsCreditAuth(1);//信用预授权，即免押模式

34
src/main/java/com/gxwebsoft/shop/controller/OrderController.java
View File

@@ -1,45 +1,30 @@
package com.gxwebsoft.shop.controller;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import cn.hutool.extra.qrcode.QrConfig;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayFundAuthOrderAppFreezeRequest;
import com.alipay.api.response.AlipayFundAuthOrderAppFreezeResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.gxwebsoft.apps.entity.BcAgent;
import com.gxwebsoft.apps.entity.Equipment;
import com.gxwebsoft.apps.entity.EquipmentGoods;
import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
import com.gxwebsoft.apps.param.BcAgentParam;
import com.gxwebsoft.apps.service.BcAgentService;
import com.gxwebsoft.apps.service.EquipmentGoodsService;
import com.gxwebsoft.apps.service.EquipmentOrderGoodsService;
import com.gxwebsoft.apps.service.EquipmentService;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.core.config.ConfigProperties;
import com.gxwebsoft.common.core.utils.AlipayConfigUtil;
import com.gxwebsoft.common.core.web.*;
import com.gxwebsoft.common.system.entity.Role;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.UserService;
import com.gxwebsoft.shop.entity.*;
import com.gxwebsoft.shop.param.OrderGoodsParam;
import com.gxwebsoft.shop.param.OrderParam;
import com.gxwebsoft.shop.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -53,6 +38,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import static com.gxwebsoft.common.core.constants.OrderConstants.ORDER_STATUS_DOING;
@@ -66,6 +52,7 @@ import static com.gxwebsoft.common.core.constants.OrderConstants.PAY_STATUS_SUCC
*/
@Api(tags = "订单记录表管理")
@RestController
@Slf4j
@RequestMapping("/api/shop/order")
public class OrderController extends BaseController {
@Resource
@@ -383,8 +370,21 @@ public class OrderController extends BaseController {
order.setUserId(loginUser.getUserId());
}
//查询逾期订单
List<Order> overdueOrderList = orderService.lambdaQuery()
.eq(Order::getUserId,loginUser.getUserId())
.ne(Order::getOrderStatus,40)//过滤掉完结订单
.orderByDesc(Order::getCreateTime)
.list();
if (overdueOrderList != null && !overdueOrderList.isEmpty()) {
for(Order overdueOrder:overdueOrderList){
if (overdueOrder.getRestDay()<0){//如果剩余天数为负数
log.warn("添加订单失败，有订单逾期未结 userId:{},orderId:{},orderNo:{},restDay:{}",loginUser.getUserId(),overdueOrder.getOrderId(),overdueOrder.getOrderNo(),overdueOrder.getRestDay());
return fail("添加订单失败，有订单逾期未结");
}
}
}
// 历史订单
order.setCurrPeriods(0);
// 设置分期期数