修改首页没有积分专区

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> cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform);
+                        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));
+                        }
+                        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> cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform);
+                        if (cmsContent != null) {
                             object.put("jumpType" , cmsContent.get(0).getJumpType());
                             object.put("jumpUrl" , cmsContent.get(0).getJumpUrl());
-
+                        }
                         Map<String, Object> 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);

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());

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/

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);

hai-service/src/main/resources/dev/commonConfig.properties

@@ -105,5 +105,5 @@ unionRsaKey=891f6775fba7f12cc23df7c75e02b39b891f6775fba7f12c
 
 
 #url
-fileUrl=/home/project/hsg/filesystem/
+#fileUrl=/home/project/hsg/filesystem/
-#fileUrl=/Volumes/work/code/filesystem/
+fileUrl=/Volumes/work/code/filesystem/