调整order指令包结构

czt

2024-04-23 f55b2623f09b0b902f991c701c67a2a6f2577057

 src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java

@@ -10,7 +10,7 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
import com.fzzy.order.data.OrderData;
import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -119,9 +119,9 @@
            //指令id
            String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
            String orderId = reqData.getId();
            OrderData orderData = (OrderData) redisUtil.get(key);
            if (null != orderData && StringUtils.isNotEmpty(orderData.getOrderid())) {
                orderId = orderData.getOrderid();
            OrderCommonData orderCommonData = (OrderCommonData) redisUtil.get(key);
            if (null != orderCommonData && StringUtils.isNotEmpty(orderCommonData.getOrderid())) {
                orderId = orderCommonData.getOrderid();
            }
            reqData.setOrderid(orderId);

@@ -199,6 +199,36 @@
            api1102.setLkxz("1");
            return api1102;
        }
        if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {

            Nx2023Api1103 api1103 = new Nx2023Api1103();
            BeanUtils.copyProperties(data, api1103);
            return api1103;
        }
        if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {

            Nx2023Api1104 api1104 = new Nx2023Api1104();
            BeanUtils.copyProperties(data, api1104);
            return api1104;
        }
        if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {

            Nx2023Api1105 api1105 = new Nx2023Api1105();
            BeanUtils.copyProperties(data, api1105);
            return api1105;
        }
        if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {

            Nx2023Api1106 api1106 = new Nx2023Api1106();
            BeanUtils.copyProperties(data, api1106);
            return api1106;
        }
        if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {

            Nx2023Api1107 api1107 = new Nx2023Api1107();
            BeanUtils.copyProperties(data, api1107);
            return api1107;
        }
        if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) {
            Nx2023Api1108 api1108 = new Nx2023Api1108();
            BeanUtils.copyProperties(data, api1108);
@@ -212,6 +242,11 @@
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));
            return api1109;
        }
        if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) {
            Nx2023Api1110 api1110 = new Nx2023Api1110();
            BeanUtils.copyProperties(data, api1110);
            return api1110;
        }
        if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
            Nx2023Api1111 api1111 = new Nx2023Api1111();
@@ -233,22 +268,86 @@
            BeanUtils.copyProperties(data, api1201);
            return api1201;
        }
        if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
            Nx2023Api1202 api1202 = new Nx2023Api1202();
            BeanUtils.copyProperties(data, api1202);
            return api1202;
        }
        if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
            Nx2023Api1203 api1203 = new Nx2023Api1203();
            BeanUtils.copyProperties(data, api1203);
            return api1203;
        }

        if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
            Nx2023Api1211 api1211 = new Nx2023Api1211();
            BeanUtils.copyProperties(data, api1211);
            return api1211;
        if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) {
            Nx2023Api1204 api1204 = new Nx2023Api1204();
            BeanUtils.copyProperties(data, api1204);
            return api1204;
        }
        if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) {
            Nx2023Api1205 api1205 = new Nx2023Api1205();
            BeanUtils.copyProperties(data, api1205);
            api1205.setSzlx("09");
            return api1205;
        }
        if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
            Nx2023Api1206 api1206 = new Nx2023Api1206();
            BeanUtils.copyProperties(data, api1206);
            return api1206;
        }
        if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
            Nx2023Api1207 api1207 = new Nx2023Api1207();
            BeanUtils.copyProperties(data, api1207);
            return api1207;
        }
        if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) {
            Nx2023Api1208 api1208 = new Nx2023Api1208();
            BeanUtils.copyProperties(data, api1208);
            return api1208;
        }
        if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) {
            Nx2023Api1209 api1209 = new Nx2023Api1209();
            BeanUtils.copyProperties(data, api1209);
            return api1209;
        }
        if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) {
            Nx2023Api1210 api1210 = new Nx2023Api1210();
            BeanUtils.copyProperties(data, api1210);
            return api1210;
        }
        if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
            Nx2023Api1211 api1211 = new Nx2023Api1211();
            BeanUtils.copyProperties(data, api1211);
            return api1211;
        }
        if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) {
            Nx2023Api1212 api1212 = new Nx2023Api1212();
            BeanUtils.copyProperties(data, api1212);
            return api1212;
        }
        if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) {
            Nx2023Api1301 api1301 = new Nx2023Api1301();
            BeanUtils.copyProperties(data, api1301);
            return api1301;
        }
        if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) {
            Nx2023Api1302 api1302 = new Nx2023Api1302();
            BeanUtils.copyProperties(data, api1302);
            return api1302;
        }
        if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) {
            Nx2023Api1303 api1303 = new Nx2023Api1303();
            BeanUtils.copyProperties(data, api1303);
            return api1303;
        }
        if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) {
            Nx2023Api1304 api1304 = new Nx2023Api1304();
            BeanUtils.copyProperties(data, api1304);
            return api1304;
        }
        if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) {
            Nx2023Api1305 api1305 = new Nx2023Api1305();
            BeanUtils.copyProperties(data, api1305);
            return api1305;
        }
        if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) {
            Nx2023Api1306 api1306 = new Nx2023Api1306();
@@ -270,10 +369,40 @@
            BeanUtils.copyProperties(data, api1308);
            return api1308;
        }
        if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) {
            Nx2023Api1309 api1309 = new Nx2023Api1309();
            BeanUtils.copyProperties(data, api1309);
            return api1309;
        }
        if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) {
            Nx2023Api1310 api1310 = new Nx2023Api1310();
            BeanUtils.copyProperties(data, api1310);
            return api1310;
        }
        if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) {
            Nx2023Api1401 api1401 = new Nx2023Api1401();
            BeanUtils.copyProperties(data, api1401);
            return api1401;
        }
        if (NX2023Constant.NX_2023_API_CODE_1402.equals(inteId)) {
            Nx2023Api1402 api1402 = new Nx2023Api1402();
            BeanUtils.copyProperties(data, api1402);
            return api1402;
        }
        if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) {
            Nx2023Api1403 api1403 = new Nx2023Api1403();
            BeanUtils.copyProperties(data, api1403);
            return api1403;
        }
        if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) {
            Nx2023Api1404 api1404 = new Nx2023Api1404();
            BeanUtils.copyProperties(data, api1404);
            return api1404;
        }
        if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) {
            Nx2023Api1405 api1405 = new Nx2023Api1405();
            BeanUtils.copyProperties(data, api1405);
            return api1405;
        }
        return data;
    }
