Merge branch 'master' of ssh://gitea.qnforever.top:13100/venue/smart_venue
This commit is contained in:
@@ -10,6 +10,7 @@ import com.sv.exception.api.ExceptionCodeTemplate;
|
|||||||
import com.sv.mapper.BarcodeOrderTimeMapper;
|
import com.sv.mapper.BarcodeOrderTimeMapper;
|
||||||
import com.sv.mapper.OrderMapper;
|
import com.sv.mapper.OrderMapper;
|
||||||
import com.sv.mapper.VenueMapper;
|
import com.sv.mapper.VenueMapper;
|
||||||
|
import com.sv.service.api.OrderService;
|
||||||
import com.sv.service.api.config.WechatPayService;
|
import com.sv.service.api.config.WechatPayService;
|
||||||
import com.sv.service.api.util.DateUtilCard;
|
import com.sv.service.api.util.DateUtilCard;
|
||||||
import com.ydd.framework.core.common.Pagination;
|
import com.ydd.framework.core.common.Pagination;
|
||||||
@@ -40,6 +41,8 @@ public class VenueEnterService extends BaseServiceImpl {
|
|||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(VenueEnterService.class);
|
private final Logger logger = LoggerFactory.getLogger(VenueEnterService.class);
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private OrderService orderService;
|
||||||
@Resource
|
@Resource
|
||||||
private VenueMapper venueMapper;
|
private VenueMapper venueMapper;
|
||||||
@Resource
|
@Resource
|
||||||
@@ -128,7 +131,7 @@ public class VenueEnterService extends BaseServiceImpl {
|
|||||||
if (PayStyleEnum.TIME.getValue() == venue.getPayStyle()) {
|
if (PayStyleEnum.TIME.getValue() == venue.getPayStyle()) {
|
||||||
timePayHour = venue.getTimePayHour() != null ? venue.getTimePayHour() : 4;
|
timePayHour = venue.getTimePayHour() != null ? venue.getTimePayHour() : 4;
|
||||||
}
|
}
|
||||||
createBarcodeTimeOrder(memberId, venueId, timePayHour, "000");
|
createBarcodeTimeOrder(memberId, venueId, timePayHour, "FREE_" + orderService.createSn());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
basketEnterResult.setOrderSn(lastOrder.getOrderSn());
|
basketEnterResult.setOrderSn(lastOrder.getOrderSn());
|
||||||
|
|||||||
Reference in New Issue
Block a user