|
@@ -152,6 +152,7 @@ public class OrderServiceImpl implements OrderService {
|
|
orderShareCode.setExpiredTime(calendar.getTime());
|
|
orderShareCode.setExpiredTime(calendar.getTime());
|
|
orderShareCode.setDelFlag("0");
|
|
orderShareCode.setDelFlag("0");
|
|
orderMapper.updateCode(orderShareCode);
|
|
orderMapper.updateCode(orderShareCode);
|
|
|
|
+ orderMapper.deleteCodeRecord(orderID);
|
|
return String.valueOf(shareCode);
|
|
return String.valueOf(shareCode);
|
|
} else {
|
|
} else {
|
|
OrderShareCode code = new OrderShareCode();
|
|
OrderShareCode code = new OrderShareCode();
|
|
@@ -181,7 +182,7 @@ public class OrderServiceImpl implements OrderService {
|
|
if (orderShareCode == null) return model.error("该订单没有生成分享码");
|
|
if (orderShareCode == null) return model.error("该订单没有生成分享码");
|
|
CmOrder order = orderMapper.findOrder(orderID);
|
|
CmOrder order = orderMapper.findOrder(orderID);
|
|
if (order == null) return model.error("该订单已删除");
|
|
if (order == null) return model.error("该订单已删除");
|
|
- if (orderShareCode.getShareCode().equals(shareCode)) {
|
|
|
|
|
|
+ if (orderShareCode.getShareCode().equals(shareCode) && orderShareCode.getExpiredTime().compareTo(new Date()) == 1) {
|
|
CmMallShareCodeRecord codeRecord = new CmMallShareCodeRecord();
|
|
CmMallShareCodeRecord codeRecord = new CmMallShareCodeRecord();
|
|
codeRecord.setOpenid(openid);
|
|
codeRecord.setOpenid(openid);
|
|
codeRecord.setAddTime(new Date());
|
|
codeRecord.setAddTime(new Date());
|
|
@@ -190,7 +191,7 @@ public class OrderServiceImpl implements OrderService {
|
|
codeRecord.setShareCodeId(orderShareCode.getId());
|
|
codeRecord.setShareCodeId(orderShareCode.getId());
|
|
orderMapper.saveShareCodeRecord(codeRecord);
|
|
orderMapper.saveShareCodeRecord(codeRecord);
|
|
return model.success();
|
|
return model.success();
|
|
- } else if (orderShareCode.getExpiredTime().compareTo(new Date()) == -1) {
|
|
|
|
|
|
+ } else if (orderShareCode.getShareCode().equals(shareCode) && orderShareCode.getExpiredTime().compareTo(new Date()) != 1) {
|
|
return model.error("分享码失效");
|
|
return model.error("分享码失效");
|
|
} else {
|
|
} else {
|
|
return model.error("分享码错误");
|
|
return model.error("分享码错误");
|