zjh 2024/05/16-1

zjh

2024-05-16 adaaa23c789be3313a0e554fbf7beaa8ab261e68

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

@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
@@ -49,6 +50,8 @@
    private ITjProjectService projectService;
    @Resource
    private ITjChargingStandardService chargingStandardService;
    @Resource
    private ITjOrderRemarkService remarkService;



@@ -57,6 +60,15 @@
    public AjaxResult getNewDate() {

        Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd HH:mm:ss"),"yyyy-MM-dd HH:mm:ss");
        return AjaxResult.success(date);
    }


    @GetMapping("/getNewDateList")
    @ApiOperation(value = "获取服务器当时间段")
    public AjaxResult getNewDateList() {

        Date date = DateUtil.parse(DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"yyyy-MM-dd");
        return AjaxResult.success(date);
    }

@@ -129,7 +141,7 @@
        if (null != project) {
            return AjaxResult.success(project.getProPrice());
        }
        return AjaxResult.error("没找到对应项目 请自定义费用");
        return AjaxResult.success("没找到对应项目 请自定义费用");
    }


@@ -140,6 +152,7 @@
    @ApiOperation(value = "体检收费接口")
    @Transactional
    public AjaxResult addOrderAndDetail(@RequestBody NewFlowingWaterVo vo) {
        SysUser user = SecurityUtils.getLoginUser().getUser();

//        if (!MatchUtils.isMobileNO(vo.getPhone())) {
//            return AjaxResult.error("手机号格式有误!");
@@ -177,9 +190,10 @@
            }else {
                detail.setProId(vo.getTjPro());
            }
            detail.setProId(vo.getTjPro());
            detail.setProType("0");
            detailService.save(detail);

            remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), user.getNickName(), String.valueOf(user.getUserId()), String.valueOf(tjOrder.getOrderId()));

            TjFlowingWater tjFlowingWater = new TjFlowingWater();
            tjFlowingWater.setOrderId(tjOrder.getOrderId());
@@ -246,6 +260,7 @@
        tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
        tjFlowingWater.setCopeWith(flowingWater.getCopeWith());
        tjFlowingWater.setRemarks("已退费");
        tjFlowingWater.setPayType(flowingWater.getPayType());
        if (flowingWaterService.save(tjFlowingWater)) {
            flowingWater.setRemarks("已退费");
            flowingWaterService.updateById(flowingWater);