diff --git a/api-third/src/main/java/com/heyu/api/utils/ChartUtil.java b/api-third/src/main/java/com/heyu/api/utils/ChartUtil.java index ed1da65..4e05c52 100644 --- a/api-third/src/main/java/com/heyu/api/utils/ChartUtil.java +++ b/api-third/src/main/java/com/heyu/api/utils/ChartUtil.java @@ -154,19 +154,27 @@ public class ChartUtil { public String generateQRCodeUp2Oss(String text) { try { - String filePath = ChartUtil.generateQRCodeImage(text, 300, 300, System.currentTimeMillis() + ".png"); // 生成二维码并保存到文件系统 + String chartPic = ChartUtil.generateQRCodeImage(text, 300, 300, System.currentTimeMillis() + ".png"); // 生成二维码并保存到文件系统 - File file1 = new File(filePath); - String picUrl = "/qrcode" + System.currentTimeMillis() + ".jpg"; + + + + File file1 = new File(chartPic); + + String picUrl = "repayPic/repayChart" +System.currentTimeMillis()+ ".jpg"; InputStream inputStream = new FileInputStream(file1); OssUploadResult ossUploadResult = ossFileUploadService.uploadImageToOss(inputStream, picUrl, Integer.parseInt(String.valueOf(file1.length()))); - //file1.delete(); + // file1.delete(); String url = ossUploadResult.getUrl(); + log.info("SendDingDingQueueSimpleRabbitListener chartPic :{} url:{}",chartPic,url); + + + return url; } catch (Exception e) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminCategoryPropertyController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminCategoryPropertyController.java index 4bc1414..c958ce5 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminCategoryPropertyController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminCategoryPropertyController.java @@ -84,7 +84,7 @@ public class AdminCategoryPropertyController { /*** * 插入或更新 * - * @return + * /mm/category/property/delete */ @RequestMapping("/delete") public R delete(@RequestBody VvCategoryPropertyEntity vvCategoryProperty) { @@ -96,7 +96,7 @@ public class AdminCategoryPropertyController { /*** * 插入或更新 * - * @return + * /mm/category/property/value/insertOrUpdate */ @RequestMapping("/value/insertOrUpdate") public R insert(@RequestBody VvCategoryPropertyValueEntity vvCategoryPropertyValueEntity) { @@ -109,7 +109,7 @@ public class AdminCategoryPropertyController { /*** * 插入或更新 * - * @return + * /mm/category/property/value/delete */ @RequestMapping("/value/delete") public R delete(@RequestBody VvCategoryPropertyValueEntity vvCategoryProperty) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminProductController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminProductController.java index 43591e8..b4ff652 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminProductController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminProductController.java @@ -230,6 +230,7 @@ public class AdminProductController { public R insertOrUpadate(@RequestBody VvProductDTO vvProductDTO) { Long productId = vvProductDTO.getId() == null ? -1L : vvProductDTO.getId(); vvProductDao.insertOrUpdateVvProduct(vvProductDTO); + productId = vvProductDTO.getId(); List productDetailEntities = vvProductDetailDao.selectVvProductDetailByProductId(productId); // 1. 如果传过来的参数存在,则更新 ,如果不存在 ,则直接物理删除掉 for (VvProductDetailEntity productDetailEntity : productDetailEntities) { @@ -247,6 +248,7 @@ public class AdminProductController { * 传过来的 */ for (VvProductDetailEntity vvProductDetailEntity : vvProductDTO.getVvProductDetailList()) { + vvProductDetailEntity.setProductId(productId); vvProductDetailDao.insertOrUpdateVvProductDetail(vvProductDetailEntity); } @@ -269,6 +271,7 @@ public class AdminProductController { for (VvSkuDTO vvSkuDTO : vvSkuDTOS) { Long skuId = vvSkuDTO.getId(); + vvSkuDTO.setProductId(productId); vvSkuDao.insertOrUpdateVvSku(vvSkuDTO); if(NumberUtil.equals(vvSkuDTO.getIsFront(),1)){ @@ -301,6 +304,7 @@ public class AdminProductController { for (VvSkuPropertyValueEntity vvSkuPropertyValueEntity : vvSkuPropertyValueEntities) { vvSkuPropertyValueEntity.setSkuId(vvSkuDTO.getId()); + vvSkuPropertyValueEntity.setProductId(productId); vvSkuPropertyValueDao.insertOrUpdateVvSkuPropertyValue(vvSkuPropertyValueEntity); } } @@ -323,6 +327,7 @@ public class AdminProductController { for (VvProductPropertyDTO vvProductPropertyDTO : vvProductPropertyDTOS) { Long productPropertyId = vvProductPropertyDTO.getId(); + vvProductPropertyDTO.setProductId(productId); vvProductPropertyDao.insertOrUpdateVvProductProperty(vvProductPropertyDTO); List vvProductPropertyValueEntities = vvProductPropertyDTO.getVvProductPropertyValueList(); @@ -343,6 +348,7 @@ public class AdminProductController { } for (VvProductPropertyValueEntity vvProductPropertyValueEntity : vvProductPropertyValueEntities) { + vvProductPropertyValueEntity.setProductId(productId); vvProductPropertyValueEntity.setProductPropertyId(vvProductPropertyDTO.getId()); vvProductPropertyValueDao.insertOrUpdateVvProductPropertyValue(vvProductPropertyValueEntity); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppTestController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppTestController.java index 2bcad6b..7e31945 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppTestController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppTestController.java @@ -137,6 +137,9 @@ public class AppTestController { String url = chartUtil.generateQRCodeUp2Oss("9983989832983"); log.info("url:",url); + + + return R.ok(); }