|
@@ -2178,7 +2178,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
AppSitePriceRules sitePriceRules = appSitePriceRulesMapper.selectById(productId);
|
|
AppSitePriceRules sitePriceRules = appSitePriceRulesMapper.selectById(productId);
|
|
|
if(ObjectUtil.isNotEmpty(sitePriceRules)){
|
|
if(ObjectUtil.isNotEmpty(sitePriceRules)){
|
|
|
if(Objects.equals(sitePriceRules.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_1)){
|
|
if(Objects.equals(sitePriceRules.getType(), CommonConstant.ORDER_PRO_INFO_TYPE_1)){
|
|
|
- String timeStr = appOrderProInfo.getProductName().split("-")[0];
|
|
|
|
|
|
|
+ String timeStr = appOrderProInfo.getProductName().split("-")[0] + "-" + appOrderProInfo.getProductName().split("-")[1];
|
|
|
int year = LocalDate.now().getYear();
|
|
int year = LocalDate.now().getYear();
|
|
|
Instant originalInstant = DateUtils.parseDate(year+"-"+timeStr, "yyyy-MM-dd HH:mm").toInstant();
|
|
Instant originalInstant = DateUtils.parseDate(year+"-"+timeStr, "yyyy-MM-dd HH:mm").toInstant();
|
|
|
Instant time = originalInstant.minusSeconds(appSitePlace.getEarlyRefundTime() * 60);
|
|
Instant time = originalInstant.minusSeconds(appSitePlace.getEarlyRefundTime() * 60);
|