Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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,8 @@
   }



   @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