diff --git a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java index 675e7e2e..a275e244 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java @@ -112,7 +112,7 @@ public class EtcCustomerController { etcCustMsg.setUserName(userInfoModel.getSecUser().getUserName()); etcCustMsg.setCreateTime(new Date()); etcCustMsg.setUpdateTime(new Date()); - etcCustMsg.setStatus(0); + etcCustMsg.setStatus(1); Map mapUser = new HashMap<>(); diff --git a/hai-bweb/src/main/java/com/bweb/controller/Goods/GoodsDetailController.java b/hai-bweb/src/main/java/com/bweb/controller/Goods/GoodsDetailController.java index 955e8f7f..fd919979 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/Goods/GoodsDetailController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/Goods/GoodsDetailController.java @@ -124,7 +124,7 @@ public class GoodsDetailController { goodsDetail.setOpId(userInfoModel.getSecUser().getId()); goodsDetail.setStatus(2); goodsDetail.setCompanyId(userInfoModel.getBsCompany().getId()); - goodsDetail.setOpName(userInfoModel.getSecUser().getLoginName()); + goodsDetail.setOpName(userInfoModel.getSecUser().getUserName()); goodsDetail.setCreateTime(new Date()); goodsDetail.setGoodsTypeName(goodsType.getTitle()); goodsDetail.setUpdateTime(new Date()); diff --git a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java index d7e29e1a..58934b5a 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java @@ -177,7 +177,7 @@ public class CmsContentController { for (CmsContent content : cmsContent) { if (content.getTitle().equals("电影票")) { - content.setJumpUrl(cmsCategoryService.queryCinemaUrl()); + content.setJumpUrl(cmsCategoryService.queryCinemaUrl() + "¤tScene=1000"); } } object.put("childCategory" , cmsContent); diff --git a/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java b/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java index a619a8e3..8cf3577b 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java @@ -132,6 +132,7 @@ public class GoodsController { @ApiOperation(value = "查询商品列表") public ResponseData getListGoodsDetail( @RequestParam(value = "goodsTypeId", required = false) String goodsTypeId, + @RequestParam(value = "title", required = false) String title, @RequestParam(value = "companyId", required = false) Long companyId ) { try { @@ -139,6 +140,7 @@ public class GoodsController { Map map = new HashMap<>(); map.put("companyId", companyId); map.put("status", 1); + map.put("title", title); List goodsModels = new ArrayList<>(); List list = new ArrayList<>(); @@ -150,6 +152,7 @@ public class GoodsController { for (HighGoodsType highGoodsType : goodsTypes) { map.put("goodsType", highGoodsType.getId()); + list.addAll(goodsDetailService.getGoodsDetailList(map)); }