@@ -313,8 +442,7 @@
        }
    }

    private List<NxFinanceDto> copyApi1503(Api1503 data) {
        Api1503 api1503 = data;
    private List<NxFinanceDto> copyApi1503(Api1503 api1503) {
        List<NxFinanceDto> list = new ArrayList<>();
        NxFinanceDto nxFinanceDto = new NxFinanceDto();
        nxFinanceDto.setDwdm(api1503.getDwdm());
@@ -324,16 +452,16 @@
        nxFinanceDto.setCzbz(api1503.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0","项目//t", "本期金额//t", "本年累计//t");
        paddingData(nxFinanceDto, list, "1","一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
        paddingData(nxFinanceDto, list, "2","减：营业成本", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
        paddingData(nxFinanceDto, list, "3","税金及附加", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
        paddingData(nxFinanceDto, list, "4","销售费用", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
        paddingData(nxFinanceDto, list, "5","管理费用", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
        paddingData(nxFinanceDto, list, "6","研发费用", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
        paddingData(nxFinanceDto, list, "7","财务费用", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
        paddingData(nxFinanceDto, list, "8","其中：利息费用", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
        paddingData(nxFinanceDto, list, "9","利息收入", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
        paddingData(nxFinanceDto, list, "0", "项目//t", "本期金额//t", "本年累计//t");
        paddingData(nxFinanceDto, list, "1", "一、营业收入", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
        paddingData(nxFinanceDto, list, "2", "减：营业成本", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
        paddingData(nxFinanceDto, list, "3", "税金及附加", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
        paddingData(nxFinanceDto, list, "4", "销售费用", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
        paddingData(nxFinanceDto, list, "5", "管理费用", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
        paddingData(nxFinanceDto, list, "6", "研发费用", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
        paddingData(nxFinanceDto, list, "7", "财务费用", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
        paddingData(nxFinanceDto, list, "8", "其中：利息费用", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
        paddingData(nxFinanceDto, list, "9", "利息收入", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
        paddingData(nxFinanceDto, list, "10","加：其他收益", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
        paddingData(nxFinanceDto, list, "11","投资收益（损失以“-”号填列）", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
        paddingData(nxFinanceDto, list, "12","其中：对联营企业和合营企业的投资收益", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
@@ -365,8 +493,7 @@
        return list;
    }

    private List<NxFinanceDto> copyApi1502(Api1502 data) {
        Api1502 api1502 = data;
    private List<NxFinanceDto> copyApi1502(Api1502 api1502) {
        List<NxFinanceDto> list = new ArrayList<>();
        NxFinanceDto nxFinanceDto = new NxFinanceDto();
        nxFinanceDto.setDwdm(api1502.getDwdm());
@@ -376,16 +503,16 @@
        nxFinanceDto.setCzbz(api1502.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0","项目//t", "本月数//t", "本年累计数//t");
        paddingData(nxFinanceDto, list, "1","一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
        paddingData(nxFinanceDto, list, "2","销售商品、提供劳务收到的现金", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
        paddingData(nxFinanceDto, list, "3","收到的税费返还", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
        paddingData(nxFinanceDto, list, "4","收到其他与经营活动有关的现金", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
        paddingData(nxFinanceDto, list, "5","经营活动现金流入小计", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
        paddingData(nxFinanceDto, list, "6","购买商品、接受劳务支付的现金", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
        paddingData(nxFinanceDto, list, "7","支付给职工以及为职工支付的现金", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
        paddingData(nxFinanceDto, list, "8","支付的各项税费", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
        paddingData(nxFinanceDto, list, "9","支付其他与经营活动有关的现金", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
        paddingData(nxFinanceDto, list, "0", "项目//t", "本月数//t", "本年累计数//t");
        paddingData(nxFinanceDto, list, "1", "一、经营活动产生的现金流量：", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
        paddingData(nxFinanceDto, list, "2", "销售商品、提供劳务收到的现金", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
        paddingData(nxFinanceDto, list, "3", "收到的税费返还", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
        paddingData(nxFinanceDto, list, "4", "收到其他与经营活动有关的现金", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
        paddingData(nxFinanceDto, list, "5", "经营活动现金流入小计", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
        paddingData(nxFinanceDto, list, "6", "购买商品、接受劳务支付的现金", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
        paddingData(nxFinanceDto, list, "7", "支付给职工以及为职工支付的现金", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
        paddingData(nxFinanceDto, list, "8", "支付的各项税费", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
        paddingData(nxFinanceDto, list, "9", "支付其他与经营活动有关的现金", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
        paddingData(nxFinanceDto, list, "10","经营活动现金流出小计", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
        paddingData(nxFinanceDto, list, "11","经营活动产生的现金流量净额", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
        paddingData(nxFinanceDto, list, "12","二、投资活动产生的现金流量：", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
@@ -419,8 +546,7 @@
        return list;
    }

    private List<NxFinanceDto> copyApi1501(Api1501 data) {
        Api1501 api1501 = data;
    private List<NxFinanceDto> copyApi1501(Api1501 api1501) {
        List<NxFinanceDto> list = new ArrayList<>();
        NxFinanceDto nxFinanceDto = new NxFinanceDto();
        nxFinanceDto.setDwdm(api1501.getDwdm());
@@ -430,16 +556,16 @@
        nxFinanceDto.setCzbz(api1501.getCzbz());
        nxFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        paddingData(nxFinanceDto, list, "0", "资产//t", "期末余额//t", "年初余额//t");
        paddingData(nxFinanceDto, list, "1", "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(nxFinanceDto, list, "2", "货币资金", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
        paddingData(nxFinanceDto, list, "3", "交易性金融资产", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
        paddingData(nxFinanceDto, list, "4", "衍生金融资产", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
        paddingData(nxFinanceDto, list, "5", "应收票据", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
        paddingData(nxFinanceDto, list, "6", "应收账款", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
        paddingData(nxFinanceDto, list, "7", "预付款项", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
        paddingData(nxFinanceDto, list, "8", "其他应收款", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
        paddingData(nxFinanceDto, list, "9", "存货", api1501.getChqmye() + "", api1501.getChncye() + "");
        paddingData(nxFinanceDto, list, "0",  "资产//t", "期末余额//t", "年初余额//t");
        paddingData(nxFinanceDto, list, "1",  "流动资产：", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
        paddingData(nxFinanceDto, list, "2",  "货币资金", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
        paddingData(nxFinanceDto, list, "3",  "交易性金融资产", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
        paddingData(nxFinanceDto, list, "4",  "衍生金融资产", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
        paddingData(nxFinanceDto, list, "5",  "应收票据", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
        paddingData(nxFinanceDto, list, "6",  "应收账款", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
        paddingData(nxFinanceDto, list, "7",  "预付款项", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
        paddingData(nxFinanceDto, list, "8",  "其他应收款", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
        paddingData(nxFinanceDto, list, "9",  "存货", api1501.getChqmye() + "", api1501.getChncye() + "");
        paddingData(nxFinanceDto, list, "10", "合同资产", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
        paddingData(nxFinanceDto, list, "11", "持有待售资产", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
        paddingData(nxFinanceDto, list, "12", "一年内到期的非流动资产", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");