大屏修改

xuhy

2025-04-28 08021fc14cf4cc5988cec72cef5fa48f0271d5a2

大屏修改

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java

@@ -7,6 +7,7 @@
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
@@ -20,6 +21,7 @@
import com.ruoyi.admin.vo.SiteLargeeVO;
import com.ruoyi.admin.vo.WorkersLargeeVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Order;
@@ -246,7 +248,7 @@
            orders.forEach(order -> {
                AnalysisOrderData analysisOrderData = new AnalysisOrderData();
                analysisOrderData.setOrderNum(order.getOrderNumber());
                analysisOrderData.setOrderDate(analysisOrderData.getOrderDate());
                analysisOrderData.setOrderDate(order.getCreateTime());
//                analysisOrderData.setOrderChannel(order.getOrderChannel());
                analysisOrderData.setCity(order.getCity());
                analysisOrderData.setOrderCategory(order.getServeName());
@@ -256,6 +258,10 @@
                analysisOrderData.setState(order.getState());
                analysisOrderDataList.add(analysisOrderData);
            });
            // 删除今日订单
            analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
                    .like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
            );
            analysisOrderDataService.saveBatch(analysisOrderDataList);
        }
        return R.ok();

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java

@@ -394,7 +394,7 @@
                    JSONObject.toJSONString(postMap),
                    "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                    "1665330417",
                    "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
                    "D://apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
            JSONObject jsonObject = JSONObject.parseObject(result);
//            WithdrawDetail withdrawDetail = new WithdrawDetail();
//            withdrawDetail.setWithdrawId(withdrawId);