From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java
index 4fd70a2..edff01c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java
@@ -9,11 +9,12 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.order.ShareGoodsActivityOrderMapper;
-import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
import com.yeshi.fanli.exception.order.ShareGoodsActivityOrderException;
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class ShareGoodsActivityOrderServiceImpl implements ShareGoodsActivityOrderService {
@@ -22,18 +23,19 @@
private ShareGoodsActivityOrderMapper shareGoodsActivityOrderMapper;
@Override
- public void addShareGoodsActivityOrder(Long uid, BigDecimal rate, Order order)
+ public void addShareGoodsActivityOrder(Long uid, BigDecimal rate, String taoBaoOrderNo)
throws ShareGoodsActivityOrderException {
- if (uid == null || rate == null || order == null || order.getId() == null)
+ if (uid == null || rate == null || StringUtil.isNullOrEmpty(taoBaoOrderNo))
throw new ShareGoodsActivityOrderException(1, "鏁版嵁涓嶅畬鏁�");
- List<ShareGoodsActivityOrder> list = listByOrderIdAndUid(uid, order.getId());
+ List<ShareGoodsActivityOrder> list = listByOrderIdAndUid(uid, taoBaoOrderNo);
if (list != null && list.size() > 0)
throw new ShareGoodsActivityOrderException(2, "璁㈠崟鍙峰凡瀛樺湪");
ShareGoodsActivityOrder shareOrder = new ShareGoodsActivityOrder();
shareOrder.setCreateTime(new Date());
- shareOrder.setOrder(order);
+ shareOrder.setOrderNo(taoBaoOrderNo);
+ shareOrder.setOrderSourceType(Constant.SOURCE_TYPE_TAOBAO);
shareOrder.setShareRate(rate);
shareOrder.setUser(new UserInfo(uid));
shareGoodsActivityOrderMapper.insertSelective(shareOrder);
@@ -45,8 +47,14 @@
}
@Override
- public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, Long orderId) {
- return shareGoodsActivityOrderMapper.listByOrderIdAndUid(uid, orderId);
+ public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, String taoBaoOrderNo) {
+ return shareGoodsActivityOrderMapper.listByOrderIdAndUid(uid, taoBaoOrderNo);
+ }
+
+ @Override
+ public List<ShareGoodsActivityOrder> listByUid(Long uid) {
+
+ return shareGoodsActivityOrderMapper.listByUid(uid);
}
}
--
Gitblit v1.8.0