|
@@ -27,9 +27,10 @@ public class BuyService {
|
|
|
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
|
|
|
public int buyGroup(Buy buy) {
|
|
|
Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
|
|
|
- JmTuangou roleType = jmTuangouDao.getSelectOneRoleId(buy.getJmId());//团购主表
|
|
|
+ JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());//团购主表
|
|
|
if (buy1 != null) {//判断是否是第一次添加
|
|
|
- JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy1.getJmId());
|
|
|
+ //JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());
|
|
|
+
|
|
|
//最大上限有的话就遵循
|
|
|
if (jmTuangou.getTgMaxNum().intValue() != 0 && jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
|
|
|
return 3;
|
|
@@ -42,11 +43,11 @@ public class BuyService {
|
|
|
return buyMapper.updateById(buy);
|
|
|
}
|
|
|
//最大上限有的话就遵循
|
|
|
- if (roleType.getTgMaxNum() != 0 && roleType.getTgMaxNum().intValue() < roleType.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
|
|
|
+ if (jmTuangou.getTgMaxNum() != 0 && jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
|
|
|
return 3;
|
|
|
}
|
|
|
//单人限额有的话的遵循
|
|
|
- if (roleType.getTgItemNum().intValue() != 0 && roleType.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
|
|
|
+ if (jmTuangou.getTgItemNum().intValue() != 0 && jmTuangou.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
|
|
|
return 4;
|
|
|
}
|
|
|
buy.setBuyId(IdWorker.getId());
|