后台管理页面完成

Administrator

2025-04-23 595b7935a30e84fba1bc3561d05f9d19d3e32e1f

 src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java

@@ -17,6 +17,7 @@
import com.taoke.autopay.service.KeyOrderService;
import com.taoke.autopay.service.agent.ChannelAgentService;
import com.taoke.autopay.utils.Constant;
import com.taoke.autopay.utils.IPUtil;
import com.taoke.autopay.utils.TimeUtil;
import com.taoke.autopay.vo.admin.AdminOrderVO;
import com.taoke.autopay.vo.admin.OrderSearchVO;
@@ -89,12 +90,14 @@
                case 2:
                    // 订单号
                    query.orderNo = vo.getKey().trim();
                    break;
                case 3:
                    // 支付设备ID
                    if (!NumberUtil.isNumeric(vo.getKey().trim())) {
                        throw new Exception("支付设备ID必须为数字");
                    }
                    query.distributeClientUid = Long.parseLong(vo.getKey().trim());
                    break;
            }

        }
@@ -115,6 +118,8 @@
        if (!StringUtil.isNullOrEmpty(vo.getEndDate())) {
            query.maxCreateTime = TimeUtil.getNextDay(1, new Date(TimeUtil.convertToTimeTemp(vo.getEndDate(), "yyyy-MM-dd")).getTime());
        }

        query.ignore = vo.getIgnore();

        return query;

@@ -295,6 +300,18 @@
                } else {
                    dto.setPayDevice("");
                }
                dto.setPayMerchant(order.getPayMerchant());
                if(StringUtil.isNullOrEmpty(order.getIpInfo())) {
                    dto.setArea("");
                }else{
                    IPUtil.IPInfo ipInfo = gson.fromJson(order.getIpInfo(), IPUtil.IPInfo.class);
                    dto.setArea(String.format("%s/%s",ipInfo.getProvince(),ipInfo.getCity()));
                }
                if(order.getIgnore()==null) {
                    dto.setIgnore("未知");
                }else{
                    dto.setIgnore(order.getIgnore()?"是":"否");
                }
                dataList.add(dto);
            }