|
@@ -63,7 +63,7 @@ public class BuyService {
|
|
public int buyBack(Buy buy) {
|
|
public int buyBack(Buy buy) {
|
|
//在该套餐截止日期之前 并且是在团状态的才能撤单
|
|
//在该套餐截止日期之前 并且是在团状态的才能撤单
|
|
JmTuangou jmTuangou = buyMapper.selectGroup(buy.getUserId(), buy.getJmId());
|
|
JmTuangou jmTuangou = buyMapper.selectGroup(buy.getUserId(), buy.getJmId());
|
|
- if (jmTuangou.getTgEndTime().getTime() >= new DateTime().getMillis() && jmTuangou.getTgStatus() == 1) {
|
|
|
|
|
|
+ if (jmTuangou.getTgEndTime().getTime() < new DateTime().getMillis() && jmTuangou.getTgStatus() == 1) {
|
|
Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
|
|
Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
|
|
buy.setBuyId(buy1.getBuyId());
|
|
buy.setBuyId(buy1.getBuyId());
|
|
buy.setBuyStatus(2);//撤单
|
|
buy.setBuyStatus(2);//撤单
|
|
@@ -83,7 +83,7 @@ public class BuyService {
|
|
List<JmTuangou> jmTuangous = jmTuangouDao.selectAll();
|
|
List<JmTuangou> jmTuangous = jmTuangouDao.selectAll();
|
|
if (jmTuangous != null && jmTuangous.size() > 0) {
|
|
if (jmTuangous != null && jmTuangous.size() > 0) {
|
|
for (JmTuangou list : jmTuangous) {
|
|
for (JmTuangou list : jmTuangous) {
|
|
- if (list.getTgEndTime().getTime() >= new DateTime().getMillis()) {
|
|
|
|
|
|
+ if (list.getTgEndTime().getTime() < new DateTime().getMillis()) {
|
|
JmTuangou jmTuangou = new JmTuangou();
|
|
JmTuangou jmTuangou = new JmTuangou();
|
|
jmTuangou.setJmId(list.getJmId());
|
|
jmTuangou.setJmId(list.getJmId());
|
|
jmTuangou.setTgStatus(2);//截止时间已到 发货
|
|
jmTuangou.setTgStatus(2);//截止时间已到 发货
|