From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
index 07aae28..a1f443f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
@@ -1,49 +1,21 @@
package com.yeshi.fanli.service.impl.order;
-import java.util.Date;
-
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.order.InviteOrderSubsidyMapper;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
-import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
-import com.yeshi.fanli.util.StringUtil;
@Service
public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {
-
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@Override
public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type) {
return inviteOrderSubsidyMapper.getByOrderNoAndType(uid, orderNo, type);
- }
-
- @Transactional
- @Override
- public void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {
- if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
- || orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
- throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
- InviteOrderSubsidy old = getByOrderNoAndType(orderSubsidy.getUid(), orderSubsidy.getOrderNo(),
- orderSubsidy.getSourceType());
- if (old != null) {// 淇敼
- // 淇敼鐘舵��
- InviteOrderSubsidy update = new InviteOrderSubsidy(old.getId());
- update.setMoney(orderSubsidy.getMoney());
- update.setState(orderSubsidy.getState());
- update.setUpdateTime(new Date());
- inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- } else {// 娣诲姞
- if (orderSubsidy.getCreateTime() == null)
- orderSubsidy.setCreateTime(new Date());
- inviteOrderSubsidyMapper.insertSelective(orderSubsidy);
- }
}
}
--
Gitblit v1.8.0