Merge branch 'dev' into feature-integrated_with_JCPP

jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java

@@ -151,4 +151,5 @@ public class BusinessStationInfoController extends BaseController {
         return response;
     }
 
+
 }

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -189,8 +189,8 @@ public class MemberService {
 		String requestId = IdUtils.fastUUID();
 		Boolean isLock = false;
 		try {
-			// 获取锁，防止注册创建重复账户，锁超时时间10秒
-			isLock = redisCache.lock(lockKey, requestId, 10);
+			// 获取锁，防止注册创建重复账户，锁超时时间60秒（足够覆盖业务执行时间）
+			isLock = redisCache.lock(lockKey, requestId, 60);
 			if (!isLock) {
 				// 获取锁失败，说明有其他请求正在处理，提示用户稍候
 				log.warn("获取注册锁失败，可能有并发请求正在处理, phoneNumber:{}", phoneNumber);

jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java

@@ -335,6 +335,7 @@ public class CacheConstants {
 	 */
 	public static final String PILE_HARDWARE_FAULT = "pile_hardware_fault:";
 
+
 	/**
 	 * 充电桩sn生成 key
 	 */

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java

@@ -706,16 +706,16 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
 //            }, thirdpartyTaskExecutor);
 
             // TODO 异步推送充电订单算法平台
-           // CompletableFuture.runAsync(() -> {
-           //     try {
-           //         // 1-web端
-           //         getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.ONE);
-           //         // 2-pdf端
-           //         getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.TWO);
-           //     }catch (Exception e) {
-           //         log.error("异步推送充电订单算法平台 error", e);
-           //     }
-           // }, thirdpartyTaskExecutor);
+           CompletableFuture.runAsync(() -> {
+               try {
+                   // 1-web端
+                   getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.ONE);
+                   // 2-pdf端
+                   getReportUrlByOrderCode(finalOrderBasicInfo.getOrderCode(), Constants.TWO);
+               }catch (Exception e) {
+                   log.error("异步推送充电订单算法平台 error", e);
+               }
+           }, thirdpartyTaskExecutor);
 //
 //
 //            CompletableFuture.runAsync(() -> {

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java

@@ -80,7 +80,7 @@ public interface MemberGroupMapper {
 
     MemberGroupVO queryByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId);
 
-    List<MemberVO> queryMemberList(@Param("groupCode") String groupCode);
+    List<MemberVO> queryMemberList(MemberGroupDTO dto);
 
     MemberGroup selectByGroupCode(String groupCode);
 

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

@@ -215,4 +215,6 @@ public interface PileStationInfoService {
 	 * @return
 	 */
 	PageResponse queryUserFrequentedStation(QueryStationDTO dto);
+
+
 }

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

@@ -386,7 +386,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
     @Override
     public List<MemberVO> queryMemberList(MemberGroupDTO dto) {
-        List<MemberVO> list = memberGroupMapper.queryMemberList(dto.getGroupCode());
+        if (dto.getGroupCode().isEmpty()){
+            return null;
+        }
+        List<MemberVO> list = memberGroupMapper.queryMemberList(dto);
         return list;
     }
 

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

@@ -773,6 +773,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
             deleteRedisByPileSnOrPileConnectorCode(pileSn, pileConnectorCode);
             redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_6m);
 
+
             // 异步放缓存
             CompletableFuture.runAsync(() -> statusChange(pileConnectorCode), executor);
         }

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

@@ -36,7 +36,6 @@ import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
-import com.jsowell.pile.vo.web.BillingTemplateVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.pile.vo.web.StationSelectVO;
 import com.jsowell.system.service.SysDeptService;
@@ -1623,4 +1622,5 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
         }
         return uniAppQueryStationInfoListV2(dto);
     }
+
 }

jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml

@@ -165,8 +165,14 @@
         FROM
         member_basic_info t1
         JOIN member_group_relation t2 ON t2.member_id = t1.member_id and t2.del_flag = '0'
-        where
-            t2.group_code = #{groupCode,jdbcType=VARCHAR}
+        WHERE t1.del_flag = '0'
+            AND t2.group_code = #{groupCode}
+        <if test="phoneNumber != null and phoneNumber != ''">
+            AND t1.mobile_number LIKE CONCAT('%', #{phoneNumber}, '%')
+        </if>
+        <if test="memberId != null and memberId != ''">
+            AND t2.member_id = #{memberId}
+        </if>
     </select>
 
     <select id="selectByGroupCode" resultMap="MemberGroupResult">