fix 封禁替换银行卡号;查看车票增加订单号查询

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelBannedAccountData.java

@@ -46,4 +46,7 @@ public class ExcelBannedAccountData {
 	 */
 	@ExcelProperty("备注")
 	private String remark;
+
+	@ExcelProperty("银行卡号")
+	private String bankCard;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -1157,6 +1157,9 @@ public class CmsAccountController {
 				if (StrUtil.isNotBlank(data.getRemark())) {
 					dbAccount.setRemark(data.getRemark());
 				}
+				if (StrUtil.isNotEmpty(data.getBankCard())) {
+					dbAccount.setBankCard(data.getBankCard());
+				}
 				dbAccount.setGptEmailPwd(data.getGptEmailPwd());
 				accountService.updateById(dbAccount);
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -21,6 +21,7 @@ import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsRelationAlertMapper;
 import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelGroupRelationData;
@@ -76,9 +77,11 @@ public class CmsGroupController {
 
     private final UserMapper userMapper;
 
+    private final OrderDonMapper orderDonMapper;
+
     @GetMapping("/get")
     @SaCheckPermission("group:view")
-    public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String showId, String nickName, String submitAccount, Boolean isEmpty) {
+    public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String showId, String nickName, String submitAccount, Boolean isEmpty, String orderNo) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
         if (StrUtil.isNotBlank(showId)) {
             userId = userMapper.getUserIdByShowId(showId);
@@ -94,12 +97,23 @@ public class CmsGroupController {
         if (isEmpty != null && isEmpty) {
             mapBuilder.field(GroupsTrips::getNum, GroupsTrips::getAvailableNum).sql("$1 = $2");
         }
-
+        if (StrUtil.isNotEmpty(orderNo)) {
+            Long groupId = 0l;
+            OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
+                    .eq(OrderDon::getOrderNo, orderNo).last("limit 1"));
+            if (orderDon != null) {
+                GroupsRelation relation = relationMapper.selectById(orderDon.getRelationId());
+                if (relation != null && relation.getUserId().equals(orderDon.getUserId())) {
+                    groupId = relation.getGroupsId();
+                }
+            }
+            mapBuilder.field(GroupsTrips::getId, groupId);
+        }
         SearchResult<GroupsTrips> search = beanSearcher.search(GroupsTrips.class, mapBuilder
                 .field(GroupsTrips::getAccount, StringUtils.isBlank(account) ? null : account).op(Operator.EndWith)
                 .build()
         );
-        search.getDataList().forEach(data->{
+        search.getDataList().forEach(data -> {
             Number count = beanSearcher.searchCount(GroupsRelation.class, MapUtils.builder()
                     .field(GroupsRelation::getGroupsId, data.getId())
                     .field(GroupsRelation::getUserId, 0).op(Operator.NotEqual)