zjh 本地 2024/06/05 --2

zjh

2024-06-05 1ea4e6b1fce036ba234c9f21c69e9fd68649abb2

 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();
@@ -1015,6 +1024,9 @@
//            }
            tjCustomer.setCardId("0");
            tjCustomerService.updateById(tjCustomer);
            //调用his接口
            hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
//            hisMzJysqController.getHisMzJysq(tjCustomer.getCusIdcard(),tjCustomer.getCardId(),tjOrder.getOrderId().toString());
            return AjaxResult.success(tjNumber);
        }
        return AjaxResult.error();