From f95ab2662737843a9b80727387941247785da91c Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 1 Nov 2022 15:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=A7=AF=E5=88=86=E4=B8=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cweb/controller/CmsContentController.java | 16 +++++++++------- .../business/OrderThirdPartyController.java | 1 - .../src/main/resources/dev/config.properties | 2 ++ .../java/com/hai/config/CmsContentConfig.java | 2 +- .../main/resources/dev/commonConfig.properties | 4 ++-- 5 files changed, 14 insertions(+), 11 deletions(-) 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 00fe7929..34741740 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java @@ -95,24 +95,26 @@ public class CmsContentController { object.put("sort" , cmsCategory.getSort()); object.put("code" , cmsCategory.getCode()); List cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform); - object.put("jumpType" , cmsContent.get(0).getJumpType()); - object.put("jumpUrl" , cmsContent.get(0).getJumpUrl()); - object.put("childDate" , cmsContentConfig.getCmsContentData(cmsCategory.getName() , companyId)); + if (cmsContent != null) { + object.put("jumpType" , cmsContent.get(0).getJumpType()); + object.put("jumpUrl" , cmsContent.get(0).getJumpUrl()); + } + object.put("childDate" , cmsContentConfig.getCmsContentData(cmsCategory.getName(), companyId)); } else if(cmsCategory.getType() == 3) { object.put("type" , cmsCategory.getType()); object.put("name" , cmsCategory.getName()); object.put("sort" , cmsCategory.getSort()); object.put("code" , cmsCategory.getCode()); List cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform); - object.put("jumpType" , cmsContent.get(0).getJumpType()); - object.put("jumpUrl" , cmsContent.get(0).getJumpUrl()); - + if (cmsContent != null) { + object.put("jumpType" , cmsContent.get(0).getJumpType()); + object.put("jumpUrl" , cmsContent.get(0).getJumpUrl()); + } Map map = new HashMap<>(); map.put("companyId" , companyId); map.put("whereCheck" , false); map.put("userId" , userInfoModel.getHighUser().getId()); - object.put("childDate" , bsMsgService.queryMsgByList(map)); } objectList.add(object); diff --git a/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java b/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java index 0522ebef..1c8fa309 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderThirdPartyController.java @@ -177,7 +177,6 @@ public class OrderThirdPartyController { for (HighOrder thirdPartyModel : orderList) { model = new OrderThirdPartyModel(); - model.setOrderNo(thirdPartyModel.getOrderNo()); model.setMemPhone(thirdPartyModel.getMemPhone()); model.setTitle(thirdPartyModel.getTitle()); diff --git a/hai-order/src/main/resources/dev/config.properties b/hai-order/src/main/resources/dev/config.properties index e7a650a2..e71baf0c 100644 --- a/hai-order/src/main/resources/dev/config.properties +++ b/hai-order/src/main/resources/dev/config.properties @@ -9,5 +9,7 @@ wxPayUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder wxPayNotifyUrl=https://hsgcs.dctpay.com/order/payNotify/wechatPay unionPayNotifyUrl=https://hsgcs.dctpay.com/order/payNotify/unionPay +#fileUrl=/home/project/hsg/filesystem/ +#cmsPath=/home/project/hsg/filesystem/ fileUrl=/Volumes/work/code/filesystem/ cmsPath=/Volumes/work/code/filesystem/ diff --git a/hai-service/src/main/java/com/hai/config/CmsContentConfig.java b/hai-service/src/main/java/com/hai/config/CmsContentConfig.java index 636af62f..87fb8e5d 100644 --- a/hai-service/src/main/java/com/hai/config/CmsContentConfig.java +++ b/hai-service/src/main/java/com/hai/config/CmsContentConfig.java @@ -41,7 +41,7 @@ public class CmsContentConfig { map.put("status" , 1); PageHelper.startPage(1, 3); return new PageInfo<>( highDiscountPackageService.getDiscountPackageList(map)).getList(); - } else if (CmsContentDataEnum.REFUEL.getName().equals(title)){ + } else if (CmsContentDataEnum.REFUEL.getName().equals(title) || CmsContentDataEnum.INTEGRAL.getName().equals(title)){ map.put("companyId", companyId); map.put("displayArea", CmsContentDataEnum.getTypeByName(title)); map.put("notCouponSource", 2); diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index a923cedb..80dcac5e 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -105,5 +105,5 @@ unionRsaKey=891f6775fba7f12cc23df7c75e02b39b891f6775fba7f12c #url -fileUrl=/home/project/hsg/filesystem/ -#fileUrl=/Volumes/work/code/filesystem/ +#fileUrl=/home/project/hsg/filesystem/ +fileUrl=/Volumes/work/code/filesystem/