Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberStationRelationService.java

@@ -2,7 +2,10 @@ package com.jsowell.pile.service;
 
 import java.util.List;
 
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.MemberStationRelation;
+import com.jsowell.pile.dto.CollectedStationDTO;
+import com.jsowell.pile.dto.QueryStationDTO;
 
 /**
  * 会员与收藏的站点关系Service接口
@@ -61,8 +64,15 @@ public interface MemberStationRelationService {
 
     /**
      * 通过memberId查询站点idList
-     * @param memberId
+     * @param dto
      * @return
      */
-    public List<String> getStationIdListByMemberId(String memberId);
+    public PageResponse getCollectedStationIdList(QueryStationDTO dto);
+
+    /**
+     * 修改收藏站点状态
+     * @param dto
+     * @return
+     */
+    int updateCollectedStation(CollectedStationDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberStationRelationServiceImpl.java

@@ -2,8 +2,13 @@ package com.jsowell.pile.service.impl;
 
 import java.util.List;
 
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.pile.dto.CollectedStationDTO;
+import com.jsowell.pile.dto.QueryStationDTO;
 import com.jsowell.pile.service.MemberStationRelationService;
+import com.jsowell.pile.service.PileStationInfoService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jsowell.pile.mapper.MemberStationRelationMapper;
@@ -20,6 +25,9 @@ public class MemberStationRelationServiceImpl implements MemberStationRelationSe
     @Autowired
     private MemberStationRelationMapper memberStationRelationMapper;
 
+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
     /**
      * 查询会员与收藏的站点关系
      *
@@ -88,8 +96,49 @@ public class MemberStationRelationServiceImpl implements MemberStationRelationSe
         return memberStationRelationMapper.deleteMemberStationRelationById(id);
     }
 
+    /**
+     * 查询用户收藏的站点信息
+     * @param dto
+     * @return
+     */
     @Override
-    public List<String> getStationIdListByMemberId(String memberId) {
-        return memberStationRelationMapper.getStationIdListByMemberId(memberId);
+    public PageResponse getCollectedStationIdList(QueryStationDTO dto) {
+        // 先查出来站点idList
+        List<String> stationIdList = memberStationRelationMapper.getStationIdListByMemberId(dto.getMemberId());
+        if (CollectionUtils.isEmpty(stationIdList)) {
+            return new PageResponse();
+        }
+        // 根据站点idList批量查站点信息
+        dto.setStationIds(stationIdList);
+        PageResponse pageResponse = pileStationInfoService.uniAppQueryStationInfoList(dto);
+
+        return pageResponse;
+    }
+
+    /**
+     * 某用户取消收藏站点
+     * @param memberStationRelation
+     * @return
+     */
+    public int deleteMemberStationRelation(MemberStationRelation memberStationRelation) {
+        return memberStationRelationMapper.deleteMemberStationRelation(memberStationRelation);
+    }
+
+    @Override
+    public int updateCollectedStation(CollectedStationDTO dto) {
+        int result = 0;
+        // 判断操作类型
+        boolean operatorType = dto.isOperatorType();
+        MemberStationRelation relation = new MemberStationRelation();
+        relation.setStationId(Long.parseLong(dto.getStationId()));
+        relation.setMemberId(dto.getMemberId());
+        if (operatorType) {
+            // 添加收藏
+            result = insertMemberStationRelation(relation);
+        }else {
+            // 取消收藏
+            result = deleteMemberStationRelation(relation);
+        }
+        return result;
     }
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java

@@ -632,6 +632,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
         Optional<BillingTemplateVO> max = list.stream()
                 .filter(x -> StringUtils.equals(x.getDeviceType(), Constants.ONE)) // 过滤出汽车桩的计费模板
                 .filter(x -> StringUtils.isNotBlank(x.getPublishTime()))
+                .filter(x -> StringUtils.equals(Constants.ZERO, x.getMemberFlag())) // 过滤出非会员价格
                 .max(Comparator.comparing(BillingTemplateVO::getPublishTime));
         return max.orElse(null);
     }