From 9b16b4c4dfa58ebe81431efc42ae6c55635bff88 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 17:06:37 +0800
Subject: [PATCH] 下单接口

---
 src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 4a602c5..d28f72d 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
@@ -8,6 +8,7 @@
 
 import org.springframework.stereotype.Service;
 
+import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -57,6 +58,7 @@
 		memberQuickBuySaleEntity.setMemberId(member.getId());
 		memberQuickBuySaleEntity.setAmountUsdt(memberQuickBuySaleDto.getAmountUsdt());
 		memberQuickBuySaleEntity.setAmountCny(memberQuickBuySaleDto.getAmountCny());
+		memberQuickBuySaleEntity.setUnitPrice(memberQuickBuySaleDto.getUnitPrice());
 		memberQuickBuySaleEntity.setCreateTime(new Date());
 		memberQuickBuySaleEntity.setOrderNo(chargeNo);
 		memberQuickBuySaleEntity.setOrderType("B");
@@ -112,7 +114,9 @@
 		MemberEntity member = LoginUserUtils.getAppLoginUser();
 		QueryWrapper<MemberQuickBuySaleEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("member_id", member.getId());
-		queryWrapper.eq("order_type", type);
+		if(!StringUtils.isEmpty(type)) {
+			queryWrapper.eq("order_type", type);
+		}
 		List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);
 		List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);
 		return Result.ok(memberQuickBuySaleDetailVoList);
@@ -175,11 +179,8 @@
 	public Result cancelRecharge(Long id) {
 		// 获取当前登录用户
 		MemberEntity member = LoginUserUtils.getAppLoginUser();
-		if(member==null) {
-			return Result.fail("登录用户已失效");
-		}
 		MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(id,member.getId());
-		memberQuickBuySaleEntity.setOrderStatus(1);
+		memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);
 		memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);
 		
 		// 判断是否存在足够余额

--
Gitblit v1.9.1