From d89ecce959bc93db298a29617b3d7337b53ecea8 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 17:44:44 +0800
Subject: [PATCH] 撤单
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 3 ++-
src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformBannerEntity.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
index d28f72d..7dbddec 100644
--- a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
@@ -117,6 +117,7 @@
if(!StringUtils.isEmpty(type)) {
queryWrapper.eq("order_type", type);
}
+ queryWrapper.orderByDesc("id");
List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);
List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);
return Result.ok(memberQuickBuySaleDetailVoList);
@@ -179,7 +180,7 @@
public Result cancelRecharge(Long id) {
// 获取当前登录用户
MemberEntity member = LoginUserUtils.getAppLoginUser();
- MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(id,member.getId());
+ MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(member.getId(),id);
memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
diff --git a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
index c106062..db8e91f 100644
--- a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "剩余时间")
private Long timeLeft;
@ApiModelProperty(value = "下单时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "平台收款方式")
private List<PlatformPaymentMethodEntity> platforPaymentMethodList;
diff --git a/src/main/java/com/xcong/excoin/modules/platform/entity/PlatformBannerEntity.java b/src/main/java/com/xcong/excoin/modules/platform/entity/PlatformBannerEntity.java
new file mode 100644
index 0000000..f3ef012
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/platform/entity/PlatformBannerEntity.java
@@ -0,0 +1,46 @@
+package com.xcong.excoin.modules.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+@Data
+@TableName("platform_banner")
+public class PlatformBannerEntity{
+
+
+ @TableId(value = "id",type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 标题
+ */
+ private String name;
+ /**
+ * 图片链接
+ */
+ private String image_url;
+ /**
+ * 是否可跳转 1-是2-否
+ */
+ private String is_jump;
+ /**
+ * 跳转外部或内部 1-内2-外
+ */
+ private int is_inside;
+ /**
+ * 跳转链接
+ */
+ private String jump_url;
+ /**
+ * 显示端口 1-pc2-手机
+ */
+ private int show_port;
+ /**
+ * 联系方式
+ */
+ private String sort;
+
+ private String is_top;
+}
--
Gitblit v1.9.1