zjh 本地 2024/06/07 --1

zjh

2024-06-07 a0385d39fd55aaf45f43e2e12e446b9c933efc1c

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

@@ -59,6 +59,8 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiMethod;
import com.ltkj.web.controller.his.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -169,6 +171,12 @@
    private TjvLtkjvtjpatService tjvLtkjvtjpatService;
    @Autowired
    private ThreadPoolConfig threadPoolConfig;

    @Autowired
    private HisApiMethod hisApiMethod;

    @Autowired
    private HisMzJysqController hisMzJysqController;


    /**
@@ -850,8 +858,8 @@
        wq1.eq(TjReservation::getIsExpire, 2);
        TjReservation tjReservation = tjReservationService.getOne(wq1);
        MallOrder mallOrder = null;
        if (tjReservation != null) {
            order.setReservationId(tjReservation.getId());
        if (null != tjReservation) {
            tjOrder.setReservationId(tjReservation.getId());
            mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
            if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
                return AjaxResult.error("未到预约时间");
@@ -906,6 +914,7 @@
        tjOrder.setStatus(TjConstants.TJ_BEGIN);
        tjOrder.setCardId(tjCustomer.getCardId());
        if (tjOrderService.save(tjOrder)) {

            //保存收货地址
            if ("2".equals(tjOrder.getGetType())) {
                final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -1013,8 +1022,16 @@
//
//                }
//            }


            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if(null !=config && config.equals("Y")){
                hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
            }
            tjCustomer.setCardId("0");
            tjCustomerService.updateById(tjCustomer);

            return AjaxResult.success(tjNumber);
        }
        return AjaxResult.error();
@@ -1508,7 +1525,7 @@
                if (null != ppList && ppList.size() > 0) {
                    //异步保存数据库
//                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
                    asyncService.saveRedisTransitionByPacId(cusId,cardId, pacId, null);
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {
@@ -1553,7 +1570,7 @@
        //单项
        if (null != proIds && proIds.size() > 0) {
            //异步保存数据库表
            asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
            asyncService.saveRedisTransitionByPacId(cusId,cardId,null, proIds);
            for (Long proId : proIds) {
                List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
                if (null != transitions && transitions.size() > 0) {