diff --git a/suimangCApi/src/main/java/com/iformall/controller/ProductController.java b/suimangCApi/src/main/java/com/iformall/controller/ProductController.java index 965227e..42c4fee 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ProductController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/ProductController.java @@ -67,9 +67,9 @@ public class ProductController extends BaseController { if(projectType == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"projectType为空"); } - if(EnumProductType.product_2.getCode().equals(record.getType())){ - record.setProjectType(EnumProject.PROJECT_0.getCode()); - } +// if(EnumProductType.product_2.getCode().equals(record.getType())){ +// record.setProjectType(EnumProject.PROJECT_0.getCode()); +// } record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); List listDetail = productService.findListDetail(record, projectType); return new ResultData(listDetail); diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java index 96d7aff..b8b6915 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java @@ -28,7 +28,7 @@ public class ProductOrderSchedule { @Autowired private ProductOrderSharingService productOrderSharingService; - @Scheduled(cron = "0 3/5 * * * *?") + @Scheduled(cron = "0 */5 * * * *?") public void productOrderSharingSchedule() { ProductOrder productOrderQ = new ProductOrder(); productOrderQ.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); diff --git a/suimangService/src/main/java/com/iformall/service/impl/ProductServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/ProductServiceImpl.java index e37ff99..c913f4b 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/ProductServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/ProductServiceImpl.java @@ -41,9 +41,7 @@ public class ProductServiceImpl implements ProductService { public List findListDetail(Product record, Integer projectType) { List list = productMapper.findList(record); for (Product prod: list) { - if(EnumProductType.product_2.getCode().equals(prod.getType())){ - prod.setExtraInfo(payProductFactory.getProjectService(prod.getProjectType()).getPayProductExtroInfo(prod)); - } + prod.setExtraInfo(payProductFactory.getProjectService(prod.getProjectType()).getPayProductExtroInfo(prod)); } return list; }