Merge remote-tracking branch 'origin/sit' into sit

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeDiscountCouponVo.java

@@ -120,6 +120,9 @@ public class LifeDiscountCouponVo {
     @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)")
     private Integer businessSection;
 
+    @ApiModelProperty(value = "经营板块名称")
+    private String businessSectionName;
+
     @ApiModelProperty(value = "自定义领取规则数量")
     private Integer claimRuleCustomizeValue;
 

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StorePlatformLoginServiceImpl.java

@@ -214,10 +214,10 @@ public class StorePlatformLoginServiceImpl extends ServiceImpl<StoreUserMapper,
 
             StoreInfo storeInfo = storeInfoMapper.selectById(storeId);
             if (storeInfo != null) {
-                if (storeInfo.getExpirationTime().compareTo(new Date()) < 0) {
+                if (storeInfo.getExpirationTime() == null || storeInfo.getExpirationTime().compareTo(new Date()) < 0) {
                     jsonObject.put("expirationTime", 0);
                 }
-                if (storeInfo.getFoodLicenceExpirationTime().compareTo(new Date()) < 0) {
+                if (storeInfo.getFoodLicenceExpirationTime() == null || storeInfo.getFoodLicenceExpirationTime().compareTo(new Date()) < 0) {
                     jsonObject.put("foodLicenceExpirationTime", 0);
                 }
                 if (storeInfo.getEntertainmentLicenceExpirationTime() != null && storeInfo.getEntertainmentLicenceExpirationTime().compareTo(new Date()) < 0) {

alien-store/src/main/java/shop/alien/store/service/LifeUserStoreService.java

@@ -135,7 +135,12 @@ public class LifeUserStoreService {
                 storeMap.put("businessStatusStr", store.getBusinessStatusStr());
 
                 //474bug
+                storeMap.put("businessSection", store.getBusinessSection());
+                storeMap.put("businessSectionName", store.getBusinessSectionName());
+                storeMap.put("businessTypes", store.getBusinessTypes());
                 storeMap.put("businessTypesName", store.getBusinessTypesName());
+                storeMap.put("businessClassify", store.getBusinessClassify());
+                storeMap.put("businessClassifyName", store.getBusinessClassifyName());
                 storeMap.put("storeBusinessInfo", storeBusinessInfo);
                 // 添加门店ID
                 storeMap.put("storeId", store.getId());

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -686,6 +686,7 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
             LifeDiscountCouponVo lifeDiscountCouponVo = new LifeDiscountCouponVo();
             if (null != storeInfoOne) {
                 lifeDiscountCouponVo.setBusinessSection(storeInfoOne.getBusinessSection());
+                lifeDiscountCouponVo.setBusinessSectionName(storeInfoOne.getBusinessSectionName());
             }
             lifeDiscountCouponVo.setCouponId(lifeDiscountCouponOne.getId());
             BeanUtils.copyProperties(lifeDiscountCouponOne, lifeDiscountCouponVo);