From 5fe67c8a04e9c04d45a5d411e8ffa6c9c1db073d Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 15 六月 2024 18:18:33 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtLogisticsController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 11
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java | 15 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 7
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 14 -
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java | 12 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java | 15 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 26 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java | 22 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java | 10
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 3
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderNumVO.java | 14 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/PayInfoVO.java | 6
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 8 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 36 ++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 176 +++++++++++++++------
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java | 10 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java | 15 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 2
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java | 8 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 2
31 files changed, 353 insertions(+), 87 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index 3148705..f50687b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -50,7 +50,7 @@
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
- private AuctionOrderTypeEnum auctionType;
+ private AuctionOrderTypeEnum auctionOrderType;
@ApiModelProperty(value = "会员id")
private Long memberId;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java
index 0f8a937..05530a3 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java
@@ -1,10 +1,14 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
@Data
public class LogisticsInfoVO {
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String time;
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String ftime;
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String context;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
index fa41d15..061231a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.AuctionTypeEnum;
import com.ruoyi.common.core.enums.AuthenticationEnum;
@@ -16,46 +17,60 @@
@Data
public class MemberAuctionSalesroomInfoVO {
@TableId(value = "id", type = IdType.ASSIGN_ID)
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionTypeEnum type;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bound;
@ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuthenticationEnum authentication;
@ApiModelProperty(value = "拍卖场说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "拍卖场封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionStartStatusEnum status;
@ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
@ApiModelProperty("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isApply;
@ApiModelProperty(value = "拍卖会的商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVO;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
index 738988f..358018a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,36 +11,47 @@
@Data
public class MemberAuctionSalesroomVO {
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer status;
@ApiModelProperty(value = "拍卖场说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "拍卖场封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isApply;
@ApiModelProperty("报名人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer applyNum;
@ApiModelProperty(value = "开始时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bond;
@ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuthenticationEnum authentication;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
index cf2fc54..81b758a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderListVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
@@ -12,46 +13,60 @@
@Data
public class MemberOrderListVO {
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "支付合计")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal totalAmount;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "商品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsQuantity;
@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消, 6售后订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "下单时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime orderTime;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuctionBond;
@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ReturnRequestStatusEnum status;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderNumVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderNumVO.java
new file mode 100644
index 0000000..b173fa7
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberOrderNumVO.java
@@ -0,0 +1,14 @@
+package com.ruoyi.system.api.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MemberOrderNumVO {
+ @ApiModelProperty(value = "待支付")
+ private Integer dzforderNo;
+ @ApiModelProperty(value = "待发货")
+ private Integer dfhorderNo;
+ @ApiModelProperty(value = "待收货")
+ private Integer dshorderNo;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
index 62f3922..017c646 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTiOrderVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
@@ -12,67 +13,88 @@
@Data
public class MemberTiOrderVO {
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "下单时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime orderTime;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionOrderTypeEnum auctionType;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "支付合计")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal totalAmount;
@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "优惠金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal discountMoney;
@ApiModelProperty(value = "商品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsQuantity;
@ApiModelProperty(value = "收货人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverName;
@ApiModelProperty(value = "收货人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverphone;
@ApiModelProperty(value = "城市")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverCity;
@ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverDetailAddress;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "优惠的价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal youhiPrice;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "实际商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal sjPrice;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
index 46965a2..e4301d7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderReturnVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuditStatusEnum;
import com.ruoyi.common.core.enums.RequestTypeEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
@@ -14,46 +15,60 @@
@ApiModelProperty(value = "售后id")
@TableId(value = "id", type = IdType.ASSIGN_ID)
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long orderId;
@ApiModelProperty(value = "申请时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime requestTime;
@ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private RequestTypeEnum requestType;
@ApiModelProperty(value = "申请原因")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String requestReason;
@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ReturnRequestStatusEnum status;
@ApiModelProperty(value = "拒绝理由")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String refuseReason;
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
@TableLogic
private Integer delFlag;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "收件人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String recipientName;
@ApiModelProperty(value = "收件人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String recipientPhone;
@ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detailedAddress;
@ApiModelProperty(value = "备注")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String remark;
@ApiModelProperty(value = "快递单号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String courierNumber;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
index f501fcb..0ba3f3c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,61 +13,79 @@
@Data
public class OrderVO {
@ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long id;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
@ApiModelProperty(value = "下单时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime orderTime;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderFromEnum orderFrom;
@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionOrderTypeEnum auctionType;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "支付合计")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal totalAmount;
@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime payTime;
@ApiModelProperty(value = "取消时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime cancelTime;
@ApiModelProperty(value = "订单备注")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderRemark;
@ApiModelProperty(value = "发货时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime deliveryTime;
@ApiModelProperty(value = "确认收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime receiveTime;
@ApiModelProperty(value = "优惠金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal discountMoney;
@ApiModelProperty(value = "商品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsQuantity;
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime createTime;
@@ -76,57 +95,74 @@
@ApiModelProperty(value = "快递单号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String courierNumber;
@ApiModelProperty(value = "收货人姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverName;
@ApiModelProperty(value = "收货人电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverPhone;
@ApiModelProperty(value = "城市")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverCity;
@ApiModelProperty(value = "详细地址")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String receiverDetailAddress;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bound;
@ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer invoiceStatus;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "积分")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer points;
@ApiModelProperty(value = "实际商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal sjPrice;
@ApiModelProperty(value = "成团时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime purchase;
@ApiModelProperty(value = "是否售后")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isRequest;
@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ReturnRequestStatusEnum status;
@ApiModelProperty(value = "成团时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime groupTime;
@ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuctionBond;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/PayInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/PayInfoVO.java
index 78c63f0..38dd526 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/PayInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/PayInfoVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -7,17 +8,22 @@
public class PayInfoVO {
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "1 支付宝支付，2 微信支付")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer type;
@ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNO;
@ApiModelProperty(value = "题目")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String subject;
@ApiModelProperty(value = "内容")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String body;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
index c4846b4..226e206 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,32 +12,41 @@
@Data
public class WdMemberAuctionSalesroomVO {
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer status;
@ApiModelProperty(value = "拍卖场说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "拍卖场封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "加入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime BondTime;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bond;
@ApiModelProperty(value = "人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer bondNum;
@ApiModelProperty(value = "是否参加， 1否，2 是")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java
index 20e05e3..b85c3cc 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/judgeSensitiveWordsVO.java
@@ -1,10 +1,12 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class judgeSensitiveWordsVO {
@ApiModelProperty(value = "1是有包含敏感词，2 没有")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer type;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index d9d9f08..b5939b2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -89,7 +89,7 @@
@Override
public R<?> updateOrderAuctionBondStatus(List<Long> ids,
- BondStatusEnum bondStatusEnum) {
+ BondStatusEnum bondStatusEnum, String source) {
return R.fail("批量更新保证金订单状态失败" + cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
index 1d3cfd7..b2ac6fa 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -117,9 +117,9 @@
* @param ids 保证金订单id列表
* @param bondStatusEnum 保证金状态
*/
- @PutMapping("/order-auction-bond")
+ @PutMapping("/order-auction-bond/updateOrderAuctionBondStatus")
R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
- @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum);
+ @RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 批量更新订单状态
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index ca1d8ec..97b81b8 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -369,7 +369,7 @@
return null;
}).filter(Objects::nonNull).collect(Collectors.toList());
// 远程调用订单服务修改订单状态
- orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.PAID);
+ orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.PAID,SecurityConstants.INNER);
}
}
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 4dfafc8..df03e04 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -381,7 +381,7 @@
memberAuctionSalesroomVO.setAuthentication(auctionSalesroom.getAuthentication());
memberAuctionSalesroomDTO.setAuctionSalesroomId(auctionSalesroom.getId());
List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
- if (data!=null||data.size()>0){
+ if (data!=null&&data.size()>0){
memberAuctionSalesroomVO.setIsApply(2);
}else{
memberAuctionSalesroomVO.setIsApply(1);
@@ -515,8 +515,6 @@
if (auctionBidRecord!=null){
throw new ServiceException("当前拍卖场中标拍品订单未完成，请完成后再试。");
}
-
-
// 远程调用订单服务进行退款
Map<String, Object> data = orderClient.refund(refundDTOList,
SecurityConstants.INNER).getData();
@@ -535,7 +533,7 @@
List<Long> ids = new ArrayList<>();
ids.add(orderAuctionBond.getId());
// 远程调用订单服务修改订单状态
- orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.PAID);
+ orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.REFUNDED,SecurityConstants.INNER);
}else{
OrderAuctionBond orderAuctionBond = orderClient.getOrderAuctionBondone1(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
@@ -572,7 +570,7 @@
List<Long> ids = new ArrayList<>();
ids.add(orderAuctionBond.getId());
// 远程调用订单服务修改订单状态
- orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.PAID);
+ orderClient.updateOrderAuctionBondStatus(ids,BondStatusEnum.REFUNDED,SecurityConstants.INNER);
}
@@ -583,11 +581,11 @@
Member membeOne = memberClient.getMembeOne(bidVO.getMemberId(), SecurityConstants.INNER).getData();
if (bidVO.getAuctionType()==2){
AuctionSalesroomGoods byId = auctionSalesroomGoodsMapper.selectById(bidVO.getTargetId());
- if (byId.getStartingPrice().doubleValue()<bidVO.getLastBidAmount().doubleValue()){
+ if (byId.getStartingPrice().doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比起拍价低");
}
BigDecimal bigDecimal=byId.getStartingPrice().add(byId.getMinimumMarkupAmount());
- if (bigDecimal.doubleValue()<bidVO.getLastBidAmount().doubleValue()){
+ if (bigDecimal.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比每次最少加价低");
}
@@ -599,7 +597,7 @@
AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1);
if (one!=null){
BigDecimal bigDecimal1=one.getLastBidAmount().add(byId.getMinimumMarkupAmount());
- if (bigDecimal1.doubleValue()<bidVO.getLastBidAmount().doubleValue()){
+ if (bigDecimal1.doubleValue()>bidVO.getLastBidAmount().doubleValue()){
throw new ServiceException("出价不能比上次出价加每次最少加价低");
}
one.setLastBidAmount(bidVO.getLastBidAmount());
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
index 08c79fa..1560b00 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -29,7 +29,7 @@
@InnerAuth
@PostMapping("/getGoodsSeckiGoodsGroupPurchaseOne")
@ResponseBody
- public R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Integer goodsSkuId) {
+ public R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Long goodsSkuId) {
GoodsGroupPurchase GoodsSeckillOne = goodsGroupPurchaseService.getById(goodsSkuId);
return R.ok(GoodsSeckillOne);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
index c93b370..4835518 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
@@ -32,7 +32,7 @@
@InnerAuth
@PostMapping("/getGoodsSeckillOne")
@ResponseBody
- public R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Integer goodsSkuId) {
+ public R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId) {
GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsSkuId);
return R.ok(GoodsSeckillOne);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
index 127a57d..4533763 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
@@ -7,6 +7,7 @@
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
+import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import io.swagger.annotations.Api;
@@ -72,4 +73,11 @@
return R.ok();
}
+
+ @PostMapping("/MemberOrderNum")
+ @ApiOperation(value = "用户端-订单的數量")
+ public R<MemberOrderNumVO> MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ return R.ok(orderService.MemberOrderNum(memberOrderListDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
index 6efe0b7..82aee79 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartPaylogController.java
@@ -12,10 +12,7 @@
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -48,13 +45,12 @@
private PaylogServiceImpl paylogServiceImpl;
Logger log = LoggerFactory.getLogger(getClass());
- @ResponseBody
@PostMapping("/getPayInfo")
@ApiOperation(value = "用户端-获取支付信息")
- public R<Map<String, Object>> getPayInfo(PayInfoDTO payInfoDTO,
+ public R<Map<String, Object>> getPayInfo(@RequestBody PayInfoDTO payInfoDTO,
HttpServletRequest request) {
try {
- return paylogServiceImpl.getPayInfo(Integer.valueOf(payInfoDTO.getMemberId().intValue()), payInfoDTO.getType(), payInfoDTO.getSubject(), payInfoDTO.getBody(), payInfoDTO.getOrderNO(), payInfoDTO.getOpenId(),request);
+ return paylogServiceImpl.getPayInfo(Integer.valueOf(payInfoDTO.getMemberId().intValue()), payInfoDTO.getType(), payInfoDTO.getOrderNO(), payInfoDTO.getOpenId(),request);
} catch (Exception e) {
return R.fail("获取异常");
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
index a2bd624..8bb8dfe 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/InnerOrderAuctionBondController.java
@@ -85,7 +85,7 @@
* @param bondStatusEnum 保证金状态
*/
@InnerAuth
- @PutMapping
+ @PutMapping("/updateOrderAuctionBondStatus")
R<?> updateOrderAuctionBondStatus(@RequestParam("ids") List<Long> ids,
@RequestParam("bondStatusEnum") BondStatusEnum bondStatusEnum) {
iOrderAuctionBondService.updateOrderAuctionBondStatus(ids, bondStatusEnum);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtLogisticsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtLogisticsController.java
index ef40d2c..3a3575c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtLogisticsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtLogisticsController.java
@@ -26,7 +26,7 @@
@Api(value = "管理后台-获取物流快递信息", tags = "管理后台-获取物流快递信息")
public class MgtLogisticsController {
- private ILogisticsService iLogisticsService;
+ private final ILogisticsService iLogisticsService;
/**
* 获取物流公司列表
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 86a6a57..e9e372d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -29,6 +29,8 @@
Integer getSeckillMembers1(MemberOrderDTO memberOrderDTO);
+ Integer getGoodsGroupPurchase(MemberOrderDTO memberOrderDTO);
+
/**
* 根据团购商品id获取团购商品订单
*
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
index 0863254..3e74b85 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
@@ -11,6 +11,7 @@
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
+import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
import java.util.Collection;
@@ -67,6 +68,8 @@
void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+ MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
/**
* 根据优惠券id集合查询订单列表
*
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
index cc144d4..621b644 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
@@ -20,7 +20,7 @@
*/
public interface IPaylogService extends IService<Paylog> {
- R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,String openId,
+ R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderID,String openId,
HttpServletRequest request);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index 02c1ec3..87dd51c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -110,8 +110,11 @@
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void updateOrderAuctionBondStatus(List<Long> ids, BondStatusEnum bondStatusEnum) {
- this.lambdaUpdate().set(OrderAuctionBond::getBoundStatus, bondStatusEnum)
- .in(OrderAuctionBond::getId, ids).update();
+ for (Long id:ids){
+ OrderAuctionBond byId = this.getById(id);
+ byId.setBoundStatus(bondStatusEnum);
+ this.updateById(byId);
+ }
}
@Override
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index da38aab..8fdd137 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -54,10 +54,7 @@
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
-import com.ruoyi.system.api.domain.vo.Express100VO;
-import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
-import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
-import com.ruoyi.system.api.domain.vo.OrderVO;
+import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -150,7 +147,7 @@
}
order.setOrderTime(OrderDTO.getOrderTime());
order.setOrderFrom(OrderDTO.getOrderFrom());
- order.setAuctionType(OrderDTO.getAuctionType());
+ order.setAuctionOrderType(OrderDTO.getAuctionType());
order.setGoodsSkuId(OrderDTO.getGoodsSkuId());
order.setMemberId(OrderDTO.getMemberId());
order.setTotalAmount(OrderDTO.getTotalAmount());
@@ -326,6 +323,7 @@
order.setSkuName(goodsSku.getSkuName());
order.setPrice(data.getSeckillPrice());
order.setCoverPic(goodsSku.getCoverPic());
+ order.setSjPrice(goodsSku.getPrice());
/*redisService.setCacheObject(CacheConstants.SECKILL_GOODS + data.getId(), surpNum - memberOrderDTO.getGoodsQuantity());*/
}
if (memberOrderDTO.getOrderFrom()==3){
@@ -343,6 +341,7 @@
order.setSkuName(goodsSku.getSkuName());
order.setPrice(data.getGroupPurchasePrice());
order.setCoverPic(goodsSku.getCoverPic());
+ order.setSjPrice(goodsSku.getPrice());
}
order.setMemberId(memberOrderDTO.getMemberId());
order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
@@ -401,6 +400,7 @@
@Override
public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
Order order = baseMapper.selectById(memberOrderDTO.getId());
+
MemberTiOrderVO memberOrderVO=new MemberTiOrderVO();
if (memberOrderDTO.getReceiverDetailAddress()!=null){
order.setReceiverName(memberOrderDTO.getReceiverName());
@@ -429,6 +429,7 @@
SecurityConstants.INNER);
order.setTotalAmount(goodsSku.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(goodsSku.getPrice());
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
@@ -438,17 +439,19 @@
}
if (order.getOrderFrom().getCode()==2){
MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
- memberOrderDTO1.setMemberId(memberOrderDTO.getMemberId());
- memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
+ memberOrderDTO1.setMemberId(order.getMemberId());
+ memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1);
- GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
- GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (data.getLimitNumber()<=num){
+ Integer num1=num+order.getGoodsQuantity();
+ GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (data.getLimitNumber()<=num1){
throw new ServiceException("对不起，大于商品购买数");
}else{
if (data.getSeckillStock()<memberOrderDTO.getGoodsQuantity()){
throw new ServiceException("对不起，购买数大于库存");
}else{
+ order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
@@ -459,7 +462,12 @@
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()-memberOrderDTO.getGoodsQuantity());
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
- order.setTotalAmount(data.getSeckillPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ order.setTotalAmount(data.getSeckillPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
+ order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
+ order.setSkuName(goodsSku.getSkuName());
+ order.setPrice(data.getSeckillPrice());
+ order.setCoverPic(goodsSku.getCoverPic());
+ order.setSjPrice(goodsSku.getPrice());
}
}
@@ -468,9 +476,40 @@
memberOrderVO.setCoverPic(goodsSku.getCoverPic());
memberOrderVO.setSkuName(goodsSku.getSkuName());
memberOrderVO.setYouhiPrice(data.getSeckillPrice());
- }
- }
+ } if (order.getOrderFrom().getCode()==3){
+ order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
+ GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ MemberOrderDTO memberOrderDTO1=new MemberOrderDTO();
+ memberOrderDTO1.setMemberId(order.getMemberId());
+ memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId());
+ Integer num=baseMapper.getGoodsGroupPurchase(memberOrderDTO1);
+ Integer num1=num+order.getGoodsQuantity();
+ if (data.getLimitNumber()<=num1){
+ throw new ServiceException("对不起，大于商品购买数");
+ }else{
+ if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
+ throw new ServiceException("对不起，购买数大于库存");
+ }else{
+ memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
+ memberOrderVO.setPrice(data.getGroupPurchasePrice());
+ memberOrderVO.setSjPrice(goodsSku.getPrice());
+ memberOrderVO.setCoverPic(goodsSku.getCoverPic());
+ memberOrderVO.setSkuName(goodsSku.getSkuName());
+ memberOrderVO.setYouhiPrice(data.getGroupPurchasePrice());
+ order.setGoodsQuantity(memberOrderDTO.getGoodsQuantity());
+ order.setSkuName(goodsSku.getSkuName());
+ order.setPrice(data.getGroupPurchasePrice());
+ order.setCoverPic(goodsSku.getCoverPic());
+ order.setSjPrice(goodsSku.getPrice());
+ }
+ }
+
+
+ }
+ }
+ BigDecimal pice=order.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
if (memberOrderDTO.getCouponId()!=null){
CouponMemberDTO couponMemberDTO=new CouponMemberDTO();
couponMemberDTO.setId(memberOrderDTO.getCouponId());
@@ -484,9 +523,8 @@
promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
}
- BigDecimal pice=new BigDecimal(0);
+
if (data.getCouponType().getCode()==1){
- pice= order.getTotalAmount();
if (pice.doubleValue()>=data.getFullReductionAmount().doubleValue()){
pice.subtract(data.getReductionAmount());
order.setDiscountMoney(data.getReductionAmount());
@@ -518,18 +556,17 @@
couponMemberDTO2.setCouponStatus(2);
promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
- order.setTotalAmount(pice);
- CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
- CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
-
- BigDecimal pic=pice.multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity()));
- Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
- BigDecimal pi=pic.multiply(new BigDecimal(aDouble));
- order.setPoints(pi.intValue());
}
+ order.setTotalAmount(pice);
+ CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
+
+ Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
+ BigDecimal pi=pice.multiply(new BigDecimal(aDouble));
+ order.setPoints(pi.intValue());
baseMapper.updateById(order);
memberOrderVO.setId(order.getId());
@@ -564,7 +601,7 @@
wrapper.like(Order::getOrderNo,memberOrderListDTO.getOrderNo());
}
if(memberOrderListDTO.getOrderStatus()!=null){
- wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode());
+ wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode()-1);
}
wrapper.eq(Order::getDelFlag,0);
wrapper.orderByDesc(Order::getCancelTime);
@@ -639,17 +676,17 @@
@Override
public void CancelOrderOne(MemberOrderListDTO memberOrderListDTO) {
Order order = baseMapper.selectById(memberOrderListDTO.getId());
- if (order.getOrderStatus().getCode()==1){
+ if (order.getOrderStatus().getCode() == 1) {
order.setOrderStatus(OrderStatusEnum.CANCELED);
order.setCancelTime(LocalDateTime.now());
baseMapper.updateById(order);
}
- if (order.getOrderStatus().getCode()==2) {
+ if (order.getOrderStatus().getCode() == 2) {
order.setOrderStatus(OrderStatusEnum.CANCELED);
order.setCancelTime(LocalDateTime.now());
baseMapper.updateById(order);
- updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ updMembeOneDTO MembeOneDTO = new updMembeOneDTO();
MembeOneDTO.setType(2);
MembeOneDTO.setMemberId(order.getMemberId());
MembeOneDTO.setMoney(order.getTotalAmount());
@@ -662,33 +699,38 @@
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
- boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
- if (!bo) {
- System.out.println("支付宝退款失败");
+ if (paylog != null) {
+ boolean bo = paylogService.refundForAlipay(paylog.getOutTradeNo(), paylog.getTradeNo(), paylog.getPayMoney());
+ if (!bo) {
+ System.out.println("支付宝退款失败");
+ }
}
+
} else if (order.getPaymentMethod() != null && order.getPaymentMethod().getCode() == 2) {//微信
//获取支付信息
LambdaQueryWrapper<Paylog> paylogEntityWrapper = Wrappers.lambdaQuery();
paylogEntityWrapper.eq(Paylog::getOutTradeNo, order.getOrderNo());
Paylog paylog = iPaylogService.getOne(paylogEntityWrapper);
+ if (paylog != null) {
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
+ String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
+ refundFee = 1;
- String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
- String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
- refundFee = 1;
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(order.getOrderNo());
+ String ma = m.replaceAll("").trim();
+ boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ if (!bo) {
+ System.out.println("微信退款失败");
+ }
- String regEx = "[^0-9]";
- Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(order.getOrderNo());
- String ma = m.replaceAll("").trim();
- boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
- if (!bo) {
- System.out.println("微信退款失败");
}
}
- }}
-
+ }
+ }
@Override
public void AffirmOrderOne(MemberOrderListDTO memberOrderListDTO) {
Order order = baseMapper.selectById(memberOrderListDTO.getId());
@@ -722,20 +764,46 @@
Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
refundFee = 1;
- String regEx = "[^0-9]";
- Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(order.getOrderNo());
- String ma = m.replaceAll("").trim();
- boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
- if (!bo) {
- System.out.println("微信退款失败");
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(order.getOrderNo());
+ String ma = m.replaceAll("").trim();
+ boolean bo = paylogService.refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ if (!bo) {
+ System.out.println("微信退款失败");
+ }
}
- }
+
}else{
order.setOrderStatus(OrderStatusEnum.FINISHED);
order.setReceiveTime(LocalDateTime.now());
baseMapper.updateById(order);
}
+ }
+
+ @Override
+ public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {
+ MemberOrderNumVO vo=new MemberOrderNumVO();
+
+ LambdaQueryWrapper<Order> paylogEntityWrapper = Wrappers.lambdaQuery();
+ paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
+ paylogEntityWrapper.eq(Order::getOrderStatus,1);
+ List<Order> list = this.list(paylogEntityWrapper);
+ vo.setDzforderNo(list.size());
+
+ LambdaQueryWrapper<Order> paylogEntityWrapper1 = Wrappers.lambdaQuery();
+ paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
+ paylogEntityWrapper1.eq(Order::getOrderStatus,2);
+ List<Order> list1 = this.list(paylogEntityWrapper1);
+ vo.setDfhorderNo(list1.size());
+
+ LambdaQueryWrapper<Order> paylogEntityWrapper2 = Wrappers.lambdaQuery();
+ paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
+ paylogEntityWrapper2.eq(Order::getOrderStatus,3);
+ List<Order> list2 = this.list(paylogEntityWrapper2);
+ vo.setDshorderNo(list2.size());
+
+ return vo;
}
/**
@@ -886,7 +954,7 @@
mgtOrderVO.setPhone(member.getPhone());
}
// 拍卖订单查询拍卖会信息
- if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS && (order.getAuctionType()
+ if (order.getOrderFrom() == OrderFromEnum.AUCTION_ORDERS && (order.getAuctionOrderType()
== AuctionOrderTypeEnum.AUCTION_ITEMS)) {
List<AuctionSalesroom> auctionSalesroom = auctionClient.getAuctionSalesroomByIds(
Lists.newArrayList(order.getGoodsSkuId())
@@ -1057,7 +1125,7 @@
public void refundBond(Long id) {
Order order = getOrder(id);
OrderAuctionBond orderAuctionBond;
- if (order.getAuctionType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
+ if (order.getAuctionOrderType() == AuctionOrderTypeEnum.AUCTION_ITEMS) {
orderAuctionBond = orderAuctionBondMapper.selectOne(
Wrappers.lambdaQuery(OrderAuctionBond.class)
.eq(OrderAuctionBond::getAuctionSalesroomId,
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 1cea2f1..58f439f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -79,14 +79,15 @@
private MemberClient memberClient;
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
Double price = 0.0;
-
+ String subject;
+ String body;
try {
if(judgeContainsStr(orderNO)){
price= Double.valueOf(1);
- body = body;
- subject = subject;
+ body = " 订单支付";
+ subject = " 订单支付";
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
@@ -155,6 +156,7 @@
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
@@ -269,6 +271,7 @@
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
index db95d78..1ec073e 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartCouponMemberController.java
@@ -14,6 +14,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* <p>
* 优惠券领取表 前端控制器
@@ -36,4 +38,10 @@
return R.ok(iCouponMemberService.getCouponMemberList(couponMemberDTO));
}
+ @PostMapping("/getCouponMember")
+ @ApiOperation(value = "用户端-获取用户下单优惠卷")
+ public R<List<CouponMember>> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO) {
+ return R.ok(iCouponMemberService.getCouponMemberl(couponMemberDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index 02b05df..88434ca 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
@@ -6,6 +6,8 @@
import com.ruoyi.system.api.domain.CouponMember;
import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
+
/**
* <p>
* 优惠券领取表 服务类
@@ -23,4 +25,6 @@
void updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);
+ List<CouponMember> getCouponMemberl(@RequestBody CouponMemberDTO couponMemberDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index 8bb9f28..97261fb 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -40,9 +40,10 @@
Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize());
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(CouponMember::getCouponStatus,
- CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
+ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
wrapper1.eq(CouponMember::getDelFlag,0);
- Page<CouponMember> page1 = this.page(page, wrapper);
+ Page<CouponMember> page1 = this.page(page, wrapper1);
return PageDTO.of(page1);
}
@@ -57,4 +58,25 @@
byId.setCouponStatus(CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
this.updateById(byId);
}
+
+ @Override
+ public List<CouponMember> getCouponMemberl(CouponMemberDTO couponMemberDTO) {
+ LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(CouponMember::getCouponStatus, CouponUseEnum.UNUSED);
+ wrapper.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> couponMemberList=this.list(wrapper);
+ /* for (CouponMember couponMember:couponMemberList){
+ if(LocalDateTime.now().isAfter(couponMember.getEndDate())){
+ couponMember.setCouponStatus(0);
+ this.updateById(couponMember);
+ }
+ }*/
+ LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(CouponMember::getCouponStatus,
+ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
+ wrapper1.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> page1 = this.list(wrapper1);
+ return page1;
+ }
}
--
Gitblit v1.7.1