20250106

zjh

2025-01-06 1ce606a5cd06b859a57eabf8b12c4fb3704168b4

20250106

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -1085,11 +1085,21 @@

    @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
    public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
        //生成体检号
        String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
        tjOrder.setTjNumber(tjNumber);
        BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));

        //获取拼接前缀
        String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");

        //生成体检号
//        String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
//        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;


        String tjNumber = (SecurityUtils.getUsername()+IdUtils.getTjNumber());
        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
        tjOrder.setTjNumber(tjNumber);


        BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
        tjOrder.setDiscount(discount.toString());
        if (tjOrderService.save(tjOrder)) {
            //保存收货地址
@@ -3481,24 +3491,26 @@
                log.info("退费申请 入参 -> {}", JSONUtil.toJsonStr(map));
                String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
                log.info("退费申请 返回 -> {}", JSONUtil.toJsonStr(post));
                JSONObject jsonObject = JSONUtil.parseObj(post);
                if (jsonObject.getStr("code").equals("200")) {
                    // hisTfWaterId
                    String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
                    water.setHisTfWaterId(tfid);
                    tjFlowingWaterService.updateById(water);
                    if (isDelete) {
                        for (TjFlowingWater water1 : yizhifu) {
                            String bldh1 = water1.getJxbz();
                            remarkService.deleteTjOrderDetailByjxbz(bldh1);
                            tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
                            tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
                            transitionService.deleteTjOrderDetailByjxbz(bldh1);
                            blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
                            tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
                if(null !=post){
                    JSONObject jsonObject = JSONUtil.parseObj(post);
                    if (jsonObject.getStr("code").equals("200")) {
                        // hisTfWaterId
                        String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
                        water.setHisTfWaterId(tfid);
                        tjFlowingWaterService.updateById(water);
                        if (isDelete) {
                            for (TjFlowingWater water1 : yizhifu) {
                                String bldh1 = water1.getJxbz();
                                remarkService.deleteTjOrderDetailByjxbz(bldh1);
                                tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
                                tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
                                transitionService.deleteTjOrderDetailByjxbz(bldh1);
                                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
                                tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
                            }
                        }
                    }
                } else return AjaxResult.error();
                    } else return AjaxResult.error();
                }
            }
        }
        return null;

 ltkj-common/src/main/java/com/ltkj/common/utils/IdUtils.java

@@ -6,6 +6,7 @@

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;

/**
 * @Company: 西安路泰科技有限公司
@@ -17,6 +18,8 @@

    private static final String LIS_LAST_ID_KEY = "id:generate:lis:id";
    private static final String LIS_CURRENT_DATE_KEY = "id:generate:lis:currentDate";

//    private static final UidGenerator uidGenerator = new DefaultUidGenerator();  // 使用默认的Snowflake生成器

    @Autowired
    private StringRedisTemplate stringRedisTemplate;
@@ -38,4 +41,29 @@
        return String.format(prefix+"%s%05d", yyMMdd, lastId);
    }


    //生成体检号用
    private static long lastTimestamp = -1;
    private static final Random random = new Random();

    public static synchronized String getTjNumber() {
        long timestamp = System.currentTimeMillis();  // 获取当前时间戳（毫秒）

        // 如果时间戳和上次生成的时间戳相同，生成一个新的随机数
        if (timestamp == lastTimestamp) {
            return String.format("%09d", (timestamp % 1000000000) + random.nextInt(900) + 100);
        } else {
            lastTimestamp = timestamp;  // 更新最后生成时间戳
            return String.format("%09d", (timestamp % 1000000000) + random.nextInt(900) + 100);
        }
    }


//    使用分布式ID生成器（如Snowflake）
    public static String generateExamNumber() {
//        long id = uidGenerator.getUID();  // 获取生成的唯一ID
//        return String.format("%09d", Math.abs(id) % 1000000000);  // 格式化为9位
        return null;
    }

}