From e34c7cd328db59b640added59162f5544fa9587b Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 20 Aug 2024 15:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/security/SecurityConfig.java | 1 + .../shop/controller/OrderPayController.java | 36 +++++++++++++------ .../com/gxwebsoft/shop/entity/OrderPay.java | 3 ++ 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java index 8d02b4a..12655cd 100644 --- a/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/security/SecurityConfig.java @@ -57,6 +57,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { "/api/shop/payment/mp-alipay/test/**", "/api/shop/payment/mp-alipay/getPhoneNumber", "/api/shop/test/**", + "/api/shop/order-pay/change-order-no", "/api/shop/wx-login/**", "/api/apps/hualala/**", "/api/apps/hualala-cart/**", diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java index d8738f3..34c34eb 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alipay.api.AlipayApiException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gxwebsoft.apps.entity.EquipmentGoods; import com.gxwebsoft.apps.service.EquipmentGoodsService; @@ -87,6 +88,20 @@ public class OrderPayController extends BaseController { //return success(orderPayService.getByIdRel(id)); } + @GetMapping("/change-order-no") + public ApiResult changeOrderNo() { + List list = orderPayService.list(); + if (CollectionUtil.isNotEmpty(list)) { + for (OrderPay orderPay : list) { + if (!orderPay.getOrderNo().equals(orderPay.getOriginOrderNo())) { + orderPay.setOrderNo(IdUtil.getSnowflakeNextIdStr()); + orderPayService.updateById(orderPay); + } + } + } + return success(); + } + @GetMapping("/getByOrderId/{id}") public ApiResult getByOrderId(@PathVariable("id") Integer orderId) { OrderPay one = orderPayService.lambdaQuery() @@ -100,8 +115,8 @@ public class OrderPayController extends BaseController { EquipmentGoods eg = equipmentGoodsService.getById(order.getOrderSourceId()); // 是否提前续租 Integer isRenew = order.getIsRenew(); - if(one == null) { - if(ORDER_STATUS_OVER.equals(order.getOrderStatus())) { + if (one == null) { + if (ORDER_STATUS_OVER.equals(order.getOrderStatus())) { return fail(null); } @@ -114,7 +129,7 @@ public class OrderPayController extends BaseController { one.setPeriods(order.getPeriods()); one.setRentOrderId(order.getOrderId()); one.setStartTime(order.getExpirationTime()); - one.setExpirationTime(DateUtil.offset(order.getExpirationTime(), DateField.MONTH,1)); + one.setExpirationTime(DateUtil.offset(order.getExpirationTime(), DateField.MONTH, 1)); one.setPayStatus(PAY_STATUS_NO_PAY); one.setBatteryDeposit(order.getBatteryDeposit()); one.setBatteryInsurance(order.getBatteryInsurance()); @@ -127,12 +142,12 @@ public class OrderPayController extends BaseController { one.setOutRequestNo(order.getOutRequestNo()); one.setBatteryRent(order.getBatteryRent()); one.setOrderSource(order.getOrderSource()); - if(order.getOrderSource() == 20) { + if (order.getOrderSource() == 20) { // 每期还款+手续费 one.setTotalPrice(eg.getRepayment().add(eg.getServiceCharges())); one.setOrderPrice(eg.getRepayment().add(eg.getServiceCharges())); one.setPayPrice(eg.getRepayment().add(eg.getServiceCharges())); - }else if(order.getOrderSource() == 30 || order.getOrderSource() == 40) { + } else if (order.getOrderSource() == 30 || order.getOrderSource() == 40) { // 月租 BigDecimal price = eg.getBatteryRent(); @@ -150,20 +165,19 @@ public class OrderPayController extends BaseController { one.setIsFreeze(order.getIsFreeze()); one.setIsRenew(isRenew); - if(isRenew == null || isRenew == 0){ + if (isRenew == null || isRenew == 0) { String freezeOrderNo = order.getFreezeOrderNo(); - if(StrUtil.isNotBlank(freezeOrderNo)){ + if (StrUtil.isNotBlank(freezeOrderNo)) { LambdaQueryWrapper fWrapper = Wrappers.lambdaQuery(); fWrapper.eq(FreezeOrder::getOutOrderNo, freezeOrderNo) .eq(FreezeOrder::getOperationType, "FREEZE") .eq(FreezeOrder::getStatus, "SUCCESS") .last("limit 1"); int cnt = freezeOrderService.count(fWrapper); - if(cnt > 0) { + if (cnt > 0) { log.info("订单{}已支付支付押金！", orderId); one.setHasFreeze(1); - } - else { + } else { log.info("订单{}未支付押金！", orderId); // fWrapper.clear(); // fWrapper.eq(FreezeOrder::getOutOrderNo, freezeOrderNo) @@ -193,7 +207,7 @@ public class OrderPayController extends BaseController { // 记录当前登录用户id User loginUser = getLoginUser(); if (loginUser != null) { - orderPay.setUserId(loginUser.getUserId()); + orderPay.setUserId(loginUser.getUserId()); } if (orderPayService.save(orderPay)) { return success("添加成功"); diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java b/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java index 60b4402..902cd7c 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderPay.java @@ -44,6 +44,9 @@ public class OrderPay implements Serializable { @ApiModelProperty(value = "订单号") private String orderNo; + @ApiModelProperty(value = "订单号") + private String originOrderNo; + @ApiModelProperty(value = "商品总金额(不含优惠折扣)") private BigDecimal totalPrice; private Integer orderSource;