| @@ -67,9 +67,9 @@ public class ProductController extends BaseController { | |||||
| if(projectType == null){ | if(projectType == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"projectType为空"); | 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); | record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | ||||
| List<Product> listDetail = productService.findListDetail(record, projectType); | List<Product> listDetail = productService.findListDetail(record, projectType); | ||||
| return new ResultData(listDetail); | return new ResultData(listDetail); | ||||
| @@ -28,7 +28,7 @@ public class ProductOrderSchedule { | |||||
| @Autowired | @Autowired | ||||
| private ProductOrderSharingService productOrderSharingService; | private ProductOrderSharingService productOrderSharingService; | ||||
| @Scheduled(cron = "0 3/5 * * * *?") | |||||
| @Scheduled(cron = "0 */5 * * * *?") | |||||
| public void productOrderSharingSchedule() { | public void productOrderSharingSchedule() { | ||||
| ProductOrder productOrderQ = new ProductOrder(); | ProductOrder productOrderQ = new ProductOrder(); | ||||
| productOrderQ.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | productOrderQ.setOrderStatus(EnumProductOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| @@ -41,9 +41,7 @@ public class ProductServiceImpl implements ProductService { | |||||
| public List<Product> findListDetail(Product record, Integer projectType) { | public List<Product> findListDetail(Product record, Integer projectType) { | ||||
| List<Product> list = productMapper.findList(record); | List<Product> list = productMapper.findList(record); | ||||
| for (Product prod: list) { | 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; | return list; | ||||
| } | } | ||||