From 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 17:59:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
index 962171c..c45e4c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
@@ -8,13 +8,13 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.cloud.UserCloudOrderMapper;
import com.yeshi.fanli.entity.bus.user.cloud.CloudOrderMenuEnum;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudOrderService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
@@ -28,6 +28,8 @@
@Lazy
@Resource
private UserCloudService userCloudService;
+
+
@Override
public UserCloudOrder addCloudOrder(Long uid, String type) throws UserCloudOrderException{
@@ -60,7 +62,6 @@
}
- @Transactional(rollbackFor = Exception.class)
@Override
public void cloudPayCloudSuccess(Long orderId) throws UserCloudOrderException{
UserCloudOrder cloudOrder = userCloudOrderMapper.selectForUpdate(orderId);
@@ -73,6 +74,7 @@
UserCloudOrder updateOrder = new UserCloudOrder();
updateOrder.setState(true);
updateOrder.setId(cloudOrder.getId());
+ updateOrder.setDesc("鎴愬姛寮�閫�" + cloudOrder.getType().getDescShow());
updateOrder.setUpdateTime(new Date());
userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);
@@ -113,4 +115,20 @@
public List<UserCloudOrder> getLasthourByUnpaid() {
return userCloudOrderMapper.getLasthourByUnpaid();
}
+
+
+ @Override
+ public List<UserCloudOrder> query(int page, int count,String key, Integer state) {
+ return userCloudOrderMapper.query((page-1)* count, count, key, state);
+ }
+
+ @Override
+ public long count(String key, Integer state) {
+ Long count = userCloudOrderMapper.count(key, state);
+ if (count == null)
+ count = 0L;
+ return count;
+ }
+
+
}
--
Gitblit v1.8.